empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Attempt to fix crash in ClassicOpenHelper.

Browse source 
These users must have > 1.5-year-old installs that haven't been updated,
but it's still a top crash for whatever reason, so gotta try to fix it.
This commit is contained in:
Greyson Parrelli 2019-12-04 10:29:34 -05:00
parent db19077834
commit 93deee6824
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java
View file

@ -789,7 +789,7 @@ public class ClassicOpenHelper extends SQLiteOpenHelper {
db.execSQL("UPDATE part SET pending_push = '2' WHERE pending_push = '1'");
}
if (oldVersion < NO_MORE_CANONICAL_ADDRESS_DATABASE && !TextUtils.isEmpty(TextSecurePreferences.getLocalNumber(context))) {
if (oldVersion < NO_MORE_CANONICAL_ADDRESS_DATABASE && isValidNumber(TextSecurePreferences.getLocalNumber(context))) {
SQLiteOpenHelper canonicalAddressDatabaseHelper = new SQLiteOpenHelper(context, "canonical_address.db", null, 1) {
@Override
public void onCreate(SQLiteDatabase db) {
@ -1186,7 +1186,7 @@ public class ClassicOpenHelper extends SQLiteOpenHelper {
if (oldVersion < INTERNAL_DIRECTORY) {
db.execSQL("ALTER TABLE recipient_preferences ADD COLUMN registered INTEGER DEFAULT 0");
if (!TextUtils.isEmpty(TextSecurePreferences.getLocalNumber(context))) {
if (isValidNumber(TextSecurePreferences.getLocalNumber(context))) {
OldDirectoryDatabaseHelper directoryDatabaseHelper = new OldDirectoryDatabaseHelper(context);
SQLiteDatabase directoryDatabase = directoryDatabaseHelper.getWritableDatabase();
@ -1376,6 +1376,19 @@ public class ClassicOpenHelper extends SQLiteOpenHelper {
}
}
private static boolean isValidNumber(@Nullable String number) {
if (TextUtils.isEmpty(number)) {
return false;
}
try {
PhoneNumberUtil.getInstance().parse(number, null);
return true;
} catch (NumberParseException e) {
return false;
}
}
private static class NumberMigrator {
private static final String TAG = NumberMigrator.class.getSimpleName();