TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-08 20:28:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with backup deletion.

Browse Source
This commit is contained in:
Alex Hart 2020-10-19 10:27:18 -03:00
parent dcb9978bb1
commit 3163e09b98
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.java
View File

@ -15,6 +15,7 @@ import androidx.documentfile.provider.DocumentFile;
import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.backup.BackupPassphrase; import org.thoughtcrime.securesms.backup.BackupPassphrase;
import org.thoughtcrime.securesms.database.NoExternalStorageException; import org.thoughtcrime.securesms.database.NoExternalStorageException;
import org.thoughtcrime.securesms.database.documents.Document;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.keyvalue.SignalStore; import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.logging.Log;
@ -247,8 +248,8 @@ public class BackupUtil {
BackupInfo(long timestamp, long size, Uri uri) { BackupInfo(long timestamp, long size, Uri uri) {
this.timestamp = timestamp; this.timestamp = timestamp;
this.size = size; this.size = size;
this.uri = uri; this.uri = uri;
} }
public long getTimestamp() { public long getTimestamp() {
@ -264,22 +265,24 @@ public class BackupUtil {
} }
private void delete() { private void delete() {
DocumentFile document = DocumentFile.fromSingleUri(ApplicationDependencies.getApplication(), uri); File file = new File(Objects.requireNonNull(uri.getPath()));
if (document != null && document.exists()) {
Log.i(TAG, "Deleting: " + uri);
if (!document.delete()) { if (file.exists()) {
Log.w(TAG, "Delete failed: " + uri); Log.i(TAG, "Deleting File: " + file.getAbsolutePath());
}
} else {
File file = new File(uri.toString());
Log.i(TAG, "Deleting: " + file.getAbsolutePath());
if (!file.delete()) { if (!file.delete()) {
Log.w(TAG, "Delete failed: " + file.getAbsolutePath()); Log.w(TAG, "Delete failed: " + file.getAbsolutePath());
} }
} } else {
DocumentFile document = DocumentFile.fromSingleUri(ApplicationDependencies.getApplication(), uri);
if (document != null && document.exists()) {
Log.i(TAG, "Deleting DocumentFile: " + uri);
if (!document.delete()) {
Log.w(TAG, "Delete failed: " + uri);
}
}
}
} }
} }
} }