mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-22 01:40:07 +01:00
Remove regv2.
This commit is contained in:
committed by
Jeffrey Starke
parent
52fa86046b
commit
8dc2077ad0
@@ -44,12 +44,7 @@ final class NewDeviceServerTask implements ServerTask {
|
||||
DataRestoreConstraint.setRestoringData(true);
|
||||
SQLiteDatabase database = SignalDatabase.getBackupDatabase();
|
||||
|
||||
String passphrase;
|
||||
if (RemoteConfig.restoreAfterRegistration()) {
|
||||
passphrase = SignalStore.account().getAccountEntropyPool().getValue();
|
||||
} else {
|
||||
passphrase = "deadbeef";
|
||||
}
|
||||
String passphrase = SignalStore.account().getAccountEntropyPool().getValue();
|
||||
|
||||
BackupPassphrase.set(context, passphrase);
|
||||
FullBackupImporter.importFile(context,
|
||||
@@ -57,7 +52,7 @@ final class NewDeviceServerTask implements ServerTask {
|
||||
database,
|
||||
inputStream,
|
||||
passphrase,
|
||||
RemoteConfig.restoreAfterRegistration());
|
||||
true);
|
||||
|
||||
SignalDatabase.runPostBackupRestoreTasks(database);
|
||||
NotificationChannels.getInstance().restoreContactNotificationChannels();
|
||||
|
||||
@@ -40,12 +40,7 @@ final class OldDeviceClientTask implements ClientTask {
|
||||
|
||||
EventBus.getDefault().register(this);
|
||||
try {
|
||||
String passphrase;
|
||||
if (RemoteConfig.restoreAfterRegistration()) {
|
||||
passphrase = SignalStore.account().getAccountEntropyPool().getValue();
|
||||
} else {
|
||||
passphrase = "deadbeef";
|
||||
}
|
||||
String passphrase = SignalStore.account().getAccountEntropyPool().getValue();
|
||||
|
||||
FullBackupExporter.transfer(context,
|
||||
AttachmentSecretProvider.getInstance(context).getOrCreateAttachmentSecret(),
|
||||
|
||||
Reference in New Issue
Block a user