TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-16 16:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update for core changes

Browse Source
This commit is contained in:
Niels Andriesse 2019-06-11 16:27:00 +10:00
parent 021bf1b33c
commit 69ecb19654
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java
View File

@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.dependencies;
import android.content.Context; import android.content.Context;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.gcm.FcmService; import org.thoughtcrime.securesms.gcm.FcmService;
import org.thoughtcrime.securesms.jobs.AttachmentUploadJob; import org.thoughtcrime.securesms.jobs.AttachmentUploadJob;
import org.thoughtcrime.securesms.jobs.MultiDeviceConfigurationUpdateJob; import org.thoughtcrime.securesms.jobs.MultiDeviceConfigurationUpdateJob;
@ -136,7 +137,10 @@ public class SignalCommunicationModule {
TextSecurePreferences.isMultiDevice(context), TextSecurePreferences.isMultiDevice(context),
Optional.fromNullable(IncomingMessageObserver.getPipe()), Optional.fromNullable(IncomingMessageObserver.getPipe()),
Optional.fromNullable(IncomingMessageObserver.getUnidentifiedPipe()), Optional.fromNullable(IncomingMessageObserver.getUnidentifiedPipe()),
Optional.of(new SecurityEventListener(context))); Optional.of(new SecurityEventListener(context)),
TextSecurePreferences.getLocalNumber(context),
0,
DatabaseFactory.getLokiAPIDatabase(context));
// Loki - Set the pre key bundle store // Loki - Set the pre key bundle store
// This is something that we MUST have or our Loki logic will fail // This is something that we MUST have or our Loki logic will fail

2
src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java
View File

@ -156,7 +156,7 @@ public class PushTextSendJob extends PushSendJob implements InjectableType {
throws UntrustedIdentityException, InsecureFallbackApprovalException, RetryLaterException throws UntrustedIdentityException, InsecureFallbackApprovalException, RetryLaterException
{ {
try { try {
rotateSenderCertificateIfNecessary(); // rotateSenderCertificateIfNecessary();
SignalServiceAddress address = getPushAddress(message.getIndividualRecipient().getAddress()); SignalServiceAddress address = getPushAddress(message.getIndividualRecipient().getAddress());
Optional<byte[]> profileKey = getProfileKey(message.getIndividualRecipient()); Optional<byte[]> profileKey = getProfileKey(message.getIndividualRecipient());