TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 14:08:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash in SmsMigrator.

Browse Source
This commit is contained in:
Greyson Parrelli 2019-10-07 16:41:47 -07:00
parent d7395af774
commit 84012c7adb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/org/thoughtcrime/securesms/database/SmsMigrator.java
View File

@ -183,9 +183,10 @@ public class SmsMigrator {
statement = ourSmsDatabase.createInsertStatement(transaction); statement = ourSmsDatabase.createInsertStatement(transaction);
while (cursor != null && cursor.moveToNext()) { while (cursor != null && cursor.moveToNext()) {
int typeColumn = cursor.getColumnIndex(SmsDatabase.TYPE); int addressColumn = cursor.getColumnIndexOrThrow(SystemColumns.ADDRESS);
int typeColumn = cursor.getColumnIndex(SmsDatabase.TYPE);
if (cursor.isNull(typeColumn) || isAppropriateTypeForMigration(cursor, typeColumn)) { if (!cursor.isNull(addressColumn) && (cursor.isNull(typeColumn) || isAppropriateTypeForMigration(cursor, typeColumn))) {
getContentValuesForRow(context, cursor, ourThreadId, statement); getContentValuesForRow(context, cursor, ourThreadId, statement);
statement.execute(); statement.execute();
} }