lasers
/
NewPipe
mirror of https://github.com/TeamNewPipe/NewPipe
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8666 from TacoTheDank/filepicker 

Update FilePicker to our custom fork and disable Jetifier
This commit is contained in:
Stypox 2022-08-12 09:15:34 +02:00 committed by GitHub
parent 74921d3afa baabba1dea
commit 571bf397c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -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"

4
app/src/main/java/org/schabi/newpipe/util/FilePickerActivityHelper.java
View File

@ -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);

2
gradle.properties
View File

@ -1,4 +1,4 @@
android.enableJetifier=true
android.enableJetifier=false
android.useAndroidX=true
org.gradle.jvmargs=-Xmx2048M
systemProp.file.encoding=utf-8