From d1b8e77fdc8b38b1469165923a62a2ed01841149 Mon Sep 17 00:00:00 2001
From: Alan Evans <alan@signal.org>
Date: Tue, 7 May 2019 12:25:11 -0300
Subject: [PATCH] Always show the SIM on the footer of a multi-SIM device, even
 if one SIM is disabled.

---
 .../components/ConversationItemFooter.java    |  2 +-
 .../dualsim/SubscriptionManagerCompat.java    | 33 ++++++++++++++-----
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java b/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java
index 69bb4a3eb..8beda22ff 100644
--- a/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java
+++ b/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java
@@ -106,7 +106,7 @@ public class ConversationItemFooter extends LinearLayout {
   private void presentSimInfo(@NonNull MessageRecord messageRecord) {
     SubscriptionManagerCompat subscriptionManager = new SubscriptionManagerCompat(getContext());
 
-    if (messageRecord.isPush() || messageRecord.getSubscriptionId() == -1 || !Permissions.hasAll(getContext(), Manifest.permission.READ_PHONE_STATE) || subscriptionManager.getActiveAndReadySubscriptionInfos().size() < 2) {
+    if (messageRecord.isPush() || messageRecord.getSubscriptionId() == -1 || !Permissions.hasAll(getContext(), Manifest.permission.READ_PHONE_STATE) || !subscriptionManager.isMultiSim()) {
       simView.setVisibility(View.GONE);
     } else {
       Optional<SubscriptionInfoCompat> subscriptionInfo = subscriptionManager.getActiveSubscriptionInfo(messageRecord.getSubscriptionId());
diff --git a/src/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java b/src/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java
index 1d462a9a7..6bffc0b4c 100644
--- a/src/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java
+++ b/src/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java
@@ -59,16 +59,9 @@ public final class SubscriptionManagerCompat {
 
   @RequiresApi(api = 22)
   private @NonNull Map<Integer, SubscriptionInfoCompat> getActiveSubscriptionInfoMap(boolean excludeUnreadySubscriptions) {
-    SubscriptionManager subscriptionManager = ServiceUtil.getSubscriptionManager(context);
+    List<SubscriptionInfo> subscriptionInfos = getActiveSubscriptionInfoList();
 
-    if (subscriptionManager == null) {
-      Log.w(TAG, "Missing SubscriptionManager.");
-      return Collections.emptyMap();
-    }
-
-    List<SubscriptionInfo> subscriptionInfos = subscriptionManager.getActiveSubscriptionInfoList();
-
-    if (subscriptionInfos == null || subscriptionInfos.isEmpty()) {
+    if (subscriptionInfos.isEmpty()) {
       return Collections.emptyMap();
     }
 
@@ -88,6 +81,28 @@ public final class SubscriptionManagerCompat {
     return map;
   }
 
+  public boolean isMultiSim() {
+    if (Build.VERSION.SDK_INT < 22) {
+      return false;
+    }
+
+    return getActiveSubscriptionInfoList().size() >= 2;
+  }
+
+  @RequiresApi(api = 22)
+  private @NonNull List<SubscriptionInfo> getActiveSubscriptionInfoList() {
+    SubscriptionManager subscriptionManager = ServiceUtil.getSubscriptionManager(context);
+
+    if (subscriptionManager == null) {
+      Log.w(TAG, "Missing SubscriptionManager.");
+      return Collections.emptyList();
+    }
+
+    List<SubscriptionInfo> list = subscriptionManager.getActiveSubscriptionInfoList();
+
+    return list != null? list : Collections.emptyList();
+  }
+
   @RequiresApi(api = 22)
   private Map<SubscriptionInfo, CharSequence> getDescriptionsFor(@NonNull Collection<SubscriptionInfo> subscriptions) {
     Map<SubscriptionInfo, CharSequence> descriptions;