Merge pull request #1115 from session-foundation/release/1.23.0

Release 1.23.0

Author: SessionHero01

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "libsession-util/libsession-util"]
-	path = libsession-util/libsession-util
-	url = https://github.com/session-foundation/libsession-util.git

app/build.gradle

@@ -15,8 +15,8 @@ configurations.configureEach {
     exclude module: "commons-logging"
 }
 
-def canonicalVersionCode = 403
-def canonicalVersionName = "1.22.1"
+def canonicalVersionCode = 406
+def canonicalVersionName = "1.23.0"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,
@@ -126,6 +126,7 @@ android {
             isDefault true
             minifyEnabled false
             enableUnitTestCoverage true
+            signingConfig signingConfigs.debug
         }
     }
 
@@ -146,6 +147,15 @@ android {
                 keyPassword SESSION_HUAWEI_KEY_PASSWORD
             }
         }
+
+        debug {
+            // This keystore is for debug builds only and it should never be used to
+            // sign the release apk.
+            storeFile new File(rootProject.projectDir, "etc/debug.keystore")
+            storePassword "android"
+            keyAlias "androiddebugkey"
+            keyPassword "android"
+        }
     }
 
     flavorDimensions "distribution"
@@ -270,7 +280,7 @@ dependencies {
 
     implementation("com.google.dagger:hilt-android:$daggerHiltVersion")
     implementation "androidx.appcompat:appcompat:$appcompatVersion"
-    implementation 'androidx.recyclerview:recyclerview:1.3.2'
+    implementation 'androidx.recyclerview:recyclerview:1.4.0'
     implementation "com.google.android.material:material:$materialVersion"
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
@@ -279,19 +289,19 @@ dependencies {
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation 'androidx.exifinterface:exifinterface:1.3.4'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-process:$lifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
     implementation "androidx.paging:paging-runtime-ktx:$pagingVersion"
-    implementation 'androidx.activity:activity-ktx:1.9.2'
-    implementation 'androidx.activity:activity-compose:1.9.2'
-    implementation 'androidx.fragment:fragment-ktx:1.8.4'
+    implementation 'androidx.activity:activity-ktx:1.10.1'
+    implementation 'androidx.activity:activity-compose:1.10.1'
+    implementation 'androidx.fragment:fragment-ktx:1.8.6'
     implementation "androidx.core:core-ktx:$coreVersion"
-    implementation "androidx.work:work-runtime-ktx:2.7.1"
+    implementation "androidx.work:work-runtime-ktx:2.10.0"
 
     playImplementation ("com.google.firebase:firebase-messaging:24.0.0") {
         exclude group: 'com.google.firebase', module: 'firebase-core'
@@ -305,21 +315,15 @@ dependencies {
     implementation 'androidx.media3:media3-ui:1.4.0'
     implementation 'org.conscrypt:conscrypt-android:2.5.2'
     implementation 'org.signal:aesgcmprovider:0.0.3'
-    implementation 'io.github.webrtc-sdk:android:125.6422.06.1'
+    implementation 'io.github.webrtc-sdk:android:125.6422.07'
     implementation "me.leolin:ShortcutBadger:1.1.16"
-    implementation 'se.emilsjolander:stickylistheaders:2.7.0'
-    implementation 'com.jpardogo.materialtabstrip:library:1.0.9'
     implementation 'org.apache.httpcomponents:httpclient-android:4.3.5'
-    implementation 'commons-net:commons-net:3.7.2'
     implementation 'com.github.chrisbanes:PhotoView:2.1.3'
     implementation "com.github.bumptech.glide:glide:$glideVersion"
     implementation "com.github.bumptech.glide:compose:1.0.0-beta01"
     implementation 'com.makeramen:roundedimageview:2.1.0'
-    implementation 'com.pnikosis:materialish-progress:1.5'
     implementation 'org.greenrobot:eventbus:3.0.0'
-    implementation 'pl.tajchert:waitingdots:0.1.0'
     implementation 'com.vanniktech:android-image-cropper:4.5.0'
-    implementation 'com.melnykov:floatingactionbutton:1.3.0'
     implementation ('com.davemorrissey.labs:subsampling-scale-image-view:3.6.0') {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
@@ -331,12 +335,10 @@ dependencies {
         exclude group: 'com.squareup.okhttp', module: 'okhttp-urlconnection'
     }
     implementation 'com.annimon:stream:1.1.8'
-    implementation 'com.github.dmytrodanylyk.circular-progress-button:library:1.1.3-S2'
     implementation 'androidx.sqlite:sqlite-ktx:2.3.1'
-    implementation 'net.zetetic:sqlcipher-android:4.6.1@aar'
+    implementation 'net.zetetic:sqlcipher-android:4.7.2'
     implementation project(":libsignal")
     implementation project(":libsession")
-    implementation project(":libsession-util")
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinxJsonVersion"
     implementation "com.github.session-foundation.session-android-curve-25519:curve25519-java:$curve25519Version"
     implementation project(":liblazysodium")
@@ -364,9 +366,6 @@ dependencies {
     // Core library
     androidTestImplementation "androidx.test:core:$testCoreVersion"
 
-    androidTestImplementation('com.adevinta.android:barista:4.2.0') {
-        exclude group: 'org.jetbrains.kotlin'
-    }
     // AndroidJUnitRunner and JUnit Rules
     androidTestImplementation 'androidx.test:runner:1.5.2'
     androidTestImplementation 'androidx.test:rules:1.5.0'
@@ -395,7 +394,7 @@ dependencies {
     testImplementation 'app.cash.turbine:turbine:1.1.0'
 
     // compose
-    Dependency composeBom = platform('androidx.compose:compose-bom:2024.09.01')
+    Dependency composeBom = platform('androidx.compose:compose-bom:2025.03.01')
     implementation composeBom
     testImplementation composeBom
     androidTestImplementation composeBom

app/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-sdk tools:overrideLibrary="com.astuetz.pagerslidingtabstrip,pl.tajchert.waitingdots,com.h6ah4i.android.multiselectlistpreferencecompat,android.support.v13,com.davemorrissey.labs.subscaleview,com.tomergoldst.tooltips,com.klinker.android.send_message,com.takisoft.colorpicker,android.support.v14.preference" />
+    <uses-sdk tools:overrideLibrary="android.support.v13,com.davemorrissey.labs.subscaleview,com.tomergoldst.tooltips,com.klinker.android.send_message,android.support.v14.preference" />
 
     <permission
         android:name="network.loki.messenger.ACCESS_SESSION_SECRETS"
@@ -62,7 +62,6 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- Only used on Android API 29 and lower -->
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
-    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
     <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
     <uses-permission android:name="network.loki.messenger.ACCESS_SESSION_SECRETS" />
 
@@ -174,7 +173,7 @@
             android:name="org.thoughtcrime.securesms.recoverypassword.RecoveryPasswordActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="org.thoughtcrime.securesms.contacts.SelectContactsActivity"
+            android:name="org.thoughtcrime.securesms.contacts.SelectContactsToInviteToGroupActivity"
             android:screenOrientation="portrait" />
         <activity
             android:name="org.thoughtcrime.securesms.preferences.PrivacySettingsActivity"
@@ -315,6 +314,7 @@
                 android:value="org.thoughtcrime.securesms.home.HomeActivity" />
         </activity>
         <activity android:name="org.thoughtcrime.securesms.media.MediaOverviewActivity" />
+        <activity android:name="org.thoughtcrime.securesms.migration.DatabaseMigrationStateActivity" />
 
         <service
             android:name="org.thoughtcrime.securesms.service.KeyCachingService"

app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.kt

@@ -93,6 +93,7 @@ import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.logging.AndroidLogger
 import org.thoughtcrime.securesms.logging.PersistentLogger
 import org.thoughtcrime.securesms.logging.UncaughtExceptionLogger
+import org.thoughtcrime.securesms.migration.DatabaseMigrationManager
 import org.thoughtcrime.securesms.notifications.BackgroundPollManager
 import org.thoughtcrime.securesms.notifications.NotificationChannels
 import org.thoughtcrime.securesms.notifications.PushRegistrationHandler
@@ -164,6 +165,7 @@ class ApplicationContext : Application(), DefaultLifecycleObserver,
     @Inject lateinit var destroyedGroupSync: DestroyedGroupSync
     @Inject lateinit var removeGroupMemberHandler: RemoveGroupMemberHandler // Exists here only to start upon app starts
     @Inject lateinit var snodeClock: SnodeClock
+    @Inject lateinit var migrationManager: DatabaseMigrationManager
 
     @get:Deprecated(message = "Use proper DI to inject this component")
     @Inject
@@ -205,6 +207,11 @@ class ApplicationContext : Application(), DefaultLifecycleObserver,
     @Volatile
     var isAppVisible: Boolean = false
 
+    override val workManagerConfiguration: Configuration
+        get() = Configuration.Builder()
+            .setWorkerFactory(workerFactory)
+            .build()
+
     override fun getSystemService(name: String): Any? {
         if (MessagingModuleConfiguration.MESSAGING_MODULE_SERVICE == name) {
             return messagingModuleConfiguration!!
@@ -313,6 +320,9 @@ class ApplicationContext : Application(), DefaultLifecycleObserver,
         adminStateSync.start()
         cleanupInvitationHandler.start()
 
+        // Start our migration process as early as possible so we can show the user a progress UI
+        migrationManager.requestMigration(fromRetry = false)
+
         // add our shortcut debug menu if we are not in a release build
         if (BuildConfig.BUILD_TYPE != "release") {
             // add the config settings shortcut
@@ -330,12 +340,6 @@ class ApplicationContext : Application(), DefaultLifecycleObserver,
         }
     }
 
-    override fun getWorkManagerConfiguration(): Configuration {
-        return Configuration.Builder()
-            .setWorkerFactory(workerFactory)
-            .build()
-    }
-
     override fun onStart(owner: LifecycleOwner) {
         isAppVisible = true
         Log.i(TAG, "App is now visible.")
@@ -439,9 +443,9 @@ class ApplicationContext : Application(), DefaultLifecycleObserver,
     private class ProviderInitializationException : RuntimeException()
 
     private fun setUpPollingIfNeeded() {
-        val userPublicKey = textSecurePreferences!!.getLocalNumber() ?: return
+        val userPublicKey = textSecurePreferences.getLocalNumber() ?: return
         if (poller == null) {
-            poller = Poller(configFactory!!, storage!!, lokiAPIDatabase!!)
+            poller = Poller(configFactory, storage, lokiAPIDatabase, prefs)
         }
     }
 
@@ -450,7 +454,7 @@ class ApplicationContext : Application(), DefaultLifecycleObserver,
         if (poller != null) {
             poller!!.startIfNeeded()
         }
-        legacyClosedGroupPollerV2!!.start()
+        legacyClosedGroupPollerV2.start()
     }
 
     fun retrieveUserProfile() {