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

Clean up pre-Lollipop checks

Browse source
This commit is contained in:
litetex 2022-07-06 17:46:20 -04:00 • committed by Stypox
parent 7cb137ae8d
commit 99104fc11d
No known key found for this signature in database
GPG key ID: 4BDF1B40A49FDD23
73 changed files with 59 additions and 425 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,7 +5,6 @@ import android.content.Context;
import android.content.Intent;
import android.database.Cursor;
import android.net.Uri;
import android.os.Build;
import android.provider.DocumentsContract;
import androidx.annotation.NonNull;
@ -53,10 +52,6 @@ public class StoredDirectoryHelper {
throw new IOException(e);
}
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
throw new IOException("Storage Access Framework with Directory API is not available");
}
this.docTree = DocumentFile.fromTreeUri(context, path);
if (this.docTree == null) {
@ -73,7 +68,7 @@ public class StoredDirectoryHelper {
final String[] filename = splitFilename(name);
final String lcFilename = filename[0].toLowerCase();
if (docTree == null || Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
if (docTree == null) {
for (final File file : ioTree.listFiles()) {
addIfStartWith(matches, lcFilename, file.getName());
}
@ -277,7 +272,7 @@ public class StoredDirectoryHelper {
*/
static DocumentFile findFileSAFHelper(@Nullable final Context context, final DocumentFile tree,
final String filename) {
if (context == null || Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
if (context == null) {
return tree.findFile(filename); // warning: this is very slow
}

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

@ -1,6 +1,5 @@
package org.schabi.newpipe.streams.io;
import android.annotation.TargetApi;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
@ -74,7 +73,6 @@ public class StoredFileHelper implements Serializable {
this.tag = tag;
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
StoredFileHelper(@Nullable final Context context, final DocumentFile tree,
final String filename, final String mime, final boolean safe)
throws IOException {
@ -124,7 +122,6 @@ public class StoredFileHelper implements Serializable {
this.srcType = mime;
}
@TargetApi(Build.VERSION_CODES.KITKAT)
public StoredFileHelper(final Context context, @Nullable final Uri parent,
@NonNull final Uri path, final String tag) throws IOException {
this.tag = tag;