From 203c0dd44c268f51f5a94ea9a9d5684dd2171759 Mon Sep 17 00:00:00 2001
From: jubb <hjubb@users.noreply.github.com>
Date: Thu, 18 Mar 2021 09:52:20 +1100
Subject: [PATCH] refactor: fix imports / compile issues from merging dev

---
 .../securesms/ApplicationContext.java          | 18 +-----------------
 .../securesms/loki/database/LokiAPIDatabase.kt |  3 +--
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
index 0d230be39b..623c140474 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
@@ -36,9 +36,8 @@ import org.session.libsession.messaging.sending_receiving.notifications.MessageN
 import org.session.libsession.messaging.sending_receiving.pollers.Poller;
 import org.session.libsession.messaging.threads.Address;
 import org.session.libsession.snode.SnodeConfiguration;
+import org.session.libsession.utilities.IdentityKeyUtil;
 import org.session.libsession.utilities.SSKEnvironment;
-import org.session.libsession.messaging.sending_receiving.notifications.MessageNotifier;
-import org.session.libsession.messaging.threads.Address;
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;
 import org.session.libsession.utilities.dynamiclanguage.DynamicLanguageContextWrapper;
@@ -53,23 +52,8 @@ import org.session.libsignal.service.loki.api.opengroups.PublicChatAPI;
 import org.session.libsignal.service.loki.database.LokiAPIDatabaseProtocol;
 import org.session.libsignal.service.loki.utilities.mentions.MentionsManager;
 import org.session.libsignal.utilities.logging.Log;
-import org.session.libsession.utilities.preferences.ProfileKeyUtil;
-import org.session.libsignal.service.api.messages.SignalServiceEnvelope;
-import org.session.libsignal.service.api.util.StreamDetails;
-import org.session.libsignal.service.internal.push.SignalServiceProtos;
-import org.session.libsignal.service.loki.api.Poller;
-import org.session.libsignal.service.loki.api.PushNotificationAPI;
-import org.session.libsignal.service.loki.api.SnodeAPI;
-import org.session.libsignal.service.loki.api.SwarmAPI;
-import org.session.libsignal.service.loki.api.fileserver.FileServerAPI;
-import org.session.libsignal.service.loki.api.opengroups.PublicChatAPI;
-import org.session.libsignal.service.loki.database.LokiAPIDatabaseProtocol;
-import org.session.libsignal.service.loki.utilities.mentions.MentionsManager;
-import org.session.libsignal.utilities.logging.Log;
 import org.signal.aesgcmprovider.AesGcmProvider;
 import org.thoughtcrime.securesms.components.TypingStatusSender;
-import org.session.libsession.utilities.IdentityKeyUtil;
-import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupDatabase;
 import org.thoughtcrime.securesms.dependencies.InjectableType;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt
index 4fc31efa09..a9325a5527 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.loki.database
 
 import android.content.ContentValues
 import android.content.Context
+import org.session.libsession.utilities.IdentityKeyUtil
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsignal.libsignal.ecc.DjbECPrivateKey
 import org.session.libsignal.libsignal.ecc.DjbECPublicKey
@@ -11,10 +12,8 @@ import org.session.libsignal.service.loki.database.LokiAPIDatabaseProtocol
 import org.session.libsignal.service.loki.utilities.PublicKeyValidation
 import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded
 import org.session.libsignal.service.loki.utilities.toHexString
-import org.session.libsession.utilities.IdentityKeyUtil
 import org.session.libsignal.utilities.Hex
 import org.session.libsignal.utilities.logging.Log
-import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
 import org.thoughtcrime.securesms.database.Database
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
 import org.thoughtcrime.securesms.loki.utilities.*