TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-05-01 23:50:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-enable group chats

Browse Source
This commit is contained in:
Niels Andriesse 2019-08-19 10:37:17 +10:00
parent cdd5f94857
commit a3cb8eb969
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/org/thoughtcrime/securesms/ApplicationContext.java
View File

@ -37,6 +37,7 @@ import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.dependencies.AxolotlStorageModule; import org.thoughtcrime.securesms.dependencies.AxolotlStorageModule;
import org.thoughtcrime.securesms.dependencies.InjectableType; import org.thoughtcrime.securesms.dependencies.InjectableType;
import org.thoughtcrime.securesms.dependencies.SignalCommunicationModule; import org.thoughtcrime.securesms.dependencies.SignalCommunicationModule;
import org.thoughtcrime.securesms.groups.GroupManager;
import org.thoughtcrime.securesms.jobmanager.DependencyInjector; import org.thoughtcrime.securesms.jobmanager.DependencyInjector;
import org.thoughtcrime.securesms.jobmanager.JobManager; import org.thoughtcrime.securesms.jobmanager.JobManager;
import org.thoughtcrime.securesms.jobmanager.impl.JsonDataSerializer; 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.libsignal.logging.SignalProtocolLoggerProvider;
import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope; import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
import org.whispersystems.signalservice.internal.push.SignalServiceProtos; 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.LokiLongPoller;
import org.whispersystems.signalservice.loki.api.LokiP2PAPI; import org.whispersystems.signalservice.loki.api.LokiP2PAPI;
import org.whispersystems.signalservice.loki.api.LokiP2PAPIDelegate; import org.whispersystems.signalservice.loki.api.LokiP2PAPIDelegate;
@ -423,8 +425,6 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
if (lokiLongPoller != null) { lokiLongPoller.startIfNeeded(); } if (lokiLongPoller != null) { lokiLongPoller.startIfNeeded(); }
} }
/*
// TODO: Uncomment this to re-enable group chats
private void setUpPublicChatIfNeeded() { private void setUpPublicChatIfNeeded() {
if (lokiGroupChatPoller != null) return; if (lokiGroupChatPoller != null) return;
lokiGroupChatPoller = new LokiGroupChatPoller(this, LokiGroupChatAPI.getPublicChatID()); lokiGroupChatPoller = new LokiGroupChatPoller(this, LokiGroupChatAPI.getPublicChatID());
@ -439,6 +439,5 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
setUpPublicChatIfNeeded(); setUpPublicChatIfNeeded();
lokiGroupChatPoller.startIfNeeded(); lokiGroupChatPoller.startIfNeeded();
} }
*/
// endregion // endregion
} }

3
src/org/thoughtcrime/securesms/ConversationListActivity.java
View File

@ -81,12 +81,9 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
protected void onPreCreate() { protected void onPreCreate() {
dynamicTheme.onCreate(this); dynamicTheme.onCreate(this);
dynamicLanguage.onCreate(this); dynamicLanguage.onCreate(this);
/*
// TODO: Uncomment this to re-enable group chats
if (TextSecurePreferences.getLocalNumber(this) != null) { if (TextSecurePreferences.getLocalNumber(this) != null) {
ApplicationContext.getInstance(this).startPublicChatPollingIfNeeded(); ApplicationContext.getInstance(this).startPublicChatPollingIfNeeded();
} }
*/
} }
@Override @Override