CodeCow/PCAPdroid
1
0
Fork 0
mirror of https://github.com/emanuele-f/PCAPdroid.git synced 2026-07-03 21:21:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix PCAP file deletion on some Android versions

Browse Source
This commit is contained in:
emanuele-f 2023-01-15 11:11:40 +01:00
parent 4c0ce35085
commit 20ef821b76
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/com/emanuelef/remote_capture/activities/MainActivity.java
View File

@ -715,13 +715,27 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
}
private void deletePcapFile(Uri pcapUri) {
Log.d(TAG, "Deleting PCAP file" + pcapUri.getPath());
boolean deleted = false;
try {
deleted = (getContentResolver().delete(pcapUri, null, null) == 1);
} catch (UnsupportedOperationException | SecurityException e) {
e.printStackTrace();
// The getContentResolver().delete in some Android versions does not work, try to delete
// using file path first
String fpath = Utils.uriToFilePath(this, pcapUri);
if(fpath != null) {
Log.d(TAG, "deletePcapFile: path=" + fpath);
try {
deleted = new File(fpath).delete();
} catch (Exception e) {
e.printStackTrace();
}
} else {
Log.d(TAG, "deletePcapFile: uri=" + pcapUri);
try {
deleted = (getContentResolver().delete(pcapUri, null, null) == 1);
} catch (UnsupportedOperationException | SecurityException e) {
e.printStackTrace();
}
}
if(!deleted)