Merge pull request #4333 from TeamNewPipe/release/0.20.0

Release 0.20.0

Author: TobiGr

.github/CONTRIBUTING.md

@@ -33,6 +33,7 @@ with your GitHub account.
 
 ## Code contribution
 
+* If you want to add a feature or change one, please open an issue describing your change. This gives the team and community a chance to give feedback before you spend any time on something that could be done differently or not done at all. It also prevents two contributors from working on the same thing and one being disappointed when only one user's code can be added.
 * Stick to NewPipe's style conventions: follow [checkStyle](https://github.com/checkstyle/checkstyle). It will run each time you build the project.
 * Do not bring non-free software (e.g. binary blobs) into the project. Also, make sure you do not introduce Google
   libraries.

app/build.gradle

@@ -13,8 +13,8 @@ android {
         resValue "string", "app_name", "NewPipe"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 953
-        versionName "0.19.8"
+        versionCode 954
+        versionName "0.20.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -33,7 +33,7 @@ android {
 
             // suffix the app id and the app name with git branch name
             def workingBranch = getGitWorkingBranch()
-            def normalizedWorkingBranch = workingBranch.replaceAll("[^A-Za-z]+", "").toLowerCase()
+            def normalizedWorkingBranch = workingBranch.replaceFirst("^[^A-Za-z]+", "").replaceAll("[^0-9A-Za-z]+", "")
             if (normalizedWorkingBranch.isEmpty() || workingBranch == "master" || workingBranch == "dev") {
                 // default values when branch name could not be determined or is master or dev
                 applicationIdSuffix ".debug"
@@ -84,11 +84,12 @@ ext {
     checkstyleVersion = '8.32'
     stethoVersion = '1.5.1'
     leakCanaryVersion = '2.2'
-    exoPlayerVersion = '2.11.6'
+    exoPlayerVersion = '2.11.8'
     androidxLifecycleVersion = '2.2.0'
     androidxRoomVersion = '2.2.5'
     groupieVersion = '2.8.0'
     markwonVersion = '4.3.1'
+    googleAutoServiceVersion = '1.0-rc7'
 }
 
 configurations {
@@ -138,7 +139,7 @@ afterEvaluate {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
     implementation "frankiesardo:icepick:${icepickVersion}"
     kapt "frankiesardo:icepick-processor:${icepickVersion}"
@@ -163,18 +164,21 @@ dependencies {
         exclude module: 'support-annotations'
     }
 
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:5ac80624a40f4c600ae493e66881b5bf008f0ddb'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:2463884aa8b696df5812f7feff553008bbd2f888'
 
     implementation "com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751"
     implementation "org.jsoup:jsoup:1.13.1"
 
-    implementation "com.squareup.okhttp3:okhttp:3.12.11"
+    implementation "com.squareup.okhttp3:okhttp:3.12.12"
 
     implementation "com.google.android.exoplayer:exoplayer:${exoPlayerVersion}"
     implementation "com.google.android.exoplayer:extension-mediasession:${exoPlayerVersion}"
 
     implementation "com.google.android.material:material:1.1.0"
 
+    compileOnly "com.google.auto.service:auto-service-annotations:${googleAutoServiceVersion}"
+    kapt "com.google.auto.service:auto-service:${googleAutoServiceVersion}"
+
     implementation "androidx.appcompat:appcompat:1.1.0"
     implementation "androidx.preference:preference:1.1.1"
     implementation "androidx.recyclerview:recyclerview:1.1.0"
@@ -183,7 +187,6 @@ dependencies {
 
     implementation "androidx.lifecycle:lifecycle-livedata:${androidxLifecycleVersion}"
     implementation "androidx.lifecycle:lifecycle-viewmodel:${androidxLifecycleVersion}"
-    implementation "androidx.lifecycle:lifecycle-extensions:${androidxLifecycleVersion}"
 
     implementation "androidx.room:room-runtime:${androidxRoomVersion}"
     implementation "androidx.room:room-rxjava2:${androidxRoomVersion}"
@@ -206,7 +209,7 @@ dependencies {
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
     implementation "com.jakewharton.rxbinding2:rxbinding:2.2.0"
 
-    implementation "org.ocpsoft.prettytime:prettytime:4.0.5.Final"
+    implementation "org.ocpsoft.prettytime:prettytime:4.0.6.Final"
 }
 
 static String getGitWorkingBranch() {

app/src/androidTest/java/org/schabi/newpipe/report/ErrorInfoTest.java

@@ -21,13 +21,13 @@ public class ErrorInfoTest {
 
     @Test
     public void errorInfoTestParcelable() {
-        ErrorInfo info = ErrorInfo.make(UserAction.USER_REPORT, "youtube", "request",
+        final ErrorInfo info = ErrorInfo.make(UserAction.USER_REPORT, "youtube", "request",
                 R.string.general_error);
         // Obtain a Parcel object and write the parcelable object to it:
-        Parcel parcel = Parcel.obtain();
+        final Parcel parcel = Parcel.obtain();
         info.writeToParcel(parcel, 0);
         parcel.setDataPosition(0);
-        ErrorInfo infoFromParcel = ErrorInfo.CREATOR.createFromParcel(parcel);
+        final ErrorInfo infoFromParcel = ErrorInfo.CREATOR.createFromParcel(parcel);
 
         assertEquals(UserAction.USER_REPORT, infoFromParcel.userAction);
         assertEquals("youtube", infoFromParcel.serviceName);

app/src/debug/java/org/schabi/newpipe/DebugApp.kt

@@ -1,6 +1,5 @@
 package org.schabi.newpipe
 
-import android.content.Context
 import androidx.multidex.MultiDex
 import androidx.preference.PreferenceManager
 import com.facebook.stetho.Stetho
@@ -11,11 +10,6 @@ import okhttp3.OkHttpClient
 import org.schabi.newpipe.extractor.downloader.Downloader
 
 class DebugApp : App() {
-    override fun attachBaseContext(base: Context) {
-        super.attachBaseContext(base)
-        MultiDex.install(this)
-    }
-
     override fun onCreate() {
         super.onCreate()
         initStetho()
@@ -34,6 +28,12 @@ class DebugApp : App() {
         return downloader
     }
 
+    override fun initACRA() {
+        // install MultiDex before initializing ACRA
+        MultiDex.install(this)
+        super.initACRA()
+    }
+
     private fun initStetho() {
         // Create an InitializerBuilder
         val initializerBuilder = Stetho.newInitializerBuilder(this)

app/src/main/AndroidManifest.xml

@@ -23,6 +23,7 @@
         android:logo="@mipmap/ic_launcher"
         android:requestLegacyExternalStorage="true"
         android:theme="@style/OpeningTheme"
+        android:resizeableActivity="true"
         tools:ignore="AllowBackup">
         <activity
             android:name=".MainActivity"
@@ -43,34 +44,19 @@
         </receiver>
 
         <service
-            android:name=".player.BackgroundPlayer"
-            android:exported="false">
+            android:name=".player.MainPlayer"
+            android:exported="false"
+            android:foregroundServiceType="mediaPlayback">
             <intent-filter>
                 <action android:name="android.intent.action.MEDIA_BUTTON" />
             </intent-filter>
         </service>
 
         <activity
             android:name=".player.BackgroundPlayerActivity"
-            android:label="@string/title_activity_background_player"
+            android:label="@string/title_activity_play_queue"
             android:launchMode="singleTask" />
 
-        <activity
-            android:name=".player.PopupVideoPlayerActivity"
-            android:label="@string/title_activity_popup_player"
-            android:launchMode="singleTask" />
-
-        <service
-            android:name=".player.PopupVideoPlayer"
-            android:exported="false" />
-
-        <activity
-            android:name=".player.MainVideoPlayer"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
-            android:label="@string/app_name"
-            android:launchMode="singleTask"
-            android:theme="@style/VideoPlayerTheme" />
-
         <activity
             android:name=".settings.SettingsActivity"
             android:label="@string/settings" />
@@ -334,5 +320,11 @@
         <service
             android:name=".RouterActivity$FetcherService"
             android:exported="false" />
+
+        <!-- see https://github.com/TeamNewPipe/NewPipe/issues/3947 -->
+        <!-- Version < 3.0. DeX Mode and Screen Mirroring support -->
+        <meta-data android:name="com.samsung.android.keepalive.density" android:value="true"/>
+        <!-- Version >= 3.0. DeX Dual Mode support -->
+        <meta-data android:name="com.samsung.android.multidisplay.keep_process_alive" android:value="true"/>
     </application>
 </manifest>

app/src/main/java/androidx/fragment/app/FragmentStatePagerAdapterMenuWorkaround.java

@@ -150,7 +150,7 @@ public Object instantiateItem(@NonNull final ViewGroup container, final int posi
         // from its saved state, where the fragment manager has already
         // taken care of restoring the fragments we previously had instantiated.
         if (mFragments.size() > position) {
-            Fragment f = mFragments.get(position);
+            final Fragment f = mFragments.get(position);
             if (f != null) {
                 return f;
             }
@@ -160,12 +160,12 @@ public Object instantiateItem(@NonNull final ViewGroup container, final int posi
             mCurTransaction = mFragmentManager.beginTransaction();
         }
 
-        Fragment fragment = getItem(position);
+        final Fragment fragment = getItem(position);
         if (DEBUG) {
             Log.v(TAG, "Adding item #" + position + ": f=" + fragment);
         }
         if (mSavedState.size() > position) {
-            Fragment.SavedState fss = mSavedState.get(position);
+            final Fragment.SavedState fss = mSavedState.get(position);
             if (fss != null) {
                 fragment.setInitialSavedState(fss);
             }
@@ -191,7 +191,7 @@ public Object instantiateItem(@NonNull final ViewGroup container, final int posi
     @Override
     public void destroyItem(@NonNull final ViewGroup container, final int position,
                             @NonNull final Object object) {
-        Fragment fragment = (Fragment) object;
+        final Fragment fragment = (Fragment) object;
 
         if (mCurTransaction == null) {
             mCurTransaction = mFragmentManager.beginTransaction();
@@ -217,7 +217,7 @@ public void destroyItem(@NonNull final ViewGroup container, final int position,
     @SuppressWarnings({"ReferenceEquality", "deprecation"})
     public void setPrimaryItem(@NonNull final ViewGroup container, final int position,
                                @NonNull final Object object) {
-        Fragment fragment = (Fragment) object;
+        final Fragment fragment = (Fragment) object;
         if (fragment != mCurrentPrimaryItem) {
             if (mCurrentPrimaryItem != null) {
                 mCurrentPrimaryItem.setMenuVisibility(false);
@@ -267,17 +267,17 @@ public Parcelable saveState() {
         Bundle state = null;
         if (mSavedState.size() > 0) {
             state = new Bundle();
-            Fragment.SavedState[] fss = new Fragment.SavedState[mSavedState.size()];
+            final Fragment.SavedState[] fss = new Fragment.SavedState[mSavedState.size()];
             mSavedState.toArray(fss);
             state.putParcelableArray("states", fss);
         }
         for (int i = 0; i < mFragments.size(); i++) {
-            Fragment f = mFragments.get(i);
+            final Fragment f = mFragments.get(i);
             if (f != null && f.isAdded()) {
                 if (state == null) {
                     state = new Bundle();
                 }
-                String key = "f" + i;
+                final String key = "f" + i;
                 mFragmentManager.putFragment(state, key, f);
 
                 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -294,21 +294,21 @@ public Parcelable saveState() {
     @Override
     public void restoreState(@Nullable final Parcelable state, @Nullable final ClassLoader loader) {
         if (state != null) {
-            Bundle bundle = (Bundle) state;
+            final Bundle bundle = (Bundle) state;
             bundle.setClassLoader(loader);
-            Parcelable[] fss = bundle.getParcelableArray("states");
+            final Parcelable[] fss = bundle.getParcelableArray("states");
             mSavedState.clear();
             mFragments.clear();
             if (fss != null) {
-                for (int i = 0; i < fss.length; i++) {
-                    mSavedState.add((Fragment.SavedState) fss[i]);
+                for (final Parcelable parcelable : fss) {
+                    mSavedState.add((Fragment.SavedState) parcelable);
                 }
             }
-            Iterable<String> keys = bundle.keySet();
-            for (String key: keys) {
+            final Iterable<String> keys = bundle.keySet();
+            for (final String key : keys) {
                 if (key.startsWith("f")) {
-                    int index = Integer.parseInt(key.substring(1));
-                    Fragment f = mFragmentManager.getFragment(bundle, key);
+                    final int index = Integer.parseInt(key.substring(1));
+                    final Fragment f = mFragmentManager.getFragment(bundle, key);
                     if (f != null) {
                         while (mFragments.size() <= index) {
                             mFragments.add(null);