Clean

2025-08-12 00:57:55 +00:00 · 2021-04-29 10:02:07 +10:00
parent 6a116100ae
commit 761c12addd
46 changed files with 56 additions and 146 deletions
--- a/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPI.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPI.kt
@@ -8,7 +8,7 @@ import org.session.libsession.snode.OnionRequestAPI
 import org.session.libsignal.utilities.logging.Log
 import org.session.libsignal.utilities.Base64
 import org.session.libsignal.utilities.JsonUtil
-import org.session.libsignal.service.loki.database.LokiAPIDatabaseProtocol
+import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol
 import org.session.libsignal.service.loki.utilities.*
 import java.net.URL

--- a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt
@@ -14,7 +14,7 @@ import org.session.libsignal.service.internal.crypto.PaddingInputStream
 import org.session.libsignal.service.internal.push.PushAttachmentData
 import org.session.libsignal.service.internal.push.http.AttachmentCipherOutputStreamFactory
 import org.session.libsignal.service.internal.util.Util
-import org.session.libsignal.service.loki.utilities.PlaintextOutputStreamFactory
+import org.session.libsignal.service.loki.PlaintextOutputStreamFactory
 import org.session.libsignal.utilities.logging.Log

 class AttachmentUploadJob(val attachmentID: Long, val threadID: String, val message: Message, val messageSendJobID: String) : Job {
--- a/libsession/src/main/java/org/session/libsession/messaging/mentions/MentionsManager.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/mentions/MentionsManager.kt
@@ -1,9 +1,9 @@
 package org.session.libsession.messaging.mentions

 import org.session.libsession.messaging.MessagingModuleConfiguration
-import org.session.libsignal.service.loki.utilities.mentions.Mention
+import org.session.libsignal.service.loki.Mention

-import org.session.libsignal.service.loki.database.LokiUserDatabaseProtocol
+import org.session.libsignal.service.loki.LokiUserDatabaseProtocol

 class MentionsManager(private val userPublicKey: String, private val userDatabase: LokiUserDatabaseProtocol) {
    var userPublicKeyCache = mutableMapOf<Long, Set<String>>() // Thread ID to set of user hex encoded public keys
--- a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPI.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPI.kt
@@ -21,7 +21,6 @@ import java.util.*
 object OpenGroupAPI: DotNetAPI() {

    private val moderators: HashMap<String, HashMap<Long, Set<String>>> = hashMapOf() // Server URL to (channel ID to set of moderator IDs)
-    val sharedContext = Kovenant.createContext()

    // region Settings
    private val fallbackBatchCount = 64
@@ -61,7 +60,7 @@ object OpenGroupAPI: DotNetAPI() {
            parameters["count"] = fallbackBatchCount
            parameters["include_deleted"] = 0
        }
-        return execute(HTTPVerb.GET, server, "channels/$channel/messages", parameters = parameters).then(sharedContext) { json ->
+        return execute(HTTPVerb.GET, server, "channels/$channel/messages", parameters = parameters).then { json ->
            try {
                val data = json["data"] as List<Map<*, *>>
                val messages = data.mapNotNull { message ->
@@ -166,7 +165,7 @@ object OpenGroupAPI: DotNetAPI() {
        } else {
            parameters["count"] = fallbackBatchCount
        }
-        return execute(HTTPVerb.GET, server, "loki/v1/channel/$channel/deletes", parameters = parameters).then(sharedContext) { json ->
+        return execute(HTTPVerb.GET, server, "loki/v1/channel/$channel/deletes", parameters = parameters).then { json ->
            try {
                val deletedMessageServerIDs = (json["data"] as List<Map<*, *>>).mapNotNull { deletion ->
                    try {
@@ -202,7 +201,7 @@ object OpenGroupAPI: DotNetAPI() {
                retryIfNeeded(maxRetryCount) {
                    Log.d("Loki", "Sending message to open group with ID: $channel on server: $server.")
                    val parameters = signedMessage.toJSON()
-                    execute(HTTPVerb.POST, server, "channels/$channel/messages", parameters = parameters).then(sharedContext) { json ->
+                    execute(HTTPVerb.POST, server, "channels/$channel/messages", parameters = parameters).then { json ->
                        try {
                            val data = json["data"] as Map<*, *>
                            val serverID = (data["id"] as? Long) ?: (data["id"] as? Int)?.toLong() ?: (data["id"] as String).toLong()
@@ -255,7 +254,7 @@ object OpenGroupAPI: DotNetAPI() {

    @JvmStatic
    fun getModerators(channel: Long, server: String): Promise<Set<String>, Exception> {
-        return execute(HTTPVerb.GET, server, "loki/v1/channel/$channel/get_moderators").then(sharedContext) { json ->
+        return execute(HTTPVerb.GET, server, "loki/v1/channel/$channel/get_moderators").then { json ->
            try {
                @Suppress("UNCHECKED_CAST") val moderators = json["moderators"] as? List<String>
                val moderatorsAsSet = moderators.orEmpty().toSet()
@@ -276,7 +275,7 @@ object OpenGroupAPI: DotNetAPI() {
    fun getChannelInfo(channel: Long, server: String): Promise<OpenGroupInfo, Exception> {
        return retryIfNeeded(maxRetryCount) {
            val parameters = mapOf( "include_annotations" to 1 )
-            execute(HTTPVerb.GET, server, "/channels/$channel", parameters = parameters).then(sharedContext) { json ->
+            execute(HTTPVerb.GET, server, "/channels/$channel", parameters = parameters).then { json ->
                try {
                    val data = json["data"] as Map<*, *>
                    val annotations = data["annotations"] as List<Map<*, *>>
@@ -357,7 +356,7 @@ object OpenGroupAPI: DotNetAPI() {

    @JvmStatic
    fun getDisplayNames(publicKeys: Set<String>, server: String): Promise<Map<String, String>, Exception> {
-        return getUserProfiles(publicKeys, server, false).map(sharedContext) { json ->
+        return getUserProfiles(publicKeys, server, false).map { json ->
            val mapping = mutableMapOf<String, String>()
            for (user in json) {
                if (user["username"] != null) {
--- a/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt
@@ -23,7 +23,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.api.utilities.HTTP
+import org.session.libsignal.service.loki.HTTP
 import org.session.libsignal.service.loki.utilities.*
 import org.session.libsignal.utilities.*
 import org.session.libsignal.utilities.Base64
--- a/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt
+++ b/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt
@@ -12,12 +12,14 @@ import org.session.libsignal.utilities.logging.Log
 import org.session.libsignal.utilities.Base64
 import org.session.libsignal.utilities.*
 import org.session.libsignal.service.loki.Snode
-import org.session.libsignal.service.loki.api.utilities.*
+import org.session.libsignal.service.loki.*
 import org.session.libsession.utilities.AESGCM.EncryptionResult
 import org.session.libsignal.utilities.ThreadUtils
 import org.session.libsession.utilities.getBodyForOnionRequest
 import org.session.libsession.utilities.getHeadersForOnionRequest
-import org.session.libsignal.service.loki.database.LokiAPIDatabaseProtocol
+import org.session.libsignal.service.loki.Broadcaster
+import org.session.libsignal.service.loki.HTTP
+import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol
 import org.session.libsignal.service.loki.utilities.*

 private typealias Path = List<Snode>
--- a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
+++ b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
@@ -10,9 +10,9 @@ 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.api.utilities.HTTP
-import org.session.libsignal.service.loki.database.LokiAPIDatabaseProtocol
-import org.session.libsignal.service.loki.utilities.Broadcaster
+import org.session.libsignal.service.loki.HTTP
+import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol
+import org.session.libsignal.service.loki.Broadcaster
 import org.session.libsignal.service.loki.utilities.prettifiedDescription
 import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded
 import org.session.libsignal.service.loki.utilities.retryIfNeeded
--- a/libsession/src/main/java/org/session/libsession/snode/SnodeModule.kt
+++ b/libsession/src/main/java/org/session/libsession/snode/SnodeModule.kt
@@ -1,7 +1,7 @@
 package org.session.libsession.snode

-import org.session.libsignal.service.loki.database.LokiAPIDatabaseProtocol
-import org.session.libsignal.service.loki.utilities.Broadcaster
+import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol
+import org.session.libsignal.service.loki.Broadcaster

 class SnodeModule(val storage: LokiAPIDatabaseProtocol, val broadcaster: Broadcaster) {