fix a minor issue for closed group

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt

@@ -63,6 +63,7 @@ import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel
 import org.session.libsession.snode.SnodeAPI
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.Address.Companion.fromSerialized
+import org.session.libsession.utilities.GroupUtil
 import org.session.libsession.utilities.MediaTypes
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsession.utilities.concurrent.SimpleTask
@@ -72,6 +73,7 @@ import org.session.libsignal.crypto.MnemonicCodec
 import org.session.libsignal.utilities.ListenableFuture
 import org.session.libsignal.utilities.guava.Optional
 import org.session.libsignal.utilities.hexEncodedPrivateKey
+import org.session.libsignal.utilities.toHexString
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.audio.AudioRecorder
@@ -1155,14 +1157,12 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
                     }
             }
         } else {
-            val serverHash = messageDataProvider.getServerHashForMessage(message.id)
+            messageDataProvider.deleteMessage(message.id, !message.isMms)
-            if (serverHash == null) {
+            messageDataProvider.getServerHashForMessage(message.id)?.let { serverHash ->
-                messageDataProvider.deleteMessage(message.id, !message.isMms)
+                var publicKey = thread.address.serialize()
-            } else {
+                if (thread.isClosedGroupRecipient) { publicKey = GroupUtil.doubleDecodeGroupID(publicKey).toHexString() }
-                SnodeAPI.deleteMessage(thread.address.serialize(), listOf(serverHash))
+                SnodeAPI.deleteMessage(publicKey, listOf(serverHash))
-                    .success {
+                    .failUi { error ->
-                        messageDataProvider.deleteMessage(message.id, !message.isMms)
-                    }.failUi { error ->
                         Toast.makeText(this@ConversationActivityV2, "Couldn't delete message due to error: $error", Toast.LENGTH_LONG).show()
                     }
             }