Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check if file really exists before asking user to overwrite it

Browse source
This commit is contained in:
Stypox 2021-03-17 20:28:15 +01:00
parent b78ac7d2e9
commit 21b8df0375
No known key found for this signature in database
GPG key ID: 4BDF1B40A49FDD23
3 changed files with 30 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
View file

@ -757,15 +757,14 @@ public class DownloadDialog extends DialogFragment
return;
}
// check if is our file
// get state of potential mission referring to the same file
final MissionState state = downloadManager.checkForExistingMission(storage);
@StringRes
final int msgBtn;
@StringRes
final int msgBody;
@StringRes final int msgBtn;
@StringRes final int msgBody;
// this switch checks if there is already a mission referring to the same file
switch (state) {
case Finished:
case Finished: // there is already a finished mission
msgBtn = R.string.overwrite;
msgBody = R.string.overwrite_finished_warning;
break;
@ -777,7 +776,7 @@ public class DownloadDialog extends DialogFragment
msgBtn = R.string.generate_unique_name;
msgBody = R.string.download_already_running;
break;
case None:
case None: // there is no mission referring to the same file
if (mainStorage == null) {
// This part is called if:
// * using SAF on older android version
@ -812,7 +811,7 @@ public class DownloadDialog extends DialogFragment
msgBody = R.string.overwrite_unrelated_warning;
break;
default:
return;
return; // unreachable
}
final AlertDialog.Builder askDialog = new AlertDialog.Builder(context)

9
app/src/main/java/org/schabi/newpipe/streams/io/StoredFileHelper.java
View file

@ -290,11 +290,10 @@ public class StoredFileHelper implements Serializable {
}
// WARNING: DocumentFile.exists() and DocumentFile.isFile() methods are slow
final boolean exists = docFile == null ? ioFile.exists() : docFile.exists();
// ¿docFile.isVirtual() means is no-physical?
final boolean isFile = docFile == null ? ioFile.isFile() : docFile.isFile();
return exists && isFile;
// docFile.isVirtual() means it is non-physical?
return docFile == null
? (ioFile.exists() && ioFile.isFile())
: (docFile.exists() && docFile.isFile());
}
public boolean create() {