mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-22 09:49:30 +01:00
Replace prekey jobs with one overall sync job.
This commit is contained in:
@@ -16,8 +16,7 @@ import org.thoughtcrime.securesms.database.helpers.SignalDatabaseMigrations
|
||||
import org.thoughtcrime.securesms.database.helpers.SignalDatabaseMigrations.migrate
|
||||
import org.thoughtcrime.securesms.database.helpers.SignalDatabaseMigrations.migratePostTransaction
|
||||
import org.thoughtcrime.securesms.database.model.AvatarPickerDatabase
|
||||
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
|
||||
import org.thoughtcrime.securesms.jobs.RefreshPreKeysJob
|
||||
import org.thoughtcrime.securesms.jobs.PreKeysSyncJob
|
||||
import org.thoughtcrime.securesms.migrations.LegacyMigrationJob
|
||||
import org.thoughtcrime.securesms.migrations.LegacyMigrationJob.DatabaseUpgradeListener
|
||||
import org.thoughtcrime.securesms.service.KeyCachingService
|
||||
@@ -145,7 +144,7 @@ open class SignalDatabase(private val context: Application, databaseSecret: Data
|
||||
val masterSecret = KeyCachingService.getMasterSecret(context)
|
||||
if (masterSecret != null) SQLCipherMigrationHelper.migrateCiphertext(context, masterSecret, legacyDb, db, null) else TextSecurePreferences.setNeedsSqlCipherMigration(context, true)
|
||||
if (!PreKeyMigrationHelper.migratePreKeys(context, db)) {
|
||||
ApplicationDependencies.getJobManager().add(RefreshPreKeysJob())
|
||||
PreKeysSyncJob.enqueue()
|
||||
}
|
||||
SessionStoreMigrationHelper.migrateSessions(context, db)
|
||||
PreKeyMigrationHelper.cleanUpPreKeys(context)
|
||||
|
||||
@@ -30,9 +30,8 @@ import org.thoughtcrime.securesms.database.RecipientDatabase
|
||||
import org.thoughtcrime.securesms.database.helpers.migration.MyStoryMigration
|
||||
import org.thoughtcrime.securesms.database.helpers.migration.UrgentMslFlagMigration
|
||||
import org.thoughtcrime.securesms.database.model.databaseprotos.ReactionList
|
||||
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
|
||||
import org.thoughtcrime.securesms.groups.GroupId
|
||||
import org.thoughtcrime.securesms.jobs.RefreshPreKeysJob
|
||||
import org.thoughtcrime.securesms.jobs.PreKeysSyncJob
|
||||
import org.thoughtcrime.securesms.keyvalue.SignalStore
|
||||
import org.thoughtcrime.securesms.notifications.NotificationChannels
|
||||
import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter
|
||||
@@ -224,7 +223,7 @@ object SignalDatabaseMigrations {
|
||||
db.execSQL("CREATE TABLE one_time_prekeys (_id INTEGER PRIMARY KEY, key_id INTEGER UNIQUE, public_key TEXT NOT NULL, private_key TEXT NOT NULL)")
|
||||
|
||||
if (!PreKeyMigrationHelper.migratePreKeys(context, db)) {
|
||||
ApplicationDependencies.getJobManager().add(RefreshPreKeysJob())
|
||||
PreKeysSyncJob.enqueue()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user