Fix crash from trying to access MainActivity.preferences (null pointer

to MainActivity)
caseydavenport · Mar 11, 2016 · 37bb196 · 37bb196
1 parent 0a3fa96
commit 37bb196
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 12 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -14,6 +14,7 @@
     <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
 
     <application
+        android:name="com.biermacht.brews.utils.BiermachtApplication"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"

diff --git a/src/com/biermacht/brews/frontend/MainActivity.java b/src/com/biermacht/brews/frontend/MainActivity.java
@@ -70,7 +70,9 @@ public class MainActivity extends DriveActivity {
   public static DatabaseInterface databaseInterface;
   public static IngredientHandler ingredientHandler;
   public static Boolean usedBefore;
-  public static SharedPreferences preferences;
+
+  // Shared preferences.
+  private static SharedPreferences preferences;
 
   // Static drawer list items
   private static String DRAWER_RECIPES = "Recipes";

diff --git a/src/com/biermacht/brews/utils/BiermachtApplication.java b/src/com/biermacht/brews/utils/BiermachtApplication.java
@@ -0,0 +1,24 @@
+package com.biermacht.brews.utils;
+
+import android.app.Application;
+import android.content.Context;
+
+
+public class BiermachtApplication extends Application {
+
+  private static Application app;
+
+  public static Application getApplication() {
+    return app;
+  }
+
+  public static Context getContext() {
+    return getApplication().getApplicationContext();
+  }
+
+  @Override
+  public void onCreate() {
+    super.onCreate();
+    app = this;
+  }
+}
diff --git a/src/com/biermacht/brews/utils/DriveActivity.java b/src/com/biermacht/brews/utils/DriveActivity.java
@@ -58,7 +58,7 @@ public void onResult(DriveApi.DriveContentsResult result) {
                 writer.write(new RecipeXmlWriter(getApplicationContext()).getXmlText(recipes));
                 writer.close();
               } catch (IOException e) {
-                Log.e("MainActivity", e.getMessage());
+                Log.e("DriveActivity", e.getMessage());
               }
 
               // Determine the default title for the file.
@@ -178,7 +178,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         handleConnectToDrive(resultCode, data);
         break;
       case Constants.REQUEST_DRIVE_FILE_OPEN:
-        Log.d("MainActivity", "Result from Google Drive file access: " + resultCode);
+        Log.d("DriveActivity", "Result from Google Drive file access: " + resultCode);
         handleDriveFileOpen(resultCode, data);
         break;
       case Constants.REQUEST_DRIVE_FILE_CREATE:
@@ -247,7 +247,7 @@ public void onConnectionSuspended(int i) {
 
   @Override
   public void onConnectionFailed(ConnectionResult result) {
-    Log.d("MainActivity", "Google API Connection failed");
+    Log.d("DriveActivity", "Google API Connection failed");
     if (result.hasResolution()) {
       try {
         result.startResolutionForResult(this, Constants.REQUEST_CONNECT_TO_DRIVE);

diff --git a/src/com/biermacht/brews/utils/Units.java b/src/com/biermacht/brews/utils/Units.java
@@ -1,5 +1,7 @@
 package com.biermacht.brews.utils;
 
+import android.content.Context;
+import android.content.SharedPreferences;
 import android.util.Log;
 
 import com.biermacht.brews.frontend.MainActivity;
@@ -60,6 +62,9 @@ public class Units {
   public static final String POUNDS_FORMAL = "Pounds";
   public static final String UNITS_FORMAL = "Units";
 
+  // SharedPreferences to use.
+  private static SharedPreferences preferences = BiermachtApplication.getContext().getSharedPreferences(Constants.PREFERENCES, Context.MODE_PRIVATE);
+
   public static String toAbbreviation(String s) {
     if (s.toLowerCase().equals(TEASPOONS_FORMAL.toLowerCase())) {
       return TEASPOONS;
@@ -365,7 +370,7 @@ public static double gramsToOunces(double g) {
 
   // Methods to return the units for each measurement system
   public static String getUnitSystem() {
-    if (MainActivity.preferences.getString(Constants.PREF_MEAS_SYSTEM, Units.IMPERIAL).equals
+    if (preferences.getString(Constants.PREF_MEAS_SYSTEM, Units.IMPERIAL).equals
             (IMPERIAL)) {
       return IMPERIAL;
     }
@@ -375,7 +380,7 @@ public static String getUnitSystem() {
   }
 
   public static String getHopUnits() {
-    if (MainActivity.preferences.getString(Constants.PREF_MEAS_SYSTEM, Units.IMPERIAL).equals
+    if (preferences.getString(Constants.PREF_MEAS_SYSTEM, Units.IMPERIAL).equals
             (IMPERIAL)) {
       return OUNCES;
     }
@@ -385,7 +390,7 @@ public static String getHopUnits() {
   }
 
   public static String getFermentableUnits() {
-    if (MainActivity.preferences.getString(Constants.PREF_MEAS_SYSTEM, Units.IMPERIAL).equals
+    if (preferences.getString(Constants.PREF_MEAS_SYSTEM, Units.IMPERIAL).equals
             (IMPERIAL)) {
       return POUNDS;
     }
@@ -395,7 +400,7 @@ public static String getFermentableUnits() {
   }
 
   public static String getWaterToGrainUnits() {
-    if (MainActivity.preferences.getString(Constants.PREF_MEAS_SYSTEM, Units.IMPERIAL).equals
+    if (preferences.getString(Constants.PREF_MEAS_SYSTEM, Units.IMPERIAL).equals
             (IMPERIAL)) {
       return QUARTS_PER_POUND;
     }
@@ -405,7 +410,7 @@ public static String getWaterToGrainUnits() {
   }
 
   public static String getStrikeVolumeUnits() {
-    if (MainActivity.preferences.getString(Constants.PREF_MEAS_SYSTEM, Units.IMPERIAL).equals
+    if (preferences.getString(Constants.PREF_MEAS_SYSTEM, Units.IMPERIAL).equals
             (IMPERIAL)) {
       return QUARTS;
     }
@@ -415,7 +420,7 @@ public static String getStrikeVolumeUnits() {
   }
 
   public static String getTemperatureUnits() {
-    if (MainActivity.preferences.getString(Constants.PREF_MEAS_SYSTEM, Units.IMPERIAL).equals
+    if (preferences.getString(Constants.PREF_MEAS_SYSTEM, Units.IMPERIAL).equals
             (IMPERIAL)) {
       return FAHRENHEIT;
     }
@@ -425,7 +430,7 @@ public static String getTemperatureUnits() {
   }
 
   public static String getVolumeUnits() {
-    if (MainActivity.preferences.getString(Constants.PREF_MEAS_SYSTEM, Units.IMPERIAL).equals(IMPERIAL)) {
+    if (preferences.getString(Constants.PREF_MEAS_SYSTEM, Units.IMPERIAL).equals(IMPERIAL)) {
       return GALLONS;
     }
     else {
@@ -434,7 +439,7 @@ public static String getVolumeUnits() {
   }
 
   public static String getWeightUnits() {
-    if (MainActivity.preferences.getString(Constants.PREF_MEAS_SYSTEM, Units.IMPERIAL).equals
+    if (preferences.getString(Constants.PREF_MEAS_SYSTEM, Units.IMPERIAL).equals
             (IMPERIAL)) {
       return POUNDS;
     }