diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberLockActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberLockActivity.kt
index e736c76c07..83bb063b79 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberLockActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberLockActivity.kt
@@ -1,5 +1,6 @@
package org.thoughtcrime.securesms.components.settings.app.changenumber
+import android.annotation.SuppressLint
import android.content.Context
import android.content.Intent
import android.os.Bundle
@@ -47,6 +48,7 @@ class ChangeNumberLockActivity : PassphraseRequiredActivity() {
dynamicTheme.onResume(this)
}
+ @SuppressLint("MissingSuperCall")
override fun onBackPressed() = Unit
private fun checkWhoAmI() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/ClientDeprecatedActivity.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/ClientDeprecatedActivity.java
index f4f36bd404..ee221798e8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/ClientDeprecatedActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/ClientDeprecatedActivity.java
@@ -1,5 +1,6 @@
package org.thoughtcrime.securesms.megaphone;
+import android.annotation.SuppressLint;
import android.os.Bundle;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@@ -38,6 +39,7 @@ public class ClientDeprecatedActivity extends PassphraseRequiredActivity {
theme.onResume(this);
}
+ @SuppressLint("MissingSuperCall")
@Override
public void onBackPressed() {
// Disabled
diff --git a/dependencies.gradle.kts b/dependencies.gradle.kts
index 4381b78e0f..e9552b8019 100644
--- a/dependencies.gradle.kts
+++ b/dependencies.gradle.kts
@@ -5,13 +5,13 @@ dependencyResolutionManagement {
versionCatalogs {
create("libs") {
version("androidx-appcompat", "1.6.1")
- version("androidx-activity", "1.7.2")
- version("androidx-camera", "1.3.0-rc01")
- version("androidx-fragment", "1.6.1")
- version("androidx-lifecycle", "2.6.1")
+ version("androidx-activity", "1.8.2")
+ version("androidx-camera", "1.3.1")
+ version("androidx-fragment", "1.6.2")
+ version("androidx-lifecycle", "2.7.0")
version("androidx-media3", "1.2.1")
- version("androidx-navigation", "2.6.0")
- version("androidx-window", "1.0.0")
+ version("androidx-navigation", "2.7.6")
+ version("androidx-window", "1.2.0")
version("exoplayer", "2.19.0")
version("glide", "4.15.1")
version("kotlin", "1.8.10")
@@ -26,7 +26,7 @@ dependencyResolutionManagement {
library("android-application", "com.android.application", "com.android.application.gradle.plugin").versionRef("android-gradle-plugin")
// Compose
- library("androidx-compose-bom", "androidx.compose:compose-bom:2023.08.00")
+ library("androidx-compose-bom", "androidx.compose:compose-bom:2023.09.01")
library("androidx-compose-material3", "androidx.compose.material3", "material3").withoutVersion()
library("androidx-compose-ui-tooling-preview", "androidx.compose.ui", "ui-tooling-preview").withoutVersion()
library("androidx-compose-ui-tooling-core", "androidx.compose.ui", "ui-tooling").withoutVersion()
diff --git a/device-transfer/app/src/main/java/org/signal/devicetransfer/app/MainActivity.java b/device-transfer/app/src/main/java/org/signal/devicetransfer/app/MainActivity.java
index dc77847107..c0a967d347 100644
--- a/device-transfer/app/src/main/java/org/signal/devicetransfer/app/MainActivity.java
+++ b/device-transfer/app/src/main/java/org/signal/devicetransfer/app/MainActivity.java
@@ -25,6 +25,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
+import org.signal.core.util.PendingIntentFlags;
import org.signal.devicetransfer.ClientTask;
import org.signal.devicetransfer.DeviceToDeviceTransferService;
import org.signal.devicetransfer.DeviceToDeviceTransferService.TransferNotificationData;
@@ -65,7 +66,7 @@ public class MainActivity extends AppCompatActivity {
PendingIntent.getActivity(this,
0,
new Intent(this, MainActivity.class),
- 0));
+ PendingIntentFlags.mutable()));
list.removeAllViews();
});
@@ -77,7 +78,7 @@ public class MainActivity extends AppCompatActivity {
PendingIntent.getActivity(this,
0,
new Intent(this, MainActivity.class),
- 0));
+ PendingIntentFlags.mutable()));
list.removeAllViews();
});
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index a9951fb24d..2e9e65b258 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -38,6 +38,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
@@ -61,16 +69,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
-
-
-
-
-
@@ -79,6 +90,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
@@ -289,76 +308,44 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -394,36 +381,36 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
@@ -455,94 +442,89 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
-
-
-
-
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
-
+
+
@@ -558,20 +540,20 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
@@ -582,12 +564,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
-
-
-
+
+
+
-
-
+
+
@@ -598,12 +580,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
-
-
-
+
+
+
-
-
+
+
@@ -612,100 +594,107 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
-
+
+
@@ -713,84 +702,100 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
+
@@ -798,17 +803,17 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
-
-
-
+
+
+
-
-
-
+
+
+
-
+
@@ -897,6 +902,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
@@ -1044,44 +1057,36 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1140,6 +1145,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
@@ -1148,6 +1161,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
@@ -1161,6 +1182,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
@@ -1174,6 +1203,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
@@ -1182,12 +1219,20 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
-
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
@@ -1198,20 +1243,28 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
@@ -1237,6 +1290,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
@@ -1250,6 +1311,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
@@ -1276,6 +1345,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
@@ -1284,6 +1361,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
@@ -1292,6 +1377,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
@@ -1400,52 +1493,52 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
@@ -1464,20 +1557,20 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
@@ -1872,20 +1965,28 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+