Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-26 11:51:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Restore a Local Backup v2

Browse Source
This commit is contained in:
Nicholas Tinsley
2024-04-18 14:44:49 -04:00
committed by Greyson Parrelli
parent 947ab7d48b
commit 62cf3feeaa
22 changed files with 1221 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java
View File

@@ -37,6 +37,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.profiles.AvatarHelper;
import org.thoughtcrime.securesms.recipients.RecipientId;
import org.thoughtcrime.securesms.util.BackupUtil;
import org.thoughtcrime.securesms.util.FeatureFlags;
import org.thoughtcrime.securesms.util.Util;
import java.io.ByteArrayOutputStream;
@@ -270,6 +271,13 @@ public class FullBackupImporter extends FullBackupBase {
return;
}
if (FeatureFlags.registrationV2()) {
if (SignalStore.account().getKeysToIncludeInBackup().contains(keyValue.key)) {
Log.i(TAG, "[regv2] skipping restore of " + keyValue.key);
return;
}
}
if (keyValue.blobValue != null) {
dataSet.putBlob(keyValue.key, keyValue.blobValue.toByteArray());
} else if (keyValue.booleanValue != null) {