From ce3b32c03e22704333db9103401e719c11a3af7c Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 18 May 2021 09:17:22 +1000 Subject: [PATCH] Move files --- .../loki/activities/LinkDeviceActivity.kt | 2 +- .../RecoveryPhraseRestoreActivity.kt | 2 +- .../securesms/loki/activities/SeedActivity.kt | 2 +- .../securesms/loki/dialogs/SeedDialog.kt | 2 +- .../messaging/file_server/FileServerAPIV2.kt | 14 ++++++------ .../messaging/open_groups/OpenGroupAPIV2.kt | 22 +++++++++---------- .../messaging/utilities/DotNetAPI.kt | 4 ++-- .../libsession/snode/OnionRequestAPI.kt | 2 +- .../org/session/libsession/snode/SnodeAPI.kt | 2 +- .../{utilities => crypto}/DiffieHellman.kt | 2 +- .../{service/loki => crypto}/MnemonicCodec.kt | 2 +- .../{service/loki => crypto}/Random.kt | 0 .../service/loki/SignalMessageInfo.kt | 14 ------------ .../{service/loki => utilities}/HTTP.kt | 4 +--- .../loki => utilities}/HexEncoding.kt | 0 .../PrettifiedDescription.kt | 0 .../{service/loki => utilities}/Reflection.kt | 0 .../{service/loki => utilities}/Retrying.kt | 0 .../{service/loki => utilities}/Trimming.kt | 0 .../{service/loki => utilities}/Validation.kt | 0 20 files changed, 29 insertions(+), 45 deletions(-) rename libsignal/src/main/java/org/session/libsignal/{utilities => crypto}/DiffieHellman.kt (97%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => crypto}/MnemonicCodec.kt (99%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => crypto}/Random.kt (100%) delete mode 100644 libsignal/src/main/java/org/session/libsignal/service/loki/SignalMessageInfo.kt rename libsignal/src/main/java/org/session/libsignal/{service/loki => utilities}/HTTP.kt (97%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => utilities}/HexEncoding.kt (100%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => utilities}/PrettifiedDescription.kt (100%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => utilities}/Reflection.kt (100%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => utilities}/Retrying.kt (100%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => utilities}/Trimming.kt (100%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => utilities}/Validation.kt (100%) diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt index b9d8a9b0eb..540f2edc9a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt @@ -27,7 +27,7 @@ import kotlinx.coroutines.launch import network.loki.messenger.R import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.libsignal.util.KeyHelper -import org.session.libsignal.service.loki.MnemonicCodec +import org.session.libsignal.crypto.MnemonicCodec import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey import org.session.libsignal.utilities.Hex import org.session.libsignal.utilities.Log diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt index 841b9e789a..d0f1fcb113 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt @@ -15,7 +15,7 @@ import kotlinx.android.synthetic.main.activity_recovery_phrase_restore.* import network.loki.messenger.R import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.libsignal.util.KeyHelper -import org.session.libsignal.service.loki.MnemonicCodec +import org.session.libsignal.crypto.MnemonicCodec import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey import org.session.libsignal.utilities.Hex import org.thoughtcrime.securesms.BaseActionBarActivity diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt index 9ee8025335..10fdc5cbc1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt @@ -16,7 +16,7 @@ import org.session.libsession.utilities.IdentityKeyUtil import org.thoughtcrime.securesms.loki.utilities.MnemonicUtilities import org.thoughtcrime.securesms.loki.utilities.getColorWithID import org.session.libsession.utilities.TextSecurePreferences -import org.session.libsignal.service.loki.MnemonicCodec +import org.session.libsignal.crypto.MnemonicCodec import org.session.libsignal.service.loki.utilities.hexEncodedPrivateKey class SeedActivity : BaseActionBarActivity() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt index d327efe973..8bd2e5c7da 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt @@ -15,7 +15,7 @@ import kotlinx.android.synthetic.main.dialog_seed.view.* import network.loki.messenger.R import org.session.libsession.utilities.IdentityKeyUtil import org.thoughtcrime.securesms.loki.utilities.MnemonicUtilities -import org.session.libsignal.service.loki.MnemonicCodec +import org.session.libsignal.crypto.MnemonicCodec import org.session.libsignal.service.loki.utilities.hexEncodedPrivateKey diff --git a/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPIV2.kt b/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPIV2.kt index 619b78aced..bb3301b8cf 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPIV2.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPIV2.kt @@ -8,7 +8,7 @@ import okhttp3.MediaType import okhttp3.RequestBody import org.session.libsession.messaging.open_groups.OpenGroupAPIV2 import org.session.libsession.snode.OnionRequestAPI -import org.session.libsignal.service.loki.HTTP +import org.session.libsignal.utilities.HTTP import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.JsonUtil import org.session.libsignal.utilities.Log @@ -24,12 +24,12 @@ object FileServerAPIV2 { } data class Request( - val verb: HTTP.Verb, - val endpoint: String, - val queryParameters: Map = mapOf(), - val parameters: Any? = null, - val headers: Map = mapOf(), - /** + val verb: HTTP.Verb, + val endpoint: String, + val queryParameters: Map = mapOf(), + val parameters: Any? = null, + val headers: Map = mapOf(), + /** * Always `true` under normal circumstances. You might want to disable * this when running over Lokinet. */ diff --git a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt index 2bdbd9daf6..8bd44a9a19 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt @@ -15,8 +15,8 @@ import okhttp3.RequestBody import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.snode.OnionRequestAPI import org.session.libsession.utilities.AESGCM -import org.session.libsignal.service.loki.HTTP -import org.session.libsignal.service.loki.HTTP.Verb.* +import org.session.libsignal.utilities.HTTP +import org.session.libsignal.utilities.HTTP.Verb.* import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded import org.session.libsignal.service.loki.utilities.toHexString import org.session.libsignal.utilities.Base64.* @@ -65,15 +65,15 @@ object OpenGroupAPIV2 { } data class Request( - val verb: HTTP.Verb, - val room: String?, - val server: String, - val endpoint: String, - val queryParameters: Map = mapOf(), - val parameters: Any? = null, - val headers: Map = mapOf(), - val isAuthRequired: Boolean = true, - /** + val verb: HTTP.Verb, + val room: String?, + val server: String, + val endpoint: String, + val queryParameters: Map = mapOf(), + val parameters: Any? = null, + val headers: Map = mapOf(), + val isAuthRequired: Boolean = true, + /** * Always `true` under normal circumstances. You might want to disable * this when running over Lokinet. */ diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt index 2f5b16048a..90a4704440 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt @@ -10,7 +10,7 @@ import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.snode.OnionRequestAPI import org.session.libsession.messaging.file_server.FileServerAPI -import org.session.libsignal.utilities.DiffieHellman +import org.session.libsignal.crypto.DiffieHellman import org.session.libsignal.service.api.crypto.ProfileCipherOutputStream import org.session.libsignal.service.api.push.exceptions.NonSuccessfulResponseCodeException import org.session.libsignal.service.api.push.exceptions.PushNetworkException @@ -21,7 +21,7 @@ import org.session.libsignal.service.internal.push.http.DigestingRequestBody import org.session.libsignal.service.internal.push.http.ProfileCipherOutputStreamFactory import org.session.libsignal.utilities.Hex import org.session.libsignal.utilities.JsonUtil -import org.session.libsignal.service.loki.HTTP +import org.session.libsignal.utilities.HTTP import org.session.libsignal.service.loki.utilities.* import org.session.libsignal.utilities.* import org.session.libsignal.utilities.Base64 diff --git a/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt b/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt index b983815a85..209fa12ac1 100644 --- a/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt +++ b/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt @@ -17,7 +17,7 @@ import org.session.libsession.utilities.AESGCM.EncryptionResult import org.session.libsession.utilities.getBodyForOnionRequest import org.session.libsession.utilities.getHeadersForOnionRequest import org.session.libsignal.service.loki.Broadcaster -import org.session.libsignal.service.loki.HTTP +import org.session.libsignal.utilities.HTTP import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol import org.session.libsignal.service.loki.utilities.* diff --git a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt index b52cb9cd6b..239e70e537 100644 --- a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt +++ b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt @@ -10,7 +10,7 @@ import org.session.libsession.messaging.utilities.MessageWrapper import org.session.libsession.snode.utilities.getRandomElement import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.service.loki.Snode -import org.session.libsignal.service.loki.HTTP +import org.session.libsignal.utilities.HTTP import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol import org.session.libsignal.service.loki.Broadcaster import org.session.libsignal.service.loki.utilities.prettifiedDescription diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/DiffieHellman.kt b/libsignal/src/main/java/org/session/libsignal/crypto/DiffieHellman.kt similarity index 97% rename from libsignal/src/main/java/org/session/libsignal/utilities/DiffieHellman.kt rename to libsignal/src/main/java/org/session/libsignal/crypto/DiffieHellman.kt index a3b3f53527..8e009334ad 100644 --- a/libsignal/src/main/java/org/session/libsignal/utilities/DiffieHellman.kt +++ b/libsignal/src/main/java/org/session/libsignal/crypto/DiffieHellman.kt @@ -1,4 +1,4 @@ -package org.session.libsignal.utilities +package org.session.libsignal.crypto import org.whispersystems.curve25519.Curve25519 import org.session.libsignal.service.internal.util.Util diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/MnemonicCodec.kt b/libsignal/src/main/java/org/session/libsignal/crypto/MnemonicCodec.kt similarity index 99% rename from libsignal/src/main/java/org/session/libsignal/service/loki/MnemonicCodec.kt rename to libsignal/src/main/java/org/session/libsignal/crypto/MnemonicCodec.kt index 122354f33d..73c86f321e 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/loki/MnemonicCodec.kt +++ b/libsignal/src/main/java/org/session/libsignal/crypto/MnemonicCodec.kt @@ -1,4 +1,4 @@ -package org.session.libsignal.service.loki +package org.session.libsignal.crypto import java.util.zip.CRC32 diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/Random.kt b/libsignal/src/main/java/org/session/libsignal/crypto/Random.kt similarity index 100% rename from libsignal/src/main/java/org/session/libsignal/service/loki/Random.kt rename to libsignal/src/main/java/org/session/libsignal/crypto/Random.kt diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/SignalMessageInfo.kt b/libsignal/src/main/java/org/session/libsignal/service/loki/SignalMessageInfo.kt deleted file mode 100644 index f5e20f4168..0000000000 --- a/libsignal/src/main/java/org/session/libsignal/service/loki/SignalMessageInfo.kt +++ /dev/null @@ -1,14 +0,0 @@ -package org.session.libsignal.service.loki - -import org.session.libsignal.service.internal.push.SignalServiceProtos - -data class SignalMessageInfo( - val type: SignalServiceProtos.Envelope.Type, - val timestamp: Long, - val senderPublicKey: String, - val senderDeviceID: Int, - val content: String, - val recipientPublicKey: String, - val ttl: Int?, - val isPing: Boolean -) diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/HTTP.kt b/libsignal/src/main/java/org/session/libsignal/utilities/HTTP.kt similarity index 97% rename from libsignal/src/main/java/org/session/libsignal/service/loki/HTTP.kt rename to libsignal/src/main/java/org/session/libsignal/utilities/HTTP.kt index 7aa42fd3a6..31038a4574 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/loki/HTTP.kt +++ b/libsignal/src/main/java/org/session/libsignal/utilities/HTTP.kt @@ -1,8 +1,6 @@ -package org.session.libsignal.service.loki +package org.session.libsignal.utilities import okhttp3.* -import org.session.libsignal.utilities.Log -import org.session.libsignal.utilities.JsonUtil import java.lang.IllegalStateException import java.security.SecureRandom import java.security.cert.X509Certificate diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/HexEncoding.kt b/libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt similarity index 100% rename from libsignal/src/main/java/org/session/libsignal/service/loki/HexEncoding.kt rename to libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/PrettifiedDescription.kt b/libsignal/src/main/java/org/session/libsignal/utilities/PrettifiedDescription.kt similarity index 100% rename from libsignal/src/main/java/org/session/libsignal/service/loki/PrettifiedDescription.kt rename to libsignal/src/main/java/org/session/libsignal/utilities/PrettifiedDescription.kt diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/Reflection.kt b/libsignal/src/main/java/org/session/libsignal/utilities/Reflection.kt similarity index 100% rename from libsignal/src/main/java/org/session/libsignal/service/loki/Reflection.kt rename to libsignal/src/main/java/org/session/libsignal/utilities/Reflection.kt diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/Retrying.kt b/libsignal/src/main/java/org/session/libsignal/utilities/Retrying.kt similarity index 100% rename from libsignal/src/main/java/org/session/libsignal/service/loki/Retrying.kt rename to libsignal/src/main/java/org/session/libsignal/utilities/Retrying.kt diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/Trimming.kt b/libsignal/src/main/java/org/session/libsignal/utilities/Trimming.kt similarity index 100% rename from libsignal/src/main/java/org/session/libsignal/service/loki/Trimming.kt rename to libsignal/src/main/java/org/session/libsignal/utilities/Trimming.kt diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/Validation.kt b/libsignal/src/main/java/org/session/libsignal/utilities/Validation.kt similarity index 100% rename from libsignal/src/main/java/org/session/libsignal/service/loki/Validation.kt rename to libsignal/src/main/java/org/session/libsignal/utilities/Validation.kt