Fixed crashing bug in Settings. Tested on Nougat.

aiman-al-masoud · Jul 18, 2021 · 9d5836e · 9d5836e
1 parent 1e25459
commit 9d5836e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/app/src/main/java/com/luxlunaris/noadpadlight/control/classes/Paths.java b/app/src/main/java/com/luxlunaris/noadpadlight/control/classes/Paths.java
@@ -9,7 +9,7 @@
  */
 public class Paths {
 
-    public static String APP_DIR_PATH = 	MainActivity.CONTEXT.getFilesDir().getPath();
+    public static String APP_DIR_PATH =	MainActivity.CONTEXT.getFilesDir().getPath();
 
 
 }
diff --git a/app/src/main/java/com/luxlunaris/noadpadlight/control/classes/Settings.java b/app/src/main/java/com/luxlunaris/noadpadlight/control/classes/Settings.java
@@ -54,7 +54,7 @@ public static boolean getBoolean(SETTINGS_TAGS TAG_NAME){
 
         try {
             return settingsFile.getBoolean(TAG_NAME.toString());
-        } catch (WrongTagTypeException e) {
+        } catch (WrongTagTypeException | NullPointerException e) {
             e.printStackTrace();
         }
 
@@ -76,7 +76,7 @@ public static int getInt(SETTINGS_TAGS TAG_NAME){
 
         try {
             return settingsFile.getInt(TAG_NAME.toString());
-        } catch (WrongTagTypeException e) {
+        } catch (WrongTagTypeException | NullPointerException e) {
             e.printStackTrace();
         }
 
@@ -97,7 +97,14 @@ public static String getString(SETTINGS_TAGS TAG_NAME){
         //set up all instance attributes
         makeInstance();
 
-        return settingsFile.getString(TAG_NAME.toString());
+        try{
+            return settingsFile.getString(TAG_NAME.toString());
+        }catch (NullPointerException e){
+        }
+
+        //return the default value of the tag
+        return (String) TAG_NAME.DEFAULT_VAL;
+
     }
 
 
@@ -114,7 +121,7 @@ public static double getFloat(SETTINGS_TAGS TAG_NAME){
 
         try {
             return settingsFile.getFloat(TAG_NAME.toString());
-        } catch (WrongTagTypeException e) {
+        } catch (WrongTagTypeException | NullPointerException  e) {
             e.printStackTrace();
         }