TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-27 12:05:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move files

Browse Source
This commit is contained in:
Niels Andriesse 2021-05-18 09:17:22 +10:00
parent a88322a033
commit ce3b32c03e
20 changed files with 29 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt
View File

@ -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

2
app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt
View File

@ -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

2
app/src/main/java/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt
View File

@ -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() {

2
app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt
View File

@ -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

14
libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPIV2.kt
View File

@ -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<String, String> = mapOf(),
val parameters: Any? = null,
val headers: Map<String, String> = mapOf(),
/**
val verb: HTTP.Verb,
val endpoint: String,
val queryParameters: Map<String, String> = mapOf(),
val parameters: Any? = null,
val headers: Map<String, String> = mapOf(),
/**
* Always `true` under normal circumstances. You might want to disable
* this when running over Lokinet.
*/

22
libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt
View File

@ -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<String, String> = mapOf(),
val parameters: Any? = null,
val headers: Map<String, String> = mapOf(),
val isAuthRequired: Boolean = true,
/**
val verb: HTTP.Verb,
val room: String?,
val server: String,
val endpoint: String,
val queryParameters: Map<String, String> = mapOf(),
val parameters: Any? = null,
val headers: Map<String, String> = mapOf(),
val isAuthRequired: Boolean = true,
/**
* Always `true` under normal circumstances. You might want to disable
* this when running over Lokinet.
*/

4
libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt
View File

@ -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

2
libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt
View File

@ -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.*

2
libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
View File

@ -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

2
libsignal/src/main/java/org/session/libsignal/utilities/DiffieHellman.kt → libsignal/src/main/java/org/session/libsignal/crypto/DiffieHellman.kt
View File

@ -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

2
libsignal/src/main/java/org/session/libsignal/service/loki/MnemonicCodec.kt → libsignal/src/main/java/org/session/libsignal/crypto/MnemonicCodec.kt
View File

@ -1,4 +1,4 @@
package org.session.libsignal.service.loki
package org.session.libsignal.crypto
import java.util.zip.CRC32

0
libsignal/src/main/java/org/session/libsignal/service/loki/Random.kt → libsignal/src/main/java/org/session/libsignal/crypto/Random.kt
View File

14
libsignal/src/main/java/org/session/libsignal/service/loki/SignalMessageInfo.kt
View File

@ -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
)

4
libsignal/src/main/java/org/session/libsignal/service/loki/HTTP.kt → libsignal/src/main/java/org/session/libsignal/utilities/HTTP.kt
View File

@ -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

0
libsignal/src/main/java/org/session/libsignal/service/loki/HexEncoding.kt → libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt
View File

0
libsignal/src/main/java/org/session/libsignal/service/loki/PrettifiedDescription.kt → libsignal/src/main/java/org/session/libsignal/utilities/PrettifiedDescription.kt
View File

0
libsignal/src/main/java/org/session/libsignal/service/loki/Reflection.kt → libsignal/src/main/java/org/session/libsignal/utilities/Reflection.kt
View File

0
libsignal/src/main/java/org/session/libsignal/service/loki/Retrying.kt → libsignal/src/main/java/org/session/libsignal/utilities/Retrying.kt
View File

0
libsignal/src/main/java/org/session/libsignal/service/loki/Trimming.kt → libsignal/src/main/java/org/session/libsignal/utilities/Trimming.kt
View File

0
libsignal/src/main/java/org/session/libsignal/service/loki/Validation.kt → libsignal/src/main/java/org/session/libsignal/utilities/Validation.kt
View File