commit 7e04f9c3618f5f2db8cefa74ac0841678f7f3910
author Oliver Scott <olivercscott@gmail.com> Tue Aug 24 14:52:10 2021 -0400
committer Timi Rautamäki <timi.rautamaki@gmail.com> Thu Sep 02 12:24:00 2021 +0000
tree dc59df236502c3d6fbe487c725e531fec739286e
parent 1167c047bedfeb8efb581c0795a7a201e1382488

Disable ChooseDataSimActivity if single SIM detected

Change-Id: I963a7b4f268698c048cf0eccb15198412b3e2ab3

src/org/lineageos/setupwizard/SimMissingActivity.java

diff --git a/src/org/lineageos/setupwizard/SimMissingActivity.java b/src/org/lineageos/setupwizard/SimMissingActivity.java
index 4ac1046..e30c92c 100644
--- a/src/org/lineageos/setupwizard/SimMissingActivity.java
+++ b/src/org/lineageos/setupwizard/SimMissingActivity.java
@@ -71,6 +71,8 @@
         if (mPhoneMonitor.simMissing()) {
             SetupWizardUtils.disableComponent(this, ChooseDataSimActivity.class);
             SetupWizardUtils.disableComponent(this, MobileDataActivity.class);
+        } else if (!mPhoneMonitor.isMultiSimDevice() || mPhoneMonitor.singleSimInserted()) {
+            SetupWizardUtils.disableComponent(this, ChooseDataSimActivity.class);
         }
         super.onNavigateNext();
     }

src/org/lineageos/setupwizard/util/PhoneMonitor.java

diff --git a/src/org/lineageos/setupwizard/util/PhoneMonitor.java b/src/org/lineageos/setupwizard/util/PhoneMonitor.java
index 47cc4a1..9203eb3 100644
--- a/src/org/lineageos/setupwizard/util/PhoneMonitor.java
+++ b/src/org/lineageos/setupwizard/util/PhoneMonitor.java
@@ -289,6 +289,10 @@
         return true;
     }
 
+    public boolean singleSimInserted() {
+        return mSubscriptionManager.getActiveSubscriptionInfoCount() == 1;
+    }
+
     // We only care that each slot has a sim
     public boolean allSimsInserted() {
         int simSlotCount = mTelephony.getSimCount();

src/org/lineageos/setupwizard/util/SetupWizardUtils.java

diff --git a/src/org/lineageos/setupwizard/util/SetupWizardUtils.java b/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
index bd4c6ea..383895f 100644
--- a/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
+++ b/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
@@ -275,6 +275,10 @@
         return PhoneMonitor.getInstance().simMissing();
     }
 
+    public static boolean singleSimInserted() {
+        return PhoneMonitor.getInstance().singleSimInserted();
+    }
+
     public static boolean isMultiSimDevice() {
         return PhoneMonitor.getInstance().isMultiSimDevice();
     }
@@ -293,7 +297,7 @@
         } else if (!simMissing()) {
             disableComponent(context, SimMissingActivity.class);
         }
-        if (!isMultiSimDevice()) {
+        if (!isMultiSimDevice() || singleSimInserted()) {
             disableComponent(context, ChooseDataSimActivity.class);
         }
         if (!SetupWizardUtils.hasWifi(context) ||