From 9a7d56d0e8165b891dd12573ab296dfa40acf50b Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 8 Feb 2023 10:22:31 +0100 Subject: [PATCH] adding a crashfix --- app/build.gradle | 2 +- .../smsmessenger/adapters/ConversationsAdapter.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b09d4707..dee51b5e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:a85f77a67f' + implementation 'com.github.SimpleMobileTools:Simple-Commons:d0ea181610' implementation 'org.greenrobot:eventbus:3.3.1' implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61' implementation 'com.github.tibbi:android-smsmms:33fcaf94d9' diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt index 45583072..2fe87127 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt @@ -59,14 +59,14 @@ class ConversationsAdapter( override fun prepareActionMode(menu: Menu) { val selectedItems = getSelectedItems() val isSingleSelection = isOneItemSelected() - val selectedConversation = selectedItems.firstOrNull() - val isGroupConversation = selectedConversation?.isGroupConversation == true + val selectedConversation = selectedItems.firstOrNull() ?: return + val isGroupConversation = selectedConversation.isGroupConversation menu.apply { findItem(R.id.cab_block_number).title = activity.addLockedLabelIfNeeded(R.string.block_number) findItem(R.id.cab_block_number).isVisible = isNougatPlus() findItem(R.id.cab_add_number_to_contact).isVisible = isSingleSelection && !isGroupConversation - findItem(R.id.cab_dial_number).isVisible = isSingleSelection && !isGroupConversation && !isShortCodeWithLetters(selectedConversation!!.phoneNumber) + findItem(R.id.cab_dial_number).isVisible = isSingleSelection && !isGroupConversation && !isShortCodeWithLetters(selectedConversation.phoneNumber) findItem(R.id.cab_copy_number).isVisible = isSingleSelection && !isGroupConversation findItem(R.id.cab_rename_conversation).isVisible = isSingleSelection && isGroupConversation findItem(R.id.cab_mark_as_read).isVisible = selectedItems.any { !it.read }