fixed problem that prevented the wallpaper from persisting on device shutdown, improved exception logging

Author: connyduck

app/proguard-rules.pro

@@ -1,4 +1,13 @@
 -printconfiguration
 -optimizationpasses 5
 -allowaccessmodification
--repackageclasses ''
+-repackageclasses ''
+
+-assumenosideeffects class android.util.Log {
+    public static *** d(...);
+    public static *** w(...);
+    public static *** v(...);
+    public static *** i(...);
+    public static *** e(...);
+    public static *** getStackTraceString(...);
+}

app/src/main/java/at/connyduck/pixelwallpaper/IntList.java

@@ -1,8 +1,11 @@
 package at.connyduck.pixelwallpaper;
 
-public class IntList {
+import java.io.Serializable;
+
+public class IntList implements Serializable {
 
     private static final int MIN_CAPACITY_INCREMENT = 12;
+    private static final long serialVersionUID = -4046407753817880014L;
 
     private int size;
     private int[] array;

app/src/main/java/at/connyduck/pixelwallpaper/PersistenceManager.java

@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.util.Log;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -13,7 +14,7 @@
 
 public class PersistenceManager {
 
-	private static final String fileID = "at.connyduck.pixelwallpaper save file";
+	private static final String fileID = "at.connyduck.pixelwallpaper.save";
 	private static final String preferenceID = "at.connyduck.pixelwallpaper prefs";
 
 	private Context context;
@@ -45,6 +46,7 @@ public boolean load() {
 			fis = context.openFileInput(fileID);
 		} catch (FileNotFoundException e) {
 			//first time load
+			Log.i("PersistenceManager", Log.getStackTraceString(e));
 			return false;
 		}
 
@@ -58,11 +60,10 @@ public boolean load() {
 				i.close();
 				fis.close();
 
-			} catch (IOException e) {
+			} catch (IOException | ClassNotFoundException e) {
+				Log.w("PersistenceManager", Log.getStackTraceString(e));
 				return false;
-			} catch (ClassNotFoundException e) {
-				return false;
-			} 
+			}
 		}
 
 		SharedPreferences pref = context.getSharedPreferences(preferenceID, 0);
@@ -86,7 +87,7 @@ public void save() {
 		try {
 			fos = context.openFileOutput(fileID, Context.MODE_PRIVATE);
 		} catch (FileNotFoundException e) {
-			//Log.d("PersistenceManager", "FileNotFoundException");
+			Log.w("PersistenceManager", Log.getStackTraceString(e));
 		}
 
 		ObjectOutputStream o;
@@ -102,7 +103,7 @@ public void save() {
 			}
 
 		} catch (IOException e) {
-			//Log.d("PersistenceManager", "IOException "+e);
+			Log.w("PersistenceManager", Log.getStackTraceString(e));
 		}
 
 		SharedPreferences.Editor editor = context.getSharedPreferences(preferenceID, 0).edit();

app/src/main/java/at/connyduck/pixelwallpaper/ShutdownReceiver.java

@@ -3,6 +3,7 @@
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.util.Log;
 
 public class ShutdownReceiver extends BroadcastReceiver {
     private PixelWallpaperService.PixelWallpaperEngine pwe;
@@ -13,8 +14,8 @@ public ShutdownReceiver(PixelWallpaperService.PixelWallpaperEngine pwe) {
 
 	@Override
 	public void onReceive(Context context, Intent intent) {
-		     
-        if("android.intent.action.ACTION_SHUTDOWN".equals(intent.getAction())) {
+
+        if(Intent.ACTION_SHUTDOWN.equals(intent.getAction())) {
         	pwe.onShutdown();
         }