empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Upgrade Compose and AndroidX libraries.

Browse source
This commit is contained in:
Alex Hart 2024-01-29 12:03:10 -04:00 • committed by Nicholas Tinsley
parent 466acaf504
commit 326b95bd10
5 changed files with 450 additions and 344 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberLockActivity.kt
View file

@ -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() {

2
app/src/main/java/org/thoughtcrime/securesms/megaphone/ClientDeprecatedActivity.java
View file

@ -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

14
dependencies.gradle.kts
View file

@ -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()

5
device-transfer/app/src/main/java/org/signal/devicetransfer/app/MainActivity.java
View file

@ -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();
});

771
gradle/verification-metadata.xml
View file

File diff suppressed because it is too large Load diff