Switch to getDefaultSharedPreferences

Author: Procyonae

android/app/src/main/java/com/cleverraven/cataclysmdda/CataclysmDDA_Helpers.java

@@ -10,6 +10,7 @@
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.content.pm.ServiceInfo;
 import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
 import android.widget.Toast;
 
 public class CataclysmDDA_Helpers {
@@ -22,7 +23,7 @@ public static List<AccessibilityServiceInfo> getEnabledAccessibilityServiceInfo(
     public static String getEnabledAccessibilityServiceNames(Context context) {
         List<AccessibilityServiceInfo> enabledServicesInfo = getEnabledAccessibilityServiceInfo( context );
         String service_names = "";
-        Set<String> false_positives = context.getSharedPreferences("accessibility_service_info", Context.MODE_PRIVATE).getStringSet("accessibility_service_info_false_positives", new HashSet<String>());
+        Set<String> false_positives = PreferenceManager.getDefaultSharedPreferences(context.getApplicationContext()).getStringSet("Accessibility Service Info False Positives", new HashSet<String>());
         for (AccessibilityServiceInfo enabledService : enabledServicesInfo) {
             ServiceInfo enabledServiceInfo = enabledService.getResolveInfo().serviceInfo;
             String service_name = enabledServiceInfo.name;
@@ -35,14 +36,15 @@ public static String getEnabledAccessibilityServiceNames(Context context) {
 
     public static void saveAccessibilityServiceInfoFalsePositives(Context context) {
         List<AccessibilityServiceInfo> enabledServicesInfo = getEnabledAccessibilityServiceInfo( context );
-        SharedPreferences preferences = context.getSharedPreferences("accessibility_service_info", Context.MODE_PRIVATE);
-        Set<String> false_positives = preferences.getStringSet("accessibility_service_info_false_positives", new HashSet<String>());
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context.getApplicationContext());
+        // Purposeful copy to avoid some nonsense
+        Set<String> false_positives = new HashSet<String>(preferences.getStringSet("Accessibility Service Info False Positives", new HashSet<String>()));
         for (AccessibilityServiceInfo enabledService : enabledServicesInfo) {
             ServiceInfo enabledServiceInfo = enabledService.getResolveInfo().serviceInfo;
             false_positives.add( enabledServiceInfo.name );
         }
         SharedPreferences.Editor editor = preferences.edit();
-        editor.putStringSet("accessibility_service_info_false_positives", false_positives);
+        editor.putStringSet("Accessibility Service Info False Positives", false_positives);
         editor.commit();        
     }
 }

android/app/src/main/java/com/cleverraven/cataclysmdda/SplashScreen.java

@@ -163,7 +163,7 @@ public void onClick(DialogInterface dialog, int id) {
                         return;
                     }
             })
-            .setNeutralButton(getString(R.string.ignoreFalsePostives), new DialogInterface.OnClickListener() {
+            .setNegativeButton(getString(R.string.ignoreFalsePostives), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
                         CataclysmDDA_Helpers.saveAccessibilityServiceInfoFalsePositives(getApplicationContext());
                         SplashScreen.this.installOrRun();

android/app/src/main/res/values/strings.xml

@@ -6,7 +6,7 @@
     <string name="helpMessage">"Swipe" for directional movement (hold for virtual joystick). "Tap" to confirm selection in menu or Pause one turn in-game (hold to Pause several turns in-game). "Double tap" to cancel or go back in menus (works like Escape key). "Pinch" to zoom in/out (in-game). Use hardware "Back" button to toggle virtual keyboard (hold to toggle keyboard shortcuts).</string>
     <string name="accessibilityServicesTitle">Accessibility Services Warning</string>
     <string name="accessibilityServicesMessage">If swipe commands and shortcuts menus are not working in game, you might want to disable one of the following accessibility services/software that interact with touchscreen (swipe assists, auto-clickers, one-handed mode, etc.):\n%1$s</string>
-    <string name="ignoreFalsePostives">Mark as false positives</string>
+    <string name="ignoreFalsePostives">Mark as false positive(s)</string>
     <string name="softwareRendering">Software rendering</string>
     <string name="forceFullscreen">Force fullscreen</string>
     <string name="trapBackButton">Trap Back button</string>