From 8f5d564f8430ec6d5e582a2d1e9267d84d4c0f4a Mon Sep 17 00:00:00 2001
From: TacoTheDank <SkytkRSfan3895@gmail.com>
Date: Wed, 20 Jul 2022 21:01:17 -0400
Subject: [PATCH 1/2] Migrate NoNonsense-FilePicker to our updated fork
---
app/build.gradle | 4 +---
.../org/schabi/newpipe/util/FilePickerActivityHelper.java | 4 ++--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 0585120ce..dfa512d22 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -188,6 +188,7 @@ dependencies {
// This works thanks to JitPack: https://jitpack.io/
implementation 'com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751'
implementation 'com.github.TeamNewPipe:NewPipeExtractor:5219a705bab539cf8c6624d0cec216e76e85f0b1'
+ implementation 'com.github.TeamNewPipe:NoNonsense-FilePicker:5.0.0'
/** Checkstyle **/
checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
@@ -257,9 +258,6 @@ dependencies {
implementation "io.noties.markwon:core:${markwonVersion}"
implementation "io.noties.markwon:linkify:${markwonVersion}"
- // File picker
- implementation "com.nononsenseapps:filepicker:4.2.1"
-
// Crash reporting
implementation "ch.acra:acra-core:5.9.3"
diff --git a/app/src/main/java/org/schabi/newpipe/util/FilePickerActivityHelper.java b/app/src/main/java/org/schabi/newpipe/util/FilePickerActivityHelper.java
index 20d8ce30c..d7fb39651 100644
--- a/app/src/main/java/org/schabi/newpipe/util/FilePickerActivityHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/FilePickerActivityHelper.java
@@ -76,7 +76,7 @@ public class FilePickerActivityHelper extends com.nononsenseapps.filepicker.File
public static class CustomFilePickerFragment extends FilePickerFragment {
@Override
- public View onCreateView(final LayoutInflater inflater, final ViewGroup container,
+ public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup container,
final Bundle savedInstanceState) {
return super.onCreateView(inflater, container, savedInstanceState);
}
@@ -138,7 +138,7 @@ public class FilePickerActivityHelper extends com.nononsenseapps.filepicker.File
}
@Override
- public void onLoadFinished(final Loader<SortedList<File>> loader,
+ public void onLoadFinished(@NonNull final Loader<SortedList<File>> loader,
final SortedList<File> data) {
super.onLoadFinished(loader, data);
layoutManager.scrollToPosition(0);
From baabba1deade7e798b7852871039ed148ce6b1f6 Mon Sep 17 00:00:00 2001
From: TacoTheDank <SkytkRSfan3895@gmail.com>
Date: Wed, 20 Jul 2022 21:32:27 -0400
Subject: [PATCH 2/2] Disable Jetifier
---
gradle.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle.properties b/gradle.properties
index 76b51ef0b..032d70cee 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-android.enableJetifier=true
+android.enableJetifier=false
android.useAndroidX=true
org.gradle.jvmargs=-Xmx2048M
systemProp.file.encoding=utf-8