Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 00:59:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade Kotlin, AGP, Gradle versions and bring in kotlinx-serialization for use with navigation-compose.

Browse Source
This commit is contained in:
Alex Hart
2025-09-17 12:41:18 -03:00
committed by Greyson Parrelli
parent 957ddc82b5
commit 736811393f
25 changed files with 1209 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
View File

@@ -1,8 +1,10 @@
package org.thoughtcrime.securesms.util;
import android.Manifest;
import android.app.PendingIntent;
import android.content.Context;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.hardware.Camera.CameraInfo;
import android.net.Uri;
import android.os.Build;
@@ -13,6 +15,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.app.NotificationCompat;
import androidx.core.app.NotificationManagerCompat;
import androidx.core.content.ContextCompat;
import androidx.preference.PreferenceManager;
import org.greenrobot.eventbus.EventBus;
@@ -900,6 +903,11 @@ public class TextSecurePreferences {
}
private static void notifyUnregisteredReceived(Context context) {
if (ContextCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
Log.w(TAG, "notifyUnregisteredReceived: Notification permission is not granted.");
return;
}
PendingIntent reRegistrationIntent = PendingIntent.getActivity(context,
0,
RegistrationActivity.newIntentForReRegistration(context),

8
app/src/main/java/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java
View File

@@ -1,6 +1,8 @@
package org.thoughtcrime.securesms.util.dualsim;
import android.Manifest;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.Build;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
@@ -8,6 +10,7 @@ import android.telephony.TelephonyManager;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import androidx.core.content.ContextCompat;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.R;
@@ -99,6 +102,11 @@ public final class SubscriptionManagerCompat {
return Collections.emptyList();
}
if (ContextCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) {
Log.w(TAG, "Missing READ_PHONE_STATE permission.");
return Collections.emptyList();
}
List<SubscriptionInfo> list = subscriptionManager.getActiveSubscriptionInfoList();
return list != null? list : Collections.emptyList();