From ff50d2f1fdb61eb3987b751e9b55928fa2e2ddf7 Mon Sep 17 00:00:00 2001
From: Brice-W <brice@loki.network>
Date: Mon, 17 May 2021 14:16:04 +1000
Subject: [PATCH] error handling if something goes wrong when creating a group

---
 .../loki/activities/CreateClosedGroupActivity.kt         | 6 +++++-
 .../sending_receiving/MessageSenderClosedGroupHandler.kt | 9 ++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
index f3a7f94bd4..f9bacaff26 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
@@ -12,6 +12,7 @@ import android.view.View
 import android.widget.Toast
 import kotlinx.android.synthetic.main.activity_create_closed_group.*
 import network.loki.messenger.R
+import nl.komponents.kovenant.ui.failUi
 import nl.komponents.kovenant.ui.successUi
 import org.session.libsession.messaging.sending_receiving.MessageSender
 import org.session.libsession.messaging.sending_receiving.groupSizeLimit
@@ -123,7 +124,10 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), LoaderM
                 openConversationActivity(this, threadID, Recipient.from(this, Address.fromSerialized(groupID), false))
                 finish()
             }
-
+        }.failUi {
+            loaderContainer.fadeOut()
+            isLoading = false
+            Toast.makeText(this, it.message, Toast.LENGTH_LONG).show()
         }
     }
     // endregion
diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt
index 065900f56c..4b787e8dbe 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt
@@ -54,9 +54,12 @@ fun MessageSender.create(name: String, members: Collection<String>): Promise<Str
         for (member in members) {
             val closedGroupControlMessage = ClosedGroupControlMessage(closedGroupUpdateKind)
             closedGroupControlMessage.sentTimestamp = sentTime
-            retryIfNeeded(30) {
-                sendNonDurably(closedGroupControlMessage, Address.fromSerialized(member))
-            }.get()
+            try {
+                sendNonDurably(closedGroupControlMessage, Address.fromSerialized(member)).get()
+            } catch (e: Exception) {
+                deferred.reject(e)
+                return@queue
+            }
         }
 
         // Add the group to the user's set of public keys to poll for