Fix duplicated API

2025-08-12 07:17:45 +00:00 · 2021-04-23 16:09:47 +10:00
parent 9f26436041
commit 979c21ccbf
25 changed files with 38 additions and 1685 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
@@ -32,12 +32,15 @@ import androidx.multidex.MultiDexApplication;
 import org.conscrypt.Conscrypt;
 import org.session.libsession.messaging.MessagingConfiguration;
 import org.session.libsession.messaging.avatars.AvatarHelper;
+import org.session.libsession.messaging.fileserver.FileServerAPI;
 import org.session.libsession.messaging.jobs.JobQueue;
 import org.session.libsession.messaging.opengroups.OpenGroupAPI;
 import org.session.libsession.messaging.sending_receiving.notifications.MessageNotifier;
+import org.session.libsession.messaging.sending_receiving.notifications.PushNotificationAPI;
 import org.session.libsession.messaging.sending_receiving.pollers.ClosedGroupPoller;
 import org.session.libsession.messaging.sending_receiving.pollers.Poller;
 import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.snode.SnodeAPI;
 import org.session.libsession.snode.SnodeConfiguration;
 import org.session.libsession.utilities.IdentityKeyUtil;
 import org.session.libsession.utilities.SSKEnvironment;
@@ -47,10 +50,6 @@ import org.session.libsession.utilities.dynamiclanguage.DynamicLanguageContextWr
 import org.session.libsession.utilities.dynamiclanguage.LocaleParser;
 import org.session.libsession.utilities.preferences.ProfileKeyUtil;
 import org.session.libsignal.service.api.util.StreamDetails;
-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.database.LokiAPIDatabaseProtocol;
 import org.session.libsignal.service.loki.utilities.mentions.MentionsManager;
 import org.session.libsignal.utilities.logging.Log;
@@ -96,6 +95,7 @@ import org.webrtc.voiceengine.WebRtcAudioUtils;

 import java.io.File;
 import java.io.FileInputStream;
+import java.io.IOException;
 import java.security.SecureRandom;
 import java.security.Security;
 import java.util.Date;
@@ -179,11 +179,8 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
                new SessionProtocolImpl(this));
        SnodeConfiguration.Companion.configure(apiDB, broadcaster);
        if (userPublicKey != null) {
-            SwarmAPI.Companion.configureIfNeeded(apiDB);
-            SnodeAPI.Companion.configureIfNeeded(userPublicKey, apiDB, broadcaster);
            MentionsManager.Companion.configureIfNeeded(userPublicKey, threadDB, userDB);
        }
-        PushNotificationAPI.Companion.configureIfNeeded(BuildConfig.DEBUG);
        setUpStorageAPIIfNeeded();
        resubmitProfilePictureIfNeeded();
        publicChatManager = new PublicChatManager(this);
@@ -427,7 +424,6 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
        }
        byte[] userPrivateKey = IdentityKeyUtil.getIdentityKeyPair(this).getPrivateKey().serialize();
        LokiAPIDatabaseProtocol apiDB = DatabaseFactory.getLokiAPIDatabase(this);
-        FileServerAPI.Companion.configure(userPublicKey, userPrivateKey, apiDB);
        org.session.libsession.messaging.fileserver.FileServerAPI.Companion.configure(userPublicKey, userPrivateKey, apiDB);
        return true;
    }
@@ -458,13 +454,10 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
        String userPublicKey = TextSecurePreferences.getLocalNumber(this);
        if (userPublicKey == null) return;
        if (poller != null) {
-            SnodeAPI.shared.setUserPublicKey(userPublicKey);
            poller.setUserPublicKey(userPublicKey);
            return;
        }
        LokiAPIDatabase apiDB = DatabaseFactory.getLokiAPIDatabase(this);
-        SwarmAPI.Companion.configureIfNeeded(apiDB);
-        SnodeAPI.Companion.configureIfNeeded(userPublicKey, apiDB, broadcaster);
        poller = new Poller();
        closedGroupPoller = new ClosedGroupPoller();
    }
@@ -503,12 +496,13 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
            try {
                File profilePicture = AvatarHelper.getAvatarFile(this, Address.fromSerialized(userPublicKey));
                StreamDetails stream = new StreamDetails(new FileInputStream(profilePicture), "image/jpeg", profilePicture.length());
-                FileServerAPI.shared.uploadProfilePicture(FileServerAPI.shared.getServer(), profileKey, stream, () -> {
-                    TextSecurePreferences.setLastProfilePictureUpload(this, new Date().getTime());
-                    TextSecurePreferences.setProfileAvatarId(this, new SecureRandom().nextInt());
-                    ProfileKeyUtil.setEncodedProfileKey(this, encodedProfileKey);
-                    return Unit.INSTANCE;
-                });
+                throw new IOException();
+//                FileServerAPI.uploadProfilePicture(FileServerAPI.shared.getServer(), profileKey, stream, () -> {
+//                    TextSecurePreferences.setLastProfilePictureUpload(this, new Date().getTime());
+//                    TextSecurePreferences.setProfileAvatarId(this, new SecureRandom().nextInt());
+//                    ProfileKeyUtil.setEncodedProfileKey(this, encodedProfileKey);
+//                    return Unit.INSTANCE;
+//                });
            } catch (Exception exception) {
                // Do nothing
            }
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
@@ -19,12 +19,12 @@ import android.widget.Toast
 import androidx.annotation.ColorRes
 import kotlinx.android.synthetic.main.activity_path.*
 import network.loki.messenger.R
