Bump version to 5.9.7

Fix the other possible NPE in database migration.
Bump version to 5.9.6
2026-02-19 09:17:58 +00:00 · 2021-05-07 10:20:57 -04:00 · 2021-05-07 10:18:04 -04:00 · 2021-05-05 21:04:25 -04:00 · 2021-05-05 21:03:30 -04:00
2 changed files with 14 additions and 6 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -62,14 +62,14 @@ protobuf {
 }

 def canonicalVersionCode = 832
-def canonicalVersionName = "5.9.5"
+def canonicalVersionName = "5.9.7"

 def postFixSize = 100
-def abiPostFix = ['universal'   : 0,
-                  'armeabi-v7a' : 1,
-                  'arm64-v8a'   : 2,
-                  'x86'         : 3,
-                  'x86_64'      : 4]
+def abiPostFix = ['universal'   : 10,
+                  'armeabi-v7a' : 11,
+                  'arm64-v8a'   : 12,
+                  'x86'         : 13,
+                  'x86_64'      : 14]

 def keystores = [ 'debug'  : loadKeystoreProperties('keystore.debug.properties') ]

--- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
@@ -1350,6 +1350,10 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper implements SignalDatab
            byte[] reactions         = cursor.getBlob(cursor.getColumnIndexOrThrow("reactions"));
            long   notifiedTimestamp = cursor.getLong(cursor.getColumnIndexOrThrow("notified_timestamp"));

+            if (reactions == null) {
+              continue;
+            }
+
            try {
              boolean hasReceiveLaterThanNotified = ReactionList.parseFrom(reactions)
                                                                .getReactionsList()
@@ -1376,6 +1380,10 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper implements SignalDatab
            byte[] reactions         = cursor.getBlob(cursor.getColumnIndexOrThrow("reactions"));
            long   notifiedTimestamp = cursor.getLong(cursor.getColumnIndexOrThrow("notified_timestamp"));

+            if (reactions == null) {
+              continue;
+            }
+
            try {
              boolean hasReceiveLaterThanNotified = ReactionList.parseFrom(reactions)
                                                                .getReactionsList()
Author	SHA1	Message	Date
Greyson Parrelli	3d227e2f16	Bump version to 5.9.7	2021-05-07 10:20:57 -04:00
Greyson Parrelli	ca59ef2da8	Fix the other possible NPE in database migration.	2021-05-07 10:18:04 -04:00
Greyson Parrelli	b77fab9c75	Bump version to 5.9.6	2021-05-05 21:04:25 -04:00
Greyson Parrelli	831f7c305d	Fix possible NPE in database migration.	2021-05-05 21:03:30 -04:00