Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-25 19:29:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPE in RecipientDatabase.

Browse Source
This commit is contained in:
Greyson Parrelli
2021-01-17 00:17:26 -05:00
parent 4f4aea22ce
commit a517fc4e15
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
View File

@@ -1529,7 +1529,12 @@ public class RecipientDatabase extends Database {
try (Cursor cursor = db.query(TABLE_NAME, new String[] {LAST_SESSION_RESET}, ID_WHERE, SqlUtil.buildArgs(id), null, null, null)) { try (Cursor cursor = db.query(TABLE_NAME, new String[] {LAST_SESSION_RESET}, ID_WHERE, SqlUtil.buildArgs(id), null, null, null)) {
if (cursor.moveToFirst()) { if (cursor.moveToFirst()) {
try { try {
return DeviceLastResetTime.parseFrom(CursorUtil.requireBlob(cursor, LAST_SESSION_RESET)); byte[] serialized = CursorUtil.requireBlob(cursor, LAST_SESSION_RESET);
if (serialized != null) {
return DeviceLastResetTime.parseFrom(serialized);
} else {
return DeviceLastResetTime.newBuilder().build();
}
} catch (InvalidProtocolBufferException | SQLException e) { } catch (InvalidProtocolBufferException | SQLException e) {
Log.w(TAG, e); Log.w(TAG, e);
return DeviceLastResetTime.newBuilder().build(); return DeviceLastResetTime.newBuilder().build();