Prepare for Release/1.31.0 #1876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

SessionHero01 wants to merge 313 commits into master from release/1.31.0

.github/workflows/build_and_test.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -30,7 +30,7 @@ jobs:
  
              submodules: 'recursive'

          - name: Cache Gradle

            uses: actions/cache@v4

            uses: actions/cache@v5

            with:

              path: |

                ~/.gradle/caches

    @@ -54,14 +54,14 @@ jobs:
  
          - name: Upload build reports regardless

            if: always()

            uses: actions/upload-artifact@v5

            uses: actions/upload-artifact@v6

            with:

              name: build-reports-${{ matrix.variant }}-${{ matrix.build_type }}

              path: app/build/reports

              if-no-files-found: ignore

          - name: Upload artifacts

            uses: actions/upload-artifact@v5

            uses: actions/upload-artifact@v6

            with:

              name: session-${{ matrix.variant }}-${{ matrix.build_type }}

              path: app/build/outputs/apk/${{ matrix.variant }}/${{ matrix.build_type }}/*-universal*apk

app/build.gradle.kts

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -12,9 +12,9 @@ plugins {
  
        alias(libs.plugins.hilt.android)

        alias(libs.plugins.dependency.analysis)

        alias(libs.plugins.google.services)

        alias(libs.plugins.protobuf.compiler)

        id("generate-ip-country-data")

        id("local-snode-pool")

        id("rename-apk")

        id("witness")

    }

    @@ -26,8 +26,8 @@ configurations.configureEach {
  
        exclude(module = "commons-logging")

    }

    val canonicalVersionCode = 436

    val canonicalVersionName = "1.30.3"

    val canonicalVersionCode = 437

    val canonicalVersionName = "1.31.0"

    val postFixSize = 10

    val abiPostFix = mapOf(

    @@ -86,22 +86,7 @@ kotlin {
  
        }

    }

    protobuf {

        protoc {

            artifact = libs.protoc.get().toString()

        }

        plugins {

            generateProtoTasks {

                all().forEach {

                    it.builtins {

                        create("java") {

                        }

                    }

                }

            }

        }

    }

    val testJvmAgent = configurations.create("mockitoAgent")

    android {

        namespace = "network.loki.messenger"

    @@ -151,6 +136,13 @@ android {
  
            buildConfigField("String", "USER_AGENT", "\"OWA\"")

            buildConfigField("int", "CANONICAL_VERSION_CODE", "$canonicalVersionCode")

            buildConfigField("org.thoughtcrime.securesms.pro.ProBackendConfig", "PRO_BACKEND_DEV", """

                new org.thoughtcrime.securesms.pro.ProBackendConfig(

                    "https://pro-backend-dev.getsession.org",

                    "fc947730f49eb01427a66e050733294d9e520e545c7a27125a780634e0860a27"

                )

            """.trimIndent())

            testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

            testInstrumentationRunnerArguments["clearPackageData"] = "true"

            testOptions {

    @@ -303,6 +295,9 @@ android {
  
        testOptions {

            unitTests.isIncludeAndroidResources = true

            unitTests.all {

                it.jvmArgs("-javaagent:${testJvmAgent.asPath}")

            }

        }

        lint {

    @@ -332,6 +327,8 @@ android {
  
        testNamespace = "network.loki.messenger.test"

    }

    dependencies {

        implementation(project(":content-descriptions"))

    @@ -394,28 +391,19 @@ dependencies {
  
        implementation(libs.androidx.sqlite.ktx)

        implementation(libs.sqlcipher.android)

        implementation(libs.kotlinx.serialization.json)

        implementation(libs.protobuf.java)

        implementation(libs.jackson.databind)

        implementation(libs.okhttp)

        implementation(libs.phrase)

        implementation(libs.copper.flow)

        implementation(libs.kotlinx.coroutines.android)

        implementation(libs.kotlinx.coroutines.guava)

        implementation(libs.kovenant)

        implementation(libs.kovenant.android)

        implementation(libs.opencsv)

        implementation(libs.androidx.work.runtime.ktx)

        implementation(libs.rxbinding)

        if (hasIncludedLibSessionUtilProject) {

            implementation(

                group = libs.libsession.util.android.get().group,

                name = libs.libsession.util.android.get().name,

                version = "dev-snapshot"

            )

        } else {

            implementation(libs.libsession.util.android)

        }

        // If libsession_util project is included into the build, use that, otherwise use the published version

        findProject(":libsession-util-android")?.let(::implementation)

            ?: implementation(libs.libsession.util.android)

        implementation(libs.kryo)

        testImplementation(libs.junit)

    @@ -434,8 +422,14 @@ dependencies {
  
        androidTestImplementation(libs.androidx.junit)

        androidTestImplementation(libs.androidx.truth)

        testImplementation(libs.truth)

        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)

    @@ -449,7 +443,6 @@ dependencies {
  
        androidTestUtil(libs.androidx.orchestrator)

        testImplementation(libs.robolectric)

        testImplementation(libs.robolectric.shadows.multidex)

        testImplementation(libs.conscrypt.openjdk.uber)

        testImplementation(libs.turbine)

app/src/main/AndroidManifest.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -218,6 +218,17 @@ @@
                     <data android:mimeType="text/*" />
                     <data android:mimeType="*/*" />
                 </intent-filter>
