Fix crash in SmsMigrator.

fork-5.53.8
Greyson Parrelli 2019-10-07 16:41:47 -07:00
rodzic d7395af774
commit 84012c7adb
1 zmienionych plików z 3 dodań i 2 usunięć

Wyświetl plik

@ -183,9 +183,10 @@ public class SmsMigrator {
statement = ourSmsDatabase.createInsertStatement(transaction);
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);
statement.execute();
}