From 1106987c0c859e9761d2973df185a0a1f1d61d59 Mon Sep 17 00:00:00 2001
From: ThomasSession <thomas.r@getsession.org>
Date: Fri, 28 Mar 2025 10:33:01 +1030
Subject: [PATCH] Android target sdk 35 (#1063)

* Android target sdk 15

Removed unused libraries
Fixed broken icon colors

* Bumping libsession-util
---
 app/build.gradle                              | 22 +++++--------------
 app/src/main/AndroidManifest.xml              |  2 +-
 .../securesms/ApplicationContext.kt           | 11 +++++-----
 .../menus/ConversationActionModeCallback.kt   | 18 ++++++++++++++-
 .../conversation/v2/messages/DocumentView.kt  |  1 +
 app/src/main/res/layout/share_activity.xml    | 10 ++++-----
 app/src/main/res/layout/view_document.xml     |  2 +-
 .../menu/menu_conversation_item_action.xml    |  1 +
 build.gradle                                  | 10 ++-------
 gradle.properties                             |  6 ++---
 libsession/build.gradle                       |  2 +-
 11 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f4d9c11a7a..2c407f426e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -270,7 +270,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,7 +279,7 @@ 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"
@@ -287,11 +287,11 @@ dependencies {
     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'
@@ -307,19 +307,13 @@ dependencies {
     implementation 'org.signal:aesgcmprovider:0.0.3'
     implementation 'io.github.webrtc-sdk:android:125.6422.06.1'
     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,7 +325,6 @@ 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 project(":libsignal")
@@ -363,9 +356,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'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d6c9072e18..12a36085de 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/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"
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.kt b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.kt
index a0eb7b6cd0..adf4f0345b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.kt
@@ -205,6 +205,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!!
@@ -330,12 +335,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.")
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
index 2799eb634f..58e50a3375 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
@@ -2,13 +2,17 @@ package org.thoughtcrime.securesms.conversation.v2.menus
 
 import android.content.Context
 import android.view.ActionMode
+import android.view.ContextThemeWrapper
+import android.view.LayoutInflater
 import android.view.Menu
+import android.view.MenuInflater
 import android.view.MenuItem
 import network.loki.messenger.R
 import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.session.libsession.messaging.groups.LegacyGroupDeprecationManager
 import org.session.libsession.messaging.utilities.SodiumUtilities
 import org.session.libsession.utilities.TextSecurePreferences
+import org.session.libsession.utilities.getColorFromAttr
 import org.session.libsignal.utilities.IdPrefix
 import org.session.libsignal.utilities.AccountId
 import org.thoughtcrime.securesms.conversation.v2.ConversationAdapter
@@ -16,6 +20,8 @@ import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent
 import org.thoughtcrime.securesms.groups.OpenGroupManager
+import androidx.core.view.size
+import androidx.core.view.get
 
 class ConversationActionModeCallback(
     private val adapter: ConversationAdapter,
@@ -26,9 +32,19 @@ class ConversationActionModeCallback(
     var delegate: ConversationActionModeCallbackDelegate? = null
 
     override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
-        val inflater = mode.menuInflater
+        val themedContext = ContextThemeWrapper(context, context.theme)
+        val inflater = MenuInflater(themedContext)
         inflater.inflate(R.menu.menu_conversation_item_action, menu)
         updateActionModeMenu(menu)
+
+        // tint icons manually as it seems the xml color is ignored, in spite of the context theme wrapper
+        val tintColor = context.getColorFromAttr(android.R.attr.textColorPrimary)
+
+        for (i in 0 until menu.size) {
+            val menuItem = menu[i]
+            menuItem.icon?.setTint(tintColor)
+        }
+
         return true
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/DocumentView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/DocumentView.kt
index b14e60f6ec..a5d1885ca4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/DocumentView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/DocumentView.kt
@@ -27,6 +27,7 @@ class DocumentView : LinearLayout {
         binding.documentSize.text = Util.getPrettyFileSize(document.fileSize)
         binding.documentSize.setTextColor(textColor)
         binding.documentViewIconImageView.imageTintList = ColorStateList.valueOf(textColor)
+        binding.documentViewProgress.indeterminateTintList = ColorStateList.valueOf(textColor)
 
         // Show the progress spinner if the attachment is downloading, otherwise show
         // the document icon (and always remove the other, whichever one that is)
diff --git a/app/src/main/res/layout/share_activity.xml b/app/src/main/res/layout/share_activity.xml
index 6b276674a3..756834053f 100644
--- a/app/src/main/res/layout/share_activity.xml
+++ b/app/src/main/res/layout/share_activity.xml
@@ -61,10 +61,10 @@
             android:visibility="invisible"
             tools:visibility="invisible"/>
 
-    <com.pnikosis.materialishprogress.ProgressWheel android:id="@+id/progress_wheel"
-                                                    android:layout_width="70dp"
-                                                    android:layout_height="70dp"
-                                                    android:layout_centerInParent="true"
-                                                    wheel:matProg_progressIndeterminate="true" />
+    <ProgressBar android:id="@+id/progress_wheel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:indeterminate="true" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/view_document.xml b/app/src/main/res/layout/view_document.xml
index c9abfd0f55..95b9921740 100644
--- a/app/src/main/res/layout/view_document.xml
+++ b/app/src/main/res/layout/view_document.xml
@@ -15,7 +15,7 @@
         android:layout_height="match_parent"
         android:paddingHorizontal="@dimen/message_spacing"
         android:background="@drawable/view_quote_attachment_preview_background">
-        <com.google.android.material.progressindicator.CircularProgressIndicator
+        <ProgressBar
             android:id="@+id/documentViewProgress"
             style="@style/Widget.Material3.CircularProgressIndicator.Small"
             android:layout_gravity="center_vertical"
diff --git a/app/src/main/res/menu/menu_conversation_item_action.xml b/app/src/main/res/menu/menu_conversation_item_action.xml
index 978d7b72f7..f2b8313236 100644
--- a/app/src/main/res/menu/menu_conversation_item_action.xml
+++ b/app/src/main/res/menu/menu_conversation_item_action.xml
@@ -7,6 +7,7 @@
         android:title="@string/reply"
         android:id="@+id/menu_context_reply"
         android:icon="?menu_reply_icon"
+        app:iconTint="?android:textColorPrimary"
         app:showAsAction="always" />
 
     <item
diff --git a/build.gradle b/build.gradle
index b84664c0cd..9fab16bbe9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -53,12 +53,6 @@ allprojects {
                 includeGroupByRegex "me\\.leolin.*"
             }
         }
-        maven {
-            url "https://raw.github.com/signalapp/maven/master/circular-progress-button/releases/"
-            content {
-                includeGroupByRegex "com\\.github\\.dmytrodanylyk\\.circular-progress-button\\.*"
-            }
-        }
         maven {
             url "https://raw.github.com/signalapp/maven/master/sqlcipher/release/"
             content {
@@ -79,7 +73,7 @@ allprojects {
 
     project.ext {
         androidMinimumSdkVersion = 26
-        androidTargetSdkVersion  = 34
-        androidCompileSdkVersion = 34
+        androidTargetSdkVersion  = 35
+        androidCompileSdkVersion = 35
     }
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 512f282004..4a2a35d2f1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,7 +20,7 @@ kotlinVersion=2.1.10
 kspVersion=2.1.10-1.0.31
 navVersion=2.8.0-beta05
 android.useAndroidX=true
-appcompatVersion=1.6.1
+appcompatVersion=1.7.0
 coreVersion=1.13.1
 coroutinesVersion=1.9.0
 curve25519Version=0.6.0
@@ -34,11 +34,11 @@ kotlinxJsonVersion=1.3.3
 kovenantVersion=3.3.0
 phraseVersion=1.2.0
 lifecycleVersion=2.7.0
-materialVersion=1.8.0
+materialVersion=1.12.0
 mockitoKotlinVersion=4.1.0
 okhttpVersion=4.12.0
 pagingVersion=3.0.0
-preferenceVersion=1.2.0
+preferenceVersion=1.2.1
 protobufVersion=4.29.3
 testCoreVersion=1.5.0
 zxingVersion=3.5.3
diff --git a/libsession/build.gradle b/libsession/build.gradle
index 0bab7c2493..b616340a4c 100644
--- a/libsession/build.gradle
+++ b/libsession/build.gradle
@@ -53,7 +53,7 @@ dependencies {
     ksp("com.google.dagger:hilt-compiler:$daggerHiltVersion")
     ksp("androidx.hilt:hilt-compiler:$jetpackHiltVersion")
 
-    api 'org.sessionfoundation:libsession-util-android:1.0.0'
+    api 'org.sessionfoundation:libsession-util-android:1.0.2'
 
     implementation "net.java.dev.jna:jna:5.12.1@aar"
     implementation "androidx.core:core-ktx:$coreVersion"