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

More cleanup.

Browse Source
This commit is contained in:
Mikunj 2019-10-30 10:13:19 +11:00
parent 7ff7c36e27
commit 359363184a
2 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,7 +147,6 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
private LokiPublicChatAPI lokiPublicChatAPI = null; private LokiPublicChatAPI lokiPublicChatAPI = null;
public SignalCommunicationModule communicationModule; public SignalCommunicationModule communicationModule;
public MixpanelAPI mixpanel; public MixpanelAPI mixpanel;
private BroadcastReceiver syncMessageEventReceiver;
private volatile boolean isAppVisible; private volatile boolean isAppVisible;
@ -200,22 +199,6 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
if (setUpStorageAPIIfNeeded()) { if (setUpStorageAPIIfNeeded()) {
LokiStorageAPI.Companion.getShared().updateUserDeviceMappings(); LokiStorageAPI.Companion.getShared().updateUserDeviceMappings();
} }
// Loki - Event listener
syncMessageEventReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
// Send the sync message to our devices
long messageID = intent.getLongExtra(LokiMessageSyncEvent.MESSAGE_ID, -1);
long timestamp = intent.getLongExtra(LokiMessageSyncEvent.TIMESTAMP, -1);
byte[] message = intent.getByteArrayExtra(LokiMessageSyncEvent.SYNC_MESSAGE);
int ttl = intent.getIntExtra(LokiMessageSyncEvent.TTL, -1);
if (messageID > 0 && timestamp > 0 && message != null && ttl > 0) {
MessageSender.sendSyncMessageToOurDevices(context, messageID, timestamp, message, ttl);
}
}
};
LocalBroadcastManager.getInstance(this).registerReceiver(syncMessageEventReceiver, new IntentFilter(LokiMessageSyncEvent.MESSAGE_SYNC_EVENT));
} }
@Override @Override
@ -243,7 +226,6 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
@Override @Override
public void onTerminate() { public void onTerminate() {
stopKovenant(); stopKovenant();
LocalBroadcastManager.getInstance(this).unregisterReceiver(syncMessageEventReceiver);
super.onTerminate(); super.onTerminate();
} }
@ -532,6 +514,7 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
} }
public void createDefaultPublicChatsIfNeeded() { public void createDefaultPublicChatsIfNeeded() {
/*
List<LokiPublicChat> defaultPublicChats = LokiPublicChatAPI.Companion.getDefaultChats(BuildConfig.DEBUG); List<LokiPublicChat> defaultPublicChats = LokiPublicChatAPI.Companion.getDefaultChats(BuildConfig.DEBUG);
for (LokiPublicChat publiChat : defaultPublicChats) { for (LokiPublicChat publiChat : defaultPublicChats) {
long threadID = GroupManager.getThreadId(publiChat.getId(), this); long threadID = GroupManager.getThreadId(publiChat.getId(), this);
@ -548,6 +531,7 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
TextSecurePreferences.setBooleanPreference(this, migrationKey, true); TextSecurePreferences.setBooleanPreference(this, migrationKey, true);
} }
} }
*/
} }
public void createRSSFeedsIfNeeded() { public void createRSSFeedsIfNeeded() {

5
src/org/thoughtcrime/securesms/push/MessageSenderEventListener.java
View File

@ -5,6 +5,7 @@ import android.content.Context;
import org.thoughtcrime.securesms.crypto.SecurityEvent; import org.thoughtcrime.securesms.crypto.SecurityEvent;
import org.thoughtcrime.securesms.loki.FriendRequestHandler; import org.thoughtcrime.securesms.loki.FriendRequestHandler;
import org.thoughtcrime.securesms.loki.LokiMessageSyncEvent; import org.thoughtcrime.securesms.loki.LokiMessageSyncEvent;
import org.thoughtcrime.securesms.sms.MessageSender;
import org.whispersystems.signalservice.api.SignalServiceMessageSender; import org.whispersystems.signalservice.api.SignalServiceMessageSender;
import org.whispersystems.signalservice.api.push.SignalServiceAddress; import org.whispersystems.signalservice.api.push.SignalServiceAddress;
@ -25,7 +26,9 @@ public class MessageSenderEventListener implements SignalServiceMessageSender.Ev
@Override @Override
public void onSyncEvent(long messageID, long timestamp, byte[] message, int ttl) { public void onSyncEvent(long messageID, long timestamp, byte[] message, int ttl) {
LokiMessageSyncEvent.INSTANCE.broadcastSecurityUpdateEvent(context, messageID, timestamp, message, ttl); if (messageID > 0 && timestamp > 0 && message != null && ttl > 0) {
MessageSender.sendSyncMessageToOurDevices(context, messageID, timestamp, message, ttl);
}
} }
@Override public void onFriendRequestSending(long messageID, long threadID) { @Override public void onFriendRequestSending(long messageID, long threadID) {