Fix bug causing crash during upgrade - NPE when trying to cancel sche…

…duled service alarm (where none existed) Fixes codinguser#569 Log the target exception instead of the invocation wrapper exception when migrating the db
kuthullu · Sep 5, 2016 · a3927c8 · a3927c8
1 parent b43b5dd
commit a3927c8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ apply plugin: 'io.fabric'
 
 def versionMajor = 2
 def versionMinor = 1
-def versionPatch = 0
-def versionBuild = 6
+def versionPatch = 1
+def versionBuild = 0
 
 def buildTime() {
     def df = new SimpleDateFormat("yyyyMMdd HH:mm 'UTC'")

diff --git a/app/src/main/java/org/gnucash/android/db/DatabaseHelper.java b/app/src/main/java/org/gnucash/android/db/DatabaseHelper.java
@@ -294,8 +294,8 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion){
                 Crashlytics.logException(e);
                 throw new RuntimeException(e);
             } catch (InvocationTargetException e){
-                Crashlytics.logException(e);
-                throw new RuntimeException(e);
+                Crashlytics.logException(e.getTargetException());
+                throw new RuntimeException(e.getTargetException());
             }
         }
 	}

diff --git a/app/src/main/java/org/gnucash/android/db/MigrationHelper.java b/app/src/main/java/org/gnucash/android/db/MigrationHelper.java
@@ -1466,9 +1466,11 @@ static int upgradeDbToVersion13(SQLiteDatabase db){
         //cancel the existing pending intent so that the alarm can be rescheduled
         Intent alarmIntent = new Intent(context, ScheduledActionService.class);
         PendingIntent pendingIntent = PendingIntent.getService(context, 0, alarmIntent, PendingIntent.FLAG_NO_CREATE);
-        AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
-        alarmManager.cancel(pendingIntent);
-        pendingIntent.cancel();
+        if (pendingIntent != null) {
+            AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
+            alarmManager.cancel(pendingIntent);
+            pendingIntent.cancel();
+        }
 
         GnuCashApplication.startScheduledActionExecutionService(GnuCashApplication.getAppContext());