From e67946146c1d4acc5908c9d5b80aeeb87a3489df Mon Sep 17 00:00:00 2001
From: 0x330a <92654767+0x330a@users.noreply.github.com>
Date: Wed, 8 Nov 2023 12:46:36 +1100
Subject: [PATCH] refactor: simplify some calls and start to add failed toast
 to strings

---
 .../java/org/thoughtcrime/securesms/ApplicationContext.java  | 5 -----
 app/src/main/res/values/strings.xml                          | 2 ++
 .../libsession/messaging/jobs/ConfigurationSyncJob.kt        | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
index 9ee835545..73ab4a537 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
@@ -110,7 +110,6 @@ import javax.inject.Inject;
 import dagger.hilt.EntryPoints;
 import dagger.hilt.android.HiltAndroidApp;
 import kotlin.Unit;
-import kotlinx.coroutines.Job;
 import network.loki.messenger.BuildConfig;
 import network.loki.messenger.libsession_util.Config;
 import network.loki.messenger.libsession_util.UserProfile;
@@ -138,7 +137,6 @@ public class ApplicationContext extends Application implements DefaultLifecycleO
     public MessageNotifier messageNotifier = null;
     public Poller poller = null;
     public Broadcaster broadcaster = null;
-    private Job firebaseInstanceIdJob;
     private WindowDebouncer conversationListDebouncer;
     private HandlerThread conversationListHandlerThread;
     private Handler conversationListHandler;
@@ -506,9 +504,6 @@ public class ApplicationContext extends Application implements DefaultLifecycleO
     }
 
     public void clearAllData(boolean isMigratingToV2KeyPair) {
-        if (firebaseInstanceIdJob != null && firebaseInstanceIdJob.isActive()) {
-            firebaseInstanceIdJob.cancel(null);
-        }
         String displayName = TextSecurePreferences.getProfileName(this);
         boolean isUsingFCM = TextSecurePreferences.isPushEnabled(this);
         TextSecurePreferences.clearAll(this);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 062b48d7f..b09fedf27 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1076,4 +1076,6 @@
     <string name="media_overview_activity__clear_media">Clear All</string>
     <string name="activity_create_closed_group_select_contacts">Select Contacts</string>
     <string name="activity_create_closed_group_add_account_or_ons">Add Account ID or ONS</string>
+    <string name="closed_group_update_control__single_joined"></string>
+    <string name="closed_group_update_control__two_joined"></string>
 </resources>
diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/ConfigurationSyncJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/ConfigurationSyncJob.kt
index b2ca9d23a..1be8e62c4 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/jobs/ConfigurationSyncJob.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/ConfigurationSyncJob.kt
@@ -123,7 +123,6 @@ data class ConfigurationSyncJob(val destination: Destination) : Job {
                    namespace(),
                    message,
                    signingKey,
-                   ed25519PubKey
                )
             } else SnodeAPI.buildAuthenticatedStoreBatchInfo(
                 namespace(),