+                <intent-filter>
+                    <action android:name="android.intent.action.SEND_MULTIPLE" />
+                    <category android:name="android.intent.category.DEFAULT" />
+                    <data android:mimeType="audio/*" />
+                    <data android:mimeType="image/*" />
+                    <data android:mimeType="text/plain" />
+                    <data android:mimeType="video/*" />
+                    <data android:mimeType="application/*" />
+                    <data android:mimeType="text/*" />
+                    <data android:mimeType="*/*" />
+                </intent-filter>
                 <meta-data
                     android:name="android.service.chooser.chooser_target_service"
                     android:value=".service.DirectShareService" />
@@ Expand Down @@

app/src/main/java/org/session/libsession/database/StorageProtocol.kt

-Original file line number
+Diff line change
@@ Expand Up / @@ -57,6 +57,7 @@ interface StorageProtocol { @@
         // Servers
         fun setServerCapabilities(server: String, capabilities: List<String>)
         fun getServerCapabilities(server: String): List<String>?
+        fun clearServerCapabilities(server: String)
         // Open Groups
         suspend fun addOpenGroup(urlAsString: String)
@@ Expand Down @@

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

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,9 +7,9 @@ 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.snode.SnodeClock
+    import org.session.libsession.network.SnodeClock
+    import org.session.libsession.network.onion.PathManager
     import org.session.libsession.utilities.ConfigFactoryProtocol
     import org.session.libsession.utilities.Device
     import org.session.libsession.utilities.TextSecurePreferences
@@ Expand All / @@ -28,14 +28,14 @@ class MessagingModuleConfiguration @Inject constructor( @@
         val configFactory: ConfigFactoryProtocol,
         val tokenFetcher: TokenFetcher,
         val groupManagerV2: GroupManagerV2,
-        val clock: SnodeClock,
         val preferences: TextSecurePreferences,
         val deprecationManager: LegacyGroupDeprecationManager,
         val recipientRepository: RecipientRepository,
         val avatarUtils: AvatarUtils,
         val proStatusManager: ProStatusManager,
-        val messageSendJobFactory: MessageSendJob.Factory,
         val json: Json,
+        val snodeClock: SnodeClock,
+        val pathManager: PathManager
     ) {
         companion object {
@@ Expand Down @@

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

-Original file line number
+Diff line change
@@ -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

-Original file line number
+Diff line change
@@ -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

-Original file line number
+Diff line change
@@ -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(
@@ Expand All / @@ -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
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Prepare for Release/1.31.0 #1876

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Prepare for Release/1.31.0 #1876

Are you sure you want to change the base?

Uh oh!

Prepare for Release/1.31.0 #1876

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!