From 69ecb196541c6a22f35baa0f4247d4f5d88c858a Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Tue, 11 Jun 2019 16:27:00 +1000
Subject: [PATCH] Update for core changes

---
 .../securesms/dependencies/SignalCommunicationModule.java   | 6 +++++-
 src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java    | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java b/src/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java
index fadae1def2..f34c6c1cf7 100644
--- a/src/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java
+++ b/src/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.dependencies;
 
 import android.content.Context;
 
+import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.gcm.FcmService;
 import org.thoughtcrime.securesms.jobs.AttachmentUploadJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceConfigurationUpdateJob;
@@ -136,7 +137,10 @@ public class SignalCommunicationModule {
                                                           TextSecurePreferences.isMultiDevice(context),
                                                           Optional.fromNullable(IncomingMessageObserver.getPipe()),
                                                           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
       // This is something that we MUST have or our Loki logic will fail
diff --git a/src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java b/src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java
index d1f9a50d48..5c36f969ac 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java
@@ -156,7 +156,7 @@ public class PushTextSendJob extends PushSendJob implements InjectableType {
       throws UntrustedIdentityException, InsecureFallbackApprovalException, RetryLaterException
   {
     try {
-      rotateSenderCertificateIfNecessary();
+      // rotateSenderCertificateIfNecessary();
 
       SignalServiceAddress             address            = getPushAddress(message.getIndividualRecipient().getAddress());
       Optional<byte[]>                 profileKey         = getProfileKey(message.getIndividualRecipient());