+import org.session.libsession.snode.OnionRequestAPI
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.loki.utilities.*
 import org.thoughtcrime.securesms.loki.views.GlowViewUtilities
 import org.thoughtcrime.securesms.loki.views.PathDotView
 import org.session.libsignal.service.loki.api.Snode
-import org.session.libsignal.service.loki.api.onionrequests.OnionRequestAPI

 class PathActivity : PassphraseRequiredActionBarActivity() {
    private val broadcastReceivers = mutableListOf<BroadcastReceiver>()
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
@@ -28,13 +28,13 @@ import nl.komponents.kovenant.functional.bind
 import nl.komponents.kovenant.task
 import nl.komponents.kovenant.ui.alwaysUi
 import org.session.libsession.messaging.avatars.AvatarHelper
+import org.session.libsession.messaging.fileserver.FileServerAPI
 import org.session.libsession.messaging.opengroups.OpenGroupAPI
 import org.session.libsession.messaging.threads.Address
 import org.session.libsession.utilities.SSKEnvironment.ProfileManagerProtocol
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsession.utilities.preferences.ProfileKeyUtil
 import org.session.libsignal.service.api.util.StreamDetails
-import org.session.libsignal.service.loki.api.fileserver.FileServerAPI
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.avatar.AvatarSelection
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt
@@ -10,11 +10,12 @@ import nl.komponents.kovenant.functional.map
 import org.session.libsession.messaging.jobs.MessageReceiveJob
 import org.session.libsession.messaging.opengroups.OpenGroup
 import org.session.libsession.messaging.sending_receiving.pollers.OpenGroupPoller
+import org.session.libsession.snode.SnodeAPI
 import org.session.libsession.utilities.TextSecurePreferences
-import org.session.libsignal.service.loki.api.SnodeAPI
 import org.session.libsignal.utilities.logging.Log
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.database.DatabaseFactory
+import java.io.IOException
 import java.util.concurrent.TimeUnit

 class BackgroundPollWorker(val context: Context, params: WorkerParameters) : Worker(context, params) {
@@ -70,10 +71,11 @@ class BackgroundPollWorker(val context: Context, params: WorkerParameters) : Wor

            // Private chats
            val userPublicKey = TextSecurePreferences.getLocalNumber(context)!!
-            val privateChatsPromise = SnodeAPI.shared.getMessages(userPublicKey).map { envelopes ->
-                envelopes.map { envelope ->
-                    MessageReceiveJob(envelope.toByteArray(), false).executeAsync()
-                }
+            val privateChatsPromise = SnodeAPI.getMessages(userPublicKey).map { envelopes ->
+                throw IOException()
+//                envelopes.map { envelope ->
+//                    MessageReceiveJob(envelope.toByteArray(), false).executeAsync()
+//                }
            }
            promises.addAll(privateChatsPromise.get())

--- a/app/src/main/java/org/thoughtcrime/securesms/loki/api/LokiPushNotificationManager.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/api/LokiPushNotificationManager.kt
@@ -3,12 +3,12 @@ package org.thoughtcrime.securesms.loki.api
 import android.content.Context
 import nl.komponents.kovenant.functional.map
 import okhttp3.*
+import org.session.libsession.messaging.sending_receiving.notifications.PushNotificationAPI
+import org.session.libsession.snode.OnionRequestAPI
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsignal.utilities.logging.Log
 import org.session.libsignal.utilities.JsonUtil
-import org.session.libsignal.service.loki.api.PushNotificationAPI
-import org.session.libsignal.service.loki.api.onionrequests.OnionRequestAPI
 import org.session.libsignal.service.loki.utilities.retryIfNeeded

 object LokiPushNotificationManager {
@@ -16,10 +16,10 @@ object LokiPushNotificationManager {
    private val tokenExpirationInterval = 12 * 60 * 60 * 1000

    private val server by lazy {
-        PushNotificationAPI.shared.server
+        PushNotificationAPI.server
    }
    private val pnServerPublicKey by lazy {
-        PushNotificationAPI.pnServerPublicKey
+        PushNotificationAPI.serverPublicKey
    }

    enum class ClosedGroupOperation {
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt
@@ -7,7 +7,7 @@ import android.content.IntentFilter
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import org.session.libsignal.utilities.logging.Log
 import com.opencsv.CSVReader
-import org.session.libsignal.service.loki.api.onionrequests.OnionRequestAPI
+import org.session.libsession.snode.OnionRequestAPI
 import org.session.libsignal.utilities.ThreadUtils
 import java.io.File
 import java.io.FileOutputStream
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/PathStatusView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/views/PathStatusView.kt
@@ -11,9 +11,9 @@ import android.util.AttributeSet
 import android.view.View
 import androidx.annotation.ColorInt
 import network.loki.messenger.R
+import org.session.libsession.snode.OnionRequestAPI
 import org.thoughtcrime.securesms.loki.utilities.getColorWithID
 import org.thoughtcrime.securesms.loki.utilities.toPx
-import org.session.libsignal.service.loki.api.onionrequests.OnionRequestAPI

 class PathStatusView : View {
    private val broadcastReceivers = mutableListOf<BroadcastReceiver>()
--- a/app/src/main/java/org/thoughtcrime/securesms/mms/PushMediaConstraints.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mms/PushMediaConstraints.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.mms;

 import android.content.Context;

-import org.session.libsignal.service.loki.api.fileserver.FileServerAPI;
+import org.session.libsession.messaging.fileserver.FileServerAPI;

 public class PushMediaConstraints extends MediaConstraints {