fix defaultsharedpreferences bug

omnt · Aug 8, 2024 · 9a773e3 · 9a773e3
1 parent 81fb281
commit 9a773e3
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/Preferences/SPType.java b/app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/Preferences/SPType.java
@@ -9,7 +9,19 @@ public enum SPType {
     default_sp;
 
 
-
+    public String toString() {
+        switch(this){
+            case default_sp:
+                return "preferences";
+            case logging_sp:
+            case ping_sp:
+            case carrier_sp:
+            case mobile_network_sp:
+                return super.toString();
+            default:
+                return null;
+        }
+    }
     public static SPType fromString(String text) {
         for (SPType b : SPType.values()) {
             if (b.toString().equalsIgnoreCase(text)) {

diff --git a/...va/de/fraunhofer/fokus/OpenMobileNetworkToolkit/Preferences/SharedPreferencesGrouper.java b/...va/de/fraunhofer/fokus/OpenMobileNetworkToolkit/Preferences/SharedPreferencesGrouper.java
@@ -22,7 +22,7 @@ public class SharedPreferencesGrouper {
     private final Context ct;
     private HashMap <SPType, SharedPreferences.OnSharedPreferenceChangeListener> spMap = new HashMap<>();
     public String getSharedPreferenceIdentifier(SPType key)  {
-        return this.ct.getPackageName()+"."+key.toString();
+        return this.ct.getPackageName()+"_"+key.toString();
     }
 
     public void clearConfig(){

diff --git a/...ava/de/fraunhofer/fokus/OpenMobileNetworkToolkit/SettingPreferences/SettingsFragment.java b/...ava/de/fraunhofer/fokus/OpenMobileNetworkToolkit/SettingPreferences/SettingsFragment.java
@@ -8,6 +8,8 @@
 
 package de.fraunhofer.fokus.OpenMobileNetworkToolkit.SettingPreferences;
 
+import android.content.Context;
+import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
 import android.telephony.SubscriptionInfo;
@@ -31,10 +33,13 @@ public class SettingsFragment extends PreferenceFragmentCompat {
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        setPreferencesFromResource(R.xml.preference, rootKey);
+
         SharedPreferencesGrouper spg = SharedPreferencesGrouper.getInstance(requireContext());
         PreferenceManager pfm = getPreferenceManager();
+        getPreferenceManager().setSharedPreferencesName(spg.getSharedPreferenceIdentifier(SPType.default_sp));
         pfm.setSharedPreferencesName(spg.getSharedPreferenceIdentifier(SPType.default_sp));
+        pfm.setSharedPreferencesMode(Context.MODE_PRIVATE);
+        setPreferencesFromResource(R.xml.preference, rootKey);
         ListPreference sub_select = pfm.findPreference("select_subscription");
 
         ArrayList<String> entries = new ArrayList<>();
@@ -52,11 +57,12 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             @Override
             public boolean onPreferenceChange(@NonNull Preference preference, Object newValue) {
                 Toast.makeText(requireContext().getApplicationContext(), "Subscription Changed, please restart OMNT", Toast.LENGTH_SHORT).show();
+                //spg.getSharedPreference(SPType.default_sp).edit().putString("select_subscription", newValue.toString()).apply();
                 return true;
             }
         });
 
-        Preference button = getPreferenceManager().findPreference("reset_modem");
+        Preference button = pfm.findPreference("reset_modem");
 
         if (button != null) {
             if (GlobalVars.getInstance().isCarrier_permissions()) {

diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml
@@ -10,6 +10,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:fragment="de.fraunhofer.fokus.OpenMobileNetworkToolkit.SettingPreferences.SettingsFragment">
+
     <PreferenceCategory
         android:title="@string/home_screen_settings"
         app:iconSpaceReserved="false">