mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix older database migrations that may recursively open database.

fork-5.53.8
Greyson Parrelli 2022-01-03 11:59:06 -05:00
rodzic 5c27842a01
commit 25ab9a5ad6
1 zmienionych plików z 4 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/database/helpers/SignalDatabaseMigrations.kt
Wyświetl plik

@ -482,7 +482,7 @@ object SignalDatabaseMigrations {
}
if (oldVersion < SELF_ATTACHMENT_CLEANUP) {
val localNumber = SignalStore.account().e164
val localNumber = PreferenceManager.getDefaultSharedPreferences(context).getString("pref_local_number", null)
if (!TextUtils.isEmpty(localNumber)) {
db.rawQuery("SELECT _id FROM thread WHERE recipient_ids = ?", arrayOf(localNumber)).use { threadCursor ->
if (threadCursor != null && threadCursor.moveToFirst()) {
@ -594,7 +594,7 @@ object SignalDatabaseMigrations {
if (oldVersion < RECIPIENT_SEARCH) {
db.execSQL("ALTER TABLE recipient ADD COLUMN system_phone_type INTEGER DEFAULT -1")
val localNumber = SignalStore.account().e164
val localNumber = PreferenceManager.getDefaultSharedPreferences(context).getString("pref_local_number", null)
if (!TextUtils.isEmpty(localNumber)) {
db.query("recipient", null, "phone = ?", arrayOf(localNumber), null, null, null).use { cursor ->
if (cursor == null || !cursor.moveToFirst()) {
@ -794,7 +794,7 @@ object SignalDatabaseMigrations {
}
if (oldVersion < PROFILE_KEY_TO_DB) {
val localNumber = SignalStore.account().e164
val localNumber = PreferenceManager.getDefaultSharedPreferences(context).getString("pref_local_number", null)
if (!TextUtils.isEmpty(localNumber)) {
val encodedProfileKey = PreferenceManager.getDefaultSharedPreferences(context).getString("pref_profile_key", null)
val profileKey = if (encodedProfileKey != null) Base64.decodeOrThrow(encodedProfileKey) else Util.getSecretBytes(32)
@ -855,7 +855,7 @@ object SignalDatabaseMigrations {
}
if (oldVersion < PROFILE_DATA_MIGRATION) {
val localNumber = SignalStore.account().e164
val localNumber = PreferenceManager.getDefaultSharedPreferences(context).getString("pref_local_number", null)
if (localNumber != null) {
val encodedProfileName = PreferenceManager.getDefaultSharedPreferences(context).getString("pref_profile_name", null)
val profileName = ProfileName.fromSerialized(encodedProfileName)