From c5232fcebd56ef4f285343e585c539308593a5c0 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Fri, 27 Aug 2021 04:41:47 +0300
Subject: [PATCH] Rework isMultiSimDevice check

Move it to PhoneMonitor to be consistent with other checks

Change-Id: I560048ebdf318a92747a70ffb6fa8027b4589c1a
---
 src/org/lineageos/setupwizard/util/PhoneMonitor.java |  4 ++++
 .../lineageos/setupwizard/util/SetupWizardUtils.java | 12 +++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/org/lineageos/setupwizard/util/PhoneMonitor.java b/src/org/lineageos/setupwizard/util/PhoneMonitor.java
index 32dfe887..47cc4a16 100644
--- a/src/org/lineageos/setupwizard/util/PhoneMonitor.java
+++ b/src/org/lineageos/setupwizard/util/PhoneMonitor.java
@@ -301,6 +301,10 @@ public class PhoneMonitor {
         return simSlotCount == mSubscriptionManager.getActiveSubscriptionInfoCount();
     }
 
+    public boolean isMultiSimDevice() {
+        return mTelephony.isMultiSimEnabled();
+    }
+
     public boolean isGSM(int subId) {
         return mTelephony.createForSubscriptionId(subId).getCurrentPhoneType() == PHONE_TYPE_GSM;
     }
diff --git a/src/org/lineageos/setupwizard/util/SetupWizardUtils.java b/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
index dd8af26c..b4b0283e 100644
--- a/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
+++ b/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
@@ -141,12 +141,6 @@ public class SetupWizardUtils {
         return !featureHidden;
     }
 
-    public static boolean isMultiSimDevice(Context context) {
-        TelephonyManager tm =
-                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-        return tm.isMultiSimEnabled();
-    }
-
     public static boolean isRadioReady(Context context, ServiceState state) {
         final SetupWizardApp setupWizardApp = (SetupWizardApp)context.getApplicationContext();
         if (setupWizardApp.isRadioReady()) {
@@ -281,6 +275,10 @@ public class SetupWizardUtils {
         return PhoneMonitor.getInstance().simMissing();
     }
 
+    public static boolean isMultiSimDevice() {
+        return PhoneMonitor.getInstance().isMultiSimDevice();
+    }
+
     public static void disableComponentsForMissingFeatures(Context context) {
         if (!hasLeanback(context)) {
             disableComponent(context, BluetoothSetupActivity.class);
@@ -293,7 +291,7 @@ public class SetupWizardUtils {
             disableComponent(context, SimMissingActivity.class);
             disableComponent(context, ChooseDataSimActivity.class);
         }
-        if (!SetupWizardUtils.isMultiSimDevice(context)) {
+        if (!isMultiSimDevice()) {
             disableComponent(context, ChooseDataSimActivity.class);
         } else if (simMissing()) {
             disableComponent(context, MobileDataActivity.class);