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

Correctly store backup

Browse source 
Fixes #7831
This commit is contained in:
Moxie Marlinspike 2018-05-24 09:57:16 -07:00
parent d813275f42
commit 70c2a863cc
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java
View file

@ -52,7 +52,7 @@ public class LocalBackupJob extends ContextJob {
try { try {
String backupPassword = TextSecurePreferences.getBackupPassphrase(context); String backupPassword = TextSecurePreferences.getBackupPassphrase(context);
File backupDirectory = StorageUtil.getBackupCacheDirectory(context); File backupDirectory = StorageUtil.getBackupDirectory(context);
String timestamp = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.US).format(new Date()); String timestamp = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.US).format(new Date());
String fileName = String.format("signal-%s.backup", timestamp); String fileName = String.format("signal-%s.backup", timestamp);
File backupFile = new File(backupDirectory, fileName); File backupFile = new File(backupDirectory, fileName);
@ -65,7 +65,7 @@ public class LocalBackupJob extends ContextJob {
throw new IOException("Backup password is null"); throw new IOException("Backup password is null");
} }
File tempFile = File.createTempFile("backup", "tmp", context.getExternalCacheDir()); File tempFile = File.createTempFile("backup", "tmp", StorageUtil.getBackupCacheDirectory(context));
FullBackupExporter.export(context, FullBackupExporter.export(context,
AttachmentSecretProvider.getInstance(context).getOrCreateAttachmentSecret(), AttachmentSecretProvider.getInstance(context).getOrCreateAttachmentSecret(),

4
src/org/thoughtcrime/securesms/util/StorageUtil.java
View file

@ -12,8 +12,7 @@ import org.thoughtcrime.securesms.database.NoExternalStorageException;
import java.io.File; import java.io.File;
public class StorageUtil public class StorageUtil {
{
public static File getBackupDirectory(Context context) throws NoExternalStorageException { public static File getBackupDirectory(Context context) throws NoExternalStorageException {
File storage = null; File storage = null;
@ -43,7 +42,6 @@ public class StorageUtil
} }
} }
return backups; return backups;
} }