Improve multi SIM support (#439)

frimtec · May 12, 2023 · 3e6c7a9 · 3e6c7a9
1 parent 7782614
commit 3e6c7a9
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/app/src/main/java/com/github/frimtec/android/pikettassist/state/ApplicationPreferences.java b/app/src/main/java/com/github/frimtec/android/pikettassist/state/ApplicationPreferences.java
@@ -67,6 +67,8 @@ static ApplicationPreferences instance() {
 
   int getSuperviseSignalStrengthSubscription(Context context);
 
+  void setSuperviseSignalStrengthSubscription(Context context, int subscriptionId);
+
   void setSuperviseSignalStrength(Context context, boolean supervise);
 
   boolean getNotifyLowSignal(Context context);

diff --git a/...om/github/frimtec/android/pikettassist/state/SharedPreferencesApplicationPreferences.java b/...om/github/frimtec/android/pikettassist/state/SharedPreferencesApplicationPreferences.java
@@ -126,6 +126,11 @@ public int getSuperviseSignalStrengthSubscription(Context context) {
     return Integer.parseInt(getSharedPreferences(context, PREF_KEY_SUPERVISE_SIGNAL_STRENGTH_SUBSCRIPTION, context.getString(R.string.pref_default_supervise_signal_strength_subscription)));
   }
 
+  @Override
+  public void setSuperviseSignalStrengthSubscription(Context context, int subscriptionId) {
+    setSharedPreferences(context, setter -> setter.putString(PREF_KEY_SUPERVISE_SIGNAL_STRENGTH_SUBSCRIPTION, String.valueOf(subscriptionId)));
+  }
+
   @Override
   public void setSuperviseSignalStrength(Context context, boolean supervise) {
     setSharedPreferences(context, setter -> setter.putBoolean(PREF_KEY_SUPERVISE_SIGNAL_STRENGTH, supervise));

diff --git a/app/src/main/java/com/github/frimtec/android/pikettassist/ui/settings/SettingsActivity.java b/app/src/main/java/com/github/frimtec/android/pikettassist/ui/settings/SettingsActivity.java
@@ -52,7 +52,7 @@ public static class SettingsFragment extends PreferenceFragmentCompat {
 
     private static final String TAG = "SettingsFragment";
 
-    private static final int MAX_SUPPORTED_SIMS = 2;
+    private static final int MAX_SUPPORTED_SIMS = 3;
 
     @SuppressLint("DefaultLocale")
     @Override
@@ -150,12 +150,13 @@ public void onCreatePreferencesFix(@Nullable Bundle savedInstanceState, String r
           List<CharSequence> entriesValues = new ArrayList<>();
 
           if (context != null) {
-            for (int i = 0; i < MAX_SUPPORTED_SIMS; i++) {
+            // Subscription are mostly counted starting from 1 therefor lets check for one more
+            for (int i = 0; i < MAX_SUPPORTED_SIMS + 1; i++) {
               SignalStrengthService signalStrengthService = new SignalStrengthService(context, i);
               String networkOperatorName = signalStrengthService.getNetworkOperatorName();
               if (networkOperatorName != null) {
                 entriesValues.add(String.valueOf(i));
-                entries.add(String.format(Locale.getDefault(), "%s %d: %s", getString(R.string.subscription), i + 1, networkOperatorName));
+                entries.add(String.format(Locale.getDefault(), "%s %d: %s", getString(R.string.subscription), i, networkOperatorName));
               } else {
                 Log.d(TAG, "No phone manager for subscriptionId " + i);
               }
@@ -167,6 +168,14 @@ public void onCreatePreferencesFix(@Nullable Bundle savedInstanceState, String r
           if (entries.size() < 2) {
             superviseSignalStrengthSubscription.setVisible(false);
           }
+          if (entries.size() == 1) {
+            int subscriptionId = Integer.parseInt(String.valueOf(entriesValues.get(0)));
+            ApplicationPreferences.instance().setSuperviseSignalStrengthSubscription(
+                context,
+                subscriptionId
+            );
+            Log.d(TAG, "Setting rest to one and only subscriptionId: " + subscriptionId);
+          }
         }
       }
       if (Build.VERSION.SDK_INT >= 33) {