Second phase of network refactoring (#1853)

Author: SessionHero01

app/build.gradle.kts

@@ -86,6 +86,8 @@ kotlin {
     }
 }
 
+val testJvmAgent = configurations.create("mockitoAgent")
+
 android {
     namespace = "network.loki.messenger"
 
@@ -293,6 +295,9 @@ android {
 
     testOptions {
         unitTests.isIncludeAndroidResources = true
+        unitTests.all {
+            it.jvmArgs("-javaagent:${testJvmAgent.asPath}")
+        }
     }
 
     lint {
@@ -322,6 +327,8 @@ android {
     testNamespace = "network.loki.messenger.test"
 }
 
+
+
 dependencies {
     implementation(project(":content-descriptions"))
 
@@ -418,6 +425,11 @@ dependencies {
     testImplementation(libs.androidx.sqlite.framework)
     androidTestImplementation(libs.truth)
     testRuntimeOnly(libs.mockito.core)
+    testImplementation(libs.mockk)
+    testImplementation(libs.kotlin.test)
+
+    // Pull in appropriate JVM agents for unit test
+    testJvmAgent(libs.mockito.core) { isTransitive = false }
 
     androidTestImplementation(libs.androidx.espresso.core)
     androidTestImplementation(libs.androidx.espresso.contrib)

app/src/main/java/org/session/libsession/messaging/MessagingModuleConfiguration.kt

@@ -7,9 +7,7 @@ import org.session.libsession.database.MessageDataProvider
 import org.session.libsession.database.StorageProtocol
 import org.session.libsession.messaging.groups.GroupManagerV2
 import org.session.libsession.messaging.groups.LegacyGroupDeprecationManager
-import org.session.libsession.messaging.jobs.MessageSendJob
 import org.session.libsession.messaging.notifications.TokenFetcher
-import org.session.libsession.network.ServerClient
 import org.session.libsession.network.SnodeClock
 import org.session.libsession.network.onion.PathManager
 import org.session.libsession.utilities.ConfigFactoryProtocol
@@ -35,10 +33,8 @@ class MessagingModuleConfiguration @Inject constructor(
     val recipientRepository: RecipientRepository,
     val avatarUtils: AvatarUtils,
     val proStatusManager: ProStatusManager,
-    val messageSendJobFactory: MessageSendJob.Factory,
     val json: Json,
     val snodeClock: SnodeClock,
-    val serverClient: ServerClient,
     val pathManager: PathManager
 ) {
 

app/src/main/java/org/session/libsession/messaging/file_server/FileDownloadApi.kt

@@ -0,0 +1,60 @@
+package org.session.libsession.messaging.file_server
+
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import org.thoughtcrime.securesms.api.server.ServerApiErrorManager
+import org.thoughtcrime.securesms.api.ApiExecutorContext
+import org.thoughtcrime.securesms.api.http.HttpBody
+import org.thoughtcrime.securesms.api.http.HttpRequest
+import org.thoughtcrime.securesms.api.http.HttpResponse
+import org.thoughtcrime.securesms.api.server.ServerApi
+import java.time.ZonedDateTime
+import java.time.format.DateTimeFormatter
+
+class FileDownloadApi @AssistedInject constructor(
+    @Assisted private val fileId: String,
+    errorManager: ServerApiErrorManager,
+) : ServerApi<FileDownloadApi.Response>(errorManager) {
+    override fun buildRequest(
+        baseUrl: String,
+        x25519PubKeyHex: String
+    ): HttpRequest {
+        return HttpRequest(
+            url = "$baseUrl/file/$fileId".toHttpUrl(),
+            method = "GET",
+            headers = emptyMap(),
+            body = null
+        )
+    }
+
+    override suspend fun handleSuccessResponse(
+        executorContext: ApiExecutorContext,
+        baseUrl: String,
+        response: HttpResponse
+    ): Response {
+        return Response(
+            data = response.body,
+            expires = response.parseFileServerExpiresHeader()
+        )
+    }
+
+    class Response(
+        val data: HttpBody,
+        val expires: ZonedDateTime?
+    )
+
+    @AssistedFactory
+    interface Factory {
+        fun create(fileId: String): FileDownloadApi
+    }
+
+    companion object {
+        fun HttpResponse.parseFileServerExpiresHeader(): ZonedDateTime? {
+            return headers["expires"]?.let {
+                ZonedDateTime.parse(it, DateTimeFormatter.RFC_1123_DATE_TIME)
+            }
+        }
+    }
+}

app/src/main/java/org/session/libsession/messaging/file_server/FileRenewApi.kt

@@ -0,0 +1,40 @@
+package org.session.libsession.messaging.file_server
+
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import org.thoughtcrime.securesms.api.server.ServerApiErrorManager
+import org.thoughtcrime.securesms.api.ApiExecutorContext
+import org.thoughtcrime.securesms.api.http.HttpRequest
+import org.thoughtcrime.securesms.api.http.HttpResponse
+import org.thoughtcrime.securesms.api.server.ServerApi
+
+class FileRenewApi @AssistedInject constructor(
+    @Assisted private val fileId: String,
+    errorManager: ServerApiErrorManager,
+) : ServerApi<Unit>(errorManager) {
+
+    override fun buildRequest(
+        baseUrl: String,
+        x25519PubKeyHex: String
+    ): HttpRequest {
+        return HttpRequest(
+            url = "$baseUrl/file/$fileId/extend".toHttpUrl(),
+            method = "POST",
+            headers = emptyMap(),
+            body = null,
+        )
+    }
+
+    override suspend fun handleSuccessResponse(
+        executorContext: ApiExecutorContext,
+        baseUrl: String,
+        response: HttpResponse
+    ) = Unit
+
+    @AssistedFactory
+    interface Factory {
+        fun create(fileId: String): FileRenewApi
+    }
+}

app/src/main/java/org/session/libsession/messaging/file_server/FileServer.kt

@@ -1,9 +1,11 @@
 package org.session.libsession.messaging.file_server
 
 import kotlinx.serialization.Serializable
+import network.loki.messenger.libsession_util.Curve25519
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import org.session.libsession.utilities.serializable.HttpUrlSerializer
+import org.session.libsignal.utilities.Hex
 
 @Serializable
 data class FileServer(
@@ -12,6 +14,12 @@ data class FileServer(
     val ed25519PublicKeyHex: String
 ) {
     constructor(url: String, ed25519PublicKeyHex: String) : this(url.toHttpUrl(), ed25519PublicKeyHex)
+
+    val x25519PubKeyHex: String by lazy {
+        Hex.toStringCondensed(
+            Curve25519.pubKeyFromED25519(Hex.fromStringCondensed(ed25519PublicKeyHex))
+        )
+    }
 }
 
 val HttpUrl.isOfficial: Boolean