From a3cb8eb9696c8527037ad7473173a3c4d42cfe7b Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Mon, 19 Aug 2019 10:37:17 +1000
Subject: [PATCH] Re-enable group chats

---
 src/org/thoughtcrime/securesms/ApplicationContext.java       | 5 ++---
 src/org/thoughtcrime/securesms/ConversationListActivity.java | 3 ---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java
index 955332f3e0..c0bdbf159f 100644
--- a/src/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/src/org/thoughtcrime/securesms/ApplicationContext.java
@@ -37,6 +37,7 @@ import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.dependencies.AxolotlStorageModule;
 import org.thoughtcrime.securesms.dependencies.InjectableType;
 import org.thoughtcrime.securesms.dependencies.SignalCommunicationModule;
+import org.thoughtcrime.securesms.groups.GroupManager;
 import org.thoughtcrime.securesms.jobmanager.DependencyInjector;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
 import org.thoughtcrime.securesms.jobmanager.impl.JsonDataSerializer;
@@ -77,6 +78,7 @@ import org.webrtc.voiceengine.WebRtcAudioUtils;
 import org.whispersystems.libsignal.logging.SignalProtocolLoggerProvider;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
+import org.whispersystems.signalservice.loki.api.LokiGroupChatAPI;
 import org.whispersystems.signalservice.loki.api.LokiLongPoller;
 import org.whispersystems.signalservice.loki.api.LokiP2PAPI;
 import org.whispersystems.signalservice.loki.api.LokiP2PAPIDelegate;
@@ -423,8 +425,6 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
     if (lokiLongPoller != null) { lokiLongPoller.startIfNeeded(); }
   }
 
-  /*
-  // TODO: Uncomment this to re-enable group chats
   private void setUpPublicChatIfNeeded() {
     if (lokiGroupChatPoller != null) return;
     lokiGroupChatPoller = new LokiGroupChatPoller(this, LokiGroupChatAPI.getPublicChatID());
@@ -439,6 +439,5 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
     setUpPublicChatIfNeeded();
     lokiGroupChatPoller.startIfNeeded();
   }
-   */
   // endregion
 }
diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java
index 82cd2899c5..c0be4a30eb 100644
--- a/src/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -81,12 +81,9 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
   protected void onPreCreate() {
     dynamicTheme.onCreate(this);
     dynamicLanguage.onCreate(this);
-    /*
-    // TODO: Uncomment this to re-enable group chats
     if (TextSecurePreferences.getLocalNumber(this) != null) {
       ApplicationContext.getInstance(this).startPublicChatPollingIfNeeded();
     }
-     */
   }
 
   @Override