diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt index 0c9a0dd14..64040be10 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt @@ -203,7 +203,7 @@ class ConversationInfoActivity : is ConversationInfoViewModel.GetRoomSuccessState -> { conversation = state.conversationModel viewModel.getCapabilities(conversationUser, conversationToken, conversation!!) - if (conversation?.name == context.getString(R.string.note_to_self)) { + if (ConversationUtils.isNoteToSelfConversation(conversation)) { binding.shareConversationButton.visibility = GONE } binding.shareConversationButton.setOnClickListener { diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt b/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt index 56ca2c518..263e0aa09 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt @@ -214,6 +214,11 @@ data class Conversation( } } + @Deprecated("Use ConversationUtil") + fun isNoteToSelfConversation(): Boolean { + return type == ConversationType.NOTE_TO_SELF + } + enum class NotificationLevel { DEFAULT, ALWAYS, diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt index d754db362..ad0a0e97c 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt @@ -125,7 +125,7 @@ class ConversationsListBottomDialog( conversation.isNameEditable(currentUser) ) binding.conversationLinkShare.visibility = setVisibleIf( - conversation.name != context.getString(R.string.note_to_self) + !conversation.isNoteToSelfConversation() ) binding.conversationOperationDelete.visibility = setVisibleIf( diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2b66ea95a..b9b33e95d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -785,6 +785,5 @@ How to translate with transifex: Failed to fetch pending invitations Edited by %1$s Join conversation %1$s at %2$s - Note to self Conversation settings