refactor: simplify some calls and start to add failed toast to strings
This commit is contained in:
parent
abaa765207
commit
e67946146c
|
@ -110,7 +110,6 @@ import javax.inject.Inject;
|
||||||
import dagger.hilt.EntryPoints;
|
import dagger.hilt.EntryPoints;
|
||||||
import dagger.hilt.android.HiltAndroidApp;
|
import dagger.hilt.android.HiltAndroidApp;
|
||||||
import kotlin.Unit;
|
import kotlin.Unit;
|
||||||
import kotlinx.coroutines.Job;
|
|
||||||
import network.loki.messenger.BuildConfig;
|
import network.loki.messenger.BuildConfig;
|
||||||
import network.loki.messenger.libsession_util.Config;
|
import network.loki.messenger.libsession_util.Config;
|
||||||
import network.loki.messenger.libsession_util.UserProfile;
|
import network.loki.messenger.libsession_util.UserProfile;
|
||||||
|
@ -138,7 +137,6 @@ public class ApplicationContext extends Application implements DefaultLifecycleO
|
||||||
public MessageNotifier messageNotifier = null;
|
public MessageNotifier messageNotifier = null;
|
||||||
public Poller poller = null;
|
public Poller poller = null;
|
||||||
public Broadcaster broadcaster = null;
|
public Broadcaster broadcaster = null;
|
||||||
private Job firebaseInstanceIdJob;
|
|
||||||
private WindowDebouncer conversationListDebouncer;
|
private WindowDebouncer conversationListDebouncer;
|
||||||
private HandlerThread conversationListHandlerThread;
|
private HandlerThread conversationListHandlerThread;
|
||||||
private Handler conversationListHandler;
|
private Handler conversationListHandler;
|
||||||
|
@ -506,9 +504,6 @@ public class ApplicationContext extends Application implements DefaultLifecycleO
|
||||||
}
|
}
|
||||||
|
|
||||||
public void clearAllData(boolean isMigratingToV2KeyPair) {
|
public void clearAllData(boolean isMigratingToV2KeyPair) {
|
||||||
if (firebaseInstanceIdJob != null && firebaseInstanceIdJob.isActive()) {
|
|
||||||
firebaseInstanceIdJob.cancel(null);
|
|
||||||
}
|
|
||||||
String displayName = TextSecurePreferences.getProfileName(this);
|
String displayName = TextSecurePreferences.getProfileName(this);
|
||||||
boolean isUsingFCM = TextSecurePreferences.isPushEnabled(this);
|
boolean isUsingFCM = TextSecurePreferences.isPushEnabled(this);
|
||||||
TextSecurePreferences.clearAll(this);
|
TextSecurePreferences.clearAll(this);
|
||||||
|
|
|
@ -1076,4 +1076,6 @@
|
||||||
<string name="media_overview_activity__clear_media">Clear All</string>
|
<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_select_contacts">Select Contacts</string>
|
||||||
<string name="activity_create_closed_group_add_account_or_ons">Add Account ID or ONS</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>
|
</resources>
|
||||||
|
|
|
@ -123,7 +123,6 @@ data class ConfigurationSyncJob(val destination: Destination) : Job {
|
||||||
namespace(),
|
namespace(),
|
||||||
message,
|
message,
|
||||||
signingKey,
|
signingKey,
|
||||||
ed25519PubKey
|
|
||||||
)
|
)
|
||||||
} else SnodeAPI.buildAuthenticatedStoreBatchInfo(
|
} else SnodeAPI.buildAuthenticatedStoreBatchInfo(
|
||||||
namespace(),
|
namespace(),
|
||||||
|
|
Loading…
Reference in New Issue