Bump version to 6.12.6

app/build.gradle

@@ -47,14 +47,14 @@ ktlint {
 }
 
 def canonicalVersionCode = 1219
-def canonicalVersionName = "6.12.5"
+def canonicalVersionName = "6.12.6"
 
 def postFixSize = 100
-def abiPostFix = ['universal'   : 0,
-                  'armeabi-v7a' : 1,
-                  'arm64-v8a'   : 2,
-                  'x86'         : 3,
-                  'x86_64'      : 4]
+def abiPostFix = ['universal'   : 5,
+                  'armeabi-v7a' : 6,
+                  'arm64-v8a'   : 7,
+                  'x86'         : 8,
+                  'x86_64'      : 9]
 
 def keystores = [ 'debug'  : loadKeystoreProperties('keystore.debug.properties') ]
 

app/src/main/java/org/thoughtcrime/securesms/service/TimedEventManager.java

@@ -122,7 +122,11 @@ public abstract class TimedEventManager<E> {
     Intent        intent        = new Intent(context, alarmClass);
     PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, intent, PendingIntentFlags.mutable());
 
-    pendingIntent.cancel();
-    ServiceUtil.getAlarmManager(context).cancel(pendingIntent);
+    try {
+      pendingIntent.cancel();
+      ServiceUtil.getAlarmManager(context).cancel(pendingIntent);
+    } catch (SecurityException e) {
+      Log.i(TAG, "Unable to cancel alarm because we don't have permission");
+    }
   }
 }