From 21fc47d7bf20d58ae449a06cf97aad1517fbcac6 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Fri, 9 Aug 2019 14:00:54 +1000
Subject: [PATCH] Prepare for release

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

diff --git a/build.gradle b/build.gradle
index b86d6122b8..a82154c064 100644
--- a/build.gradle
+++ b/build.gradle
@@ -181,7 +181,7 @@ dependencies {
     implementation "com.github.lelloman:android-identicons:$identicon_version"
 }
 
-def canonicalVersionCode = 6
+def canonicalVersionCode = 7
 def canonicalVersionName = "1.0.0"
 
 def postFixSize = 10
diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java
index c0bdbf159f..955332f3e0 100644
--- a/src/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/src/org/thoughtcrime/securesms/ApplicationContext.java
@@ -37,7 +37,6 @@ 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;
@@ -78,7 +77,6 @@ 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;
@@ -425,6 +423,8 @@ 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,5 +439,6 @@ 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 dde8c681ae..93dadd0035 100644
--- a/src/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -81,9 +81,12 @@ 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