mirror of
https://github.com/oxen-io/session-android.git
synced 2024-12-11 18:54:21 +00:00
Merge pull request #769 from hjubb/fix_npe_conversation_list_handler
Fix a crash with null conversationListHandler
This commit is contained in:
commit
b925133a76
@ -54,13 +54,10 @@ import org.thoughtcrime.securesms.crypto.KeyPairUtilities;
|
||||
import org.thoughtcrime.securesms.database.JobDatabase;
|
||||
import org.thoughtcrime.securesms.database.LokiAPIDatabase;
|
||||
import org.thoughtcrime.securesms.database.Storage;
|
||||
import org.thoughtcrime.securesms.database.LokiAPIDatabase;
|
||||
import org.thoughtcrime.securesms.dependencies.DatabaseComponent;
|
||||
import org.thoughtcrime.securesms.dependencies.DatabaseModule;
|
||||
import org.thoughtcrime.securesms.groups.OpenGroupManager;
|
||||
import org.thoughtcrime.securesms.home.HomeActivity;
|
||||
import org.thoughtcrime.securesms.groups.OpenGroupManager;
|
||||
import org.thoughtcrime.securesms.home.HomeActivity;
|
||||
import org.thoughtcrime.securesms.jobmanager.JobManager;
|
||||
import org.thoughtcrime.securesms.jobmanager.impl.JsonDataSerializer;
|
||||
import org.thoughtcrime.securesms.jobs.FastJobStorage;
|
||||
@ -148,6 +145,9 @@ public class ApplicationContext extends Application implements DefaultLifecycleO
|
||||
}
|
||||
|
||||
public Handler getConversationListNotificationHandler() {
|
||||
if (this.conversationListNotificationHandler == null) {
|
||||
conversationListNotificationHandler = new Handler(Looper.getMainLooper());
|
||||
}
|
||||
return this.conversationListNotificationHandler;
|
||||
}
|
||||
|
||||
@ -169,7 +169,6 @@ public class ApplicationContext extends Application implements DefaultLifecycleO
|
||||
AppContext.INSTANCE.configureKovenant();
|
||||
messageNotifier = new OptimizedMessageNotifier(new DefaultMessageNotifier());
|
||||
broadcaster = new Broadcaster(this);
|
||||
conversationListNotificationHandler = new Handler(Looper.getMainLooper());
|
||||
LokiAPIDatabase apiDB = getDatabaseComponent().lokiAPIDatabase();
|
||||
MessagingModuleConfiguration.Companion.configure(this,
|
||||
storage,
|
||||
|
Loading…
Reference in New Issue
Block a user