TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-24 10:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not list SIMs that are not ready.

Browse Source 
Fixes #8426
This commit is contained in:
Alan Evans 2019-04-19 12:36:00 -03:00 committed by Greyson Parrelli
parent f3f6cc87d9
commit 48efcaa785
2 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/org/thoughtcrime/securesms/util/ServiceUtil.java
View File

@ -6,8 +6,13 @@ import android.app.NotificationManager;
import android.content.Context; import android.content.Context;
import android.media.AudioManager; import android.media.AudioManager;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.os.Build;
import android.os.PowerManager; import android.os.PowerManager;
import android.os.Vibrator; import android.os.Vibrator;
import android.support.annotation.NonNull;
import android.support.annotation.RequiresApi;
import android.support.v4.content.ContextCompat;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.view.WindowManager; import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
@ -48,4 +53,9 @@ public class ServiceUtil {
public static Vibrator getVibrator(Context context) { public static Vibrator getVibrator(Context context) {
return (Vibrator)context.getSystemService(Context.VIBRATOR_SERVICE); return (Vibrator)context.getSystemService(Context.VIBRATOR_SERVICE);
} }
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP_MR1)
public static SubscriptionManager getSubscriptionManager(@NonNull Context context) {
return ContextCompat.getSystemService(context, SubscriptionManager.class);
}
} }

25
src/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java
View File

@ -3,15 +3,18 @@ package org.thoughtcrime.securesms.util.dualsim;
import android.content.Context; import android.content.Context;
import android.os.Build; import android.os.Build;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.RequiresApi;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import org.thoughtcrime.securesms.util.ServiceUtil;
import org.whispersystems.libsignal.util.guava.Optional; import org.whispersystems.libsignal.util.guava.Optional;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
public class SubscriptionManagerCompat { public final class SubscriptionManagerCompat {
private final Context context; private final Context context;
@ -32,7 +35,7 @@ public class SubscriptionManagerCompat {
return Optional.absent(); return Optional.absent();
} }
SubscriptionInfo subscriptionInfo = SubscriptionManager.from(context).getActiveSubscriptionInfo(subscriptionId); SubscriptionInfo subscriptionInfo = getSubscriptionManager().getActiveSubscriptionInfo(subscriptionId);
if (subscriptionInfo != null) { if (subscriptionInfo != null) {
return Optional.of(new SubscriptionInfoCompat(subscriptionId, subscriptionInfo.getDisplayName(), return Optional.of(new SubscriptionInfoCompat(subscriptionId, subscriptionInfo.getDisplayName(),
@ -47,7 +50,7 @@ public class SubscriptionManagerCompat {
return new LinkedList<>(); return new LinkedList<>();
} }
List<SubscriptionInfo> subscriptionInfos = SubscriptionManager.from(context).getActiveSubscriptionInfoList(); List<SubscriptionInfo> subscriptionInfos = getSubscriptionManager().getActiveSubscriptionInfoList();
if (subscriptionInfos == null || subscriptionInfos.isEmpty()) { if (subscriptionInfos == null || subscriptionInfos.isEmpty()) {
return new LinkedList<>(); return new LinkedList<>();
@ -56,13 +59,29 @@ public class SubscriptionManagerCompat {
List<SubscriptionInfoCompat> compatList = new LinkedList<>(); List<SubscriptionInfoCompat> compatList = new LinkedList<>();
for (SubscriptionInfo subscriptionInfo : subscriptionInfos) { for (SubscriptionInfo subscriptionInfo : subscriptionInfos) {
if (isReady(subscriptionInfo)) {
compatList.add(new SubscriptionInfoCompat(subscriptionInfo.getSubscriptionId(), compatList.add(new SubscriptionInfoCompat(subscriptionInfo.getSubscriptionId(),
subscriptionInfo.getDisplayName(), subscriptionInfo.getDisplayName(),
subscriptionInfo.getMcc(), subscriptionInfo.getMcc(),
subscriptionInfo.getMnc())); subscriptionInfo.getMnc()));
} }
}
return compatList; return compatList;
} }
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP_MR1)
private SubscriptionManager getSubscriptionManager() {
return ServiceUtil.getSubscriptionManager(context);
}
private boolean isReady(@NonNull SubscriptionInfo subscriptionInfo) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) return true;
TelephonyManager telephonyManager = ServiceUtil.getTelephonyManager(context);
TelephonyManager specificTelephonyManager = telephonyManager.createForSubscriptionId(subscriptionInfo.getSubscriptionId());
return specificTelephonyManager.getSimState() == TelephonyManager.SIM_STATE_READY;
}
} }