From b826b103209462836714ccbbe757c4dce45641df Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Mon, 3 Mar 2025 12:00:33 -0500
Subject: [PATCH] Improve group create failure UX.

---
 .../ui/creategroup/details/AddGroupDetailsFragment.java     | 2 ++
 .../ui/creategroup/details/AddGroupDetailsRepository.java   | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsFragment.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsFragment.java
index f37da889f1..96bd773864 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsFragment.java
@@ -252,6 +252,8 @@ public class AddGroupDetailsFragment extends LoggingFragment {
       default:
         throw new IllegalStateException("Unexpected error: " + error.getErrorType().name());
     }
+
+    create.cancelSpinning();
   }
 
   private void toast(@StringRes int toastStringId) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsRepository.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsRepository.java
index d6d43d952a..b54ba3b6e1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsRepository.java
@@ -7,6 +7,7 @@ import androidx.annotation.Nullable;
 import androidx.core.util.Consumer;
 
 import org.signal.core.util.concurrent.SignalExecutors;
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.groups.GroupChangeBusyException;
 import org.thoughtcrime.securesms.groups.GroupChangeException;
 import org.thoughtcrime.securesms.groups.GroupManager;
@@ -23,6 +24,8 @@ import java.util.Set;
 
 final class AddGroupDetailsRepository {
 
+  private static String TAG = Log.tag(AddGroupDetailsRepository.class);
+
   private final Context context;
 
   AddGroupDetailsRepository(@NonNull Context context) {
@@ -58,10 +61,13 @@ final class AddGroupDetailsRepository {
 
         resultConsumer.accept(GroupCreateResult.success(result));
       } catch (GroupChangeBusyException e) {
+        Log.w(TAG, "Unable to create group, group busy", e);
         resultConsumer.accept(GroupCreateResult.error(GroupCreateResult.Error.Type.ERROR_BUSY));
       } catch (GroupChangeException e) {
+        Log.w(TAG, "Unable to create group, group change failed", e);
         resultConsumer.accept(GroupCreateResult.error(GroupCreateResult.Error.Type.ERROR_FAILED));
       } catch (IOException e) {
+        Log.w(TAG, "Unable to create group, unknown IO", e);
         resultConsumer.accept(GroupCreateResult.error(GroupCreateResult.Error.Type.ERROR_IO));
       }
     });