From c88d0f0520a905d2f619b1404af1dff8b5742a9e Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Wed, 12 Aug 2020 12:22:16 +1000
Subject: [PATCH] Open group after it's created

---
 .../loki/activities/CreateClosedGroupActivity.kt         | 9 ++++++---
 .../securesms/loki/protocol/ClosedGroupsProtocol.kt      | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
index d79a10fc0d..7f6a34ee46 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
@@ -17,6 +17,7 @@ import network.loki.messenger.R
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.conversation.ConversationActivity
 import org.thoughtcrime.securesms.database.Address
+import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.ThreadDatabase
 import org.thoughtcrime.securesms.groups.GroupManager
 import org.thoughtcrime.securesms.loki.protocol.ClosedGroupsProtocol
@@ -125,7 +126,9 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberC
             return Toast.makeText(this, R.string.activity_create_closed_group_too_many_group_members_error, Toast.LENGTH_LONG).show()
         }
         val userPublicKey = TextSecurePreferences.getLocalNumber(this)
-        ClosedGroupsProtocol.createClosedGroup(this, name.toString(), selectedMembers + setOf( userPublicKey ))
+        val groupID = ClosedGroupsProtocol.createClosedGroup(this, name.toString(), selectedMembers + setOf( userPublicKey ))
+        val threadID = DatabaseFactory.getThreadDatabase(this).getThreadIdFor(Recipient.from(this, Address.fromSerialized(groupID), false))
+        openConversation(threadID, Recipient.from(this, Address.fromSerialized(groupID), false))
     }
 
     private fun createLegacyClosedGroup() {
@@ -151,7 +154,7 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberC
         CreateClosedGroupTask(WeakReference(this), null, name.toString(), recipients, setOf( admin )).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR)
     }
 
-    private fun handleOpenConversation(threadId: Long, recipient: Recipient) {
+    private fun openConversation(threadId: Long, recipient: Recipient) {
         val intent = Intent(this, ConversationActivity::class.java)
         intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, threadId)
         intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, ThreadDatabase.DistributionTypes.DEFAULT)
@@ -179,7 +182,7 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberC
             val activity = activity.get() ?: return super.onPostExecute(result)
             if (result.isPresent && result.get().threadId > -1) {
                 if (!activity.isFinishing) {
-                    activity.handleOpenConversation(result.get().threadId, result.get().groupRecipient)
+                    activity.openConversation(result.get().threadId, result.get().groupRecipient)
                 }
             } else {
                 super.onPostExecute(result)
diff --git a/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt b/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt
index a6fd63758f..fe95a2d069 100644
--- a/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt
+++ b/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt
@@ -30,7 +30,7 @@ import java.util.*
 object ClosedGroupsProtocol {
     val isSharedSenderKeysEnabled = true
     
-    public fun createClosedGroup(context: Context, name: String, members: Collection<String>): Promise<Unit, Exception> {
+    public fun createClosedGroup(context: Context, name: String, members: Collection<String>): String {
         // Prepare
         val userPublicKey = TextSecurePreferences.getLocalNumber(context)
         // Generate a key pair for the group
@@ -65,7 +65,7 @@ object ClosedGroupsProtocol {
         val threadID = DatabaseFactory.getThreadDatabase(context).getThreadIdFor(Recipient.from(context, Address.fromSerialized(groupID), false))
         insertInfoMessage(context, groupID, GroupContext.Type.UPDATE, name, members, admins, threadID)
         // Return
-        return Promise.of(Unit)
+        return groupID
     }
 
     public fun addMembers(context: Context, newMembers: Collection<String>, groupPublicKey: String) {