Merge branch 'refactor' into History-Compose

Author: Isira-Seneviratne

.github/workflows/ci.yml

@@ -111,6 +111,7 @@ jobs:
           path: app/build/reports/androidTests/connected/**
 
   sonar:
+    if: ${{ false }} # the key has expired and needs to be regenerated by the sonar admins
     runs-on: ubuntu-latest
 
     permissions:

README.md

@@ -1,20 +1,30 @@
-<h3 align="center">We are planning to <i>rewrite</i> large chunks of the codebase, to bring about <a href="https://github.com/TeamNewPipe/NewPipe/discussions/10118">a new, modern and stable NewPipe</a>!</h3>
-<h4 align="center">Please do <b>not</b> open pull requests for <i>new features</i> now, only bugfix PRs will be accepted.</h4>
+<h3 align="center">We are <i>rewriting</i> large chunks of the codebase, to bring about <a href="https://newpipe.net/blog/pinned/announcement/newpipe-0.27.6-rewrite-team-states/#the-refactor">a modern and stable NewPipe</a>! You can download nightly builds <a href="https://github.com/TeamNewPipe/NewPipe-refactor-nightly/releases">here</a>.</h3>
+<h4 align="center">Please work on the <code>refactor</code> branch if you want to contribute <i>new features</i>. The current codebase is in maintenance mode and will only receive <i>bugfixes</i>.</h4>
 
 <p align="center"><a href="https://newpipe.net"><img src="assets/new_pipe_icon_5.png" width="150"></a></p> 
 <h2 align="center"><b>NewPipe</b></h2>
 <h4 align="center">A libre lightweight streaming front-end for Android.</h4>
 
-<p align="center"><a href="https://f-droid.org/packages/org.schabi.newpipe/"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on-en.svg" alt="Get it on F-Droid" height=80/></a></p>
+<p align="center"><a href="https://f-droid.org/packages/org.schabi.newpipe/"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on-en.svg" alt="Get it on F-Droid" width=206/></a></p>
 
 <p align="center">
-<a href="https://github.com/TeamNewPipe/NewPipe/releases" alt="GitHub release"><img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe.svg" ></a>
+<a href="https://github.com/TeamNewPipe/NewPipe/releases" alt="GitHub NewPipe releases"><img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe.svg" ></a>
+<a href="https://github.com/TeamNewPipe/NewPipe-nightly/releases" alt="GitHub NewPipe nightly releases">
+ <img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe-nightly.svg?labelColor=purple&label=dev%20nightly" >
+</a>
+<a href="https://github.com/TeamNewPipe/NewPipe-refactor-nightly/releases" alt="GitHub NewPipe refactor nightly releases">
+ <img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe-refactor-nightly.svg?labelColor=purple&label=refactor%20nightly" >
+</a>
 <a href="https://www.gnu.org/licenses/gpl-3.0" alt="License: GPLv3"><img src="https://img.shields.io/badge/License-GPL%20v3-blue.svg"></a>
-<a href="https://github.com/TeamNewPipe/NewPipe/actions" alt="Build Status"><img src="https://github.com/TeamNewPipe/NewPipe/workflows/CI/badge.svg?branch=dev&event=push"></a>
+<a href="https://github.com/TeamNewPipe/NewPipe/actions" alt="Build Status"><img src="https://github.com/TeamNewPipe/NewPipe/actions/workflows/ci.yml/badge.svg?branch=dev&event=push"></a>
 <a href="https://hosted.weblate.org/engage/newpipe/" alt="Translation Status"><img src="https://hosted.weblate.org/widgets/newpipe/-/svg-badge.svg"></a>
+</p>
+
+<p align="center">
 <a href="https://web.libera.chat/#newpipe" alt="IRC channel: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg"></a>
 <a href="https://matrix.to/#/#newpipe:matrix.newpipe-ev.de" alt="Matrix channel: #newpipe"><img src="https://img.shields.io/badge/Matrix%20chat-%23newpipe-blue"></a>
 </p>
+
 <hr>
 <p align="center"><a href="#screenshots">Screenshots</a> &bull; <a href="#supported-services">Supported Services</a> &bull; <a href="#description">Description</a> &bull; <a href="#features">Features</a> &bull; <a href="#installation-and-updates">Installation and updates</a> &bull; <a href="#contribution">Contribution</a> &bull; <a href="#donate">Donate</a> &bull; <a href="#license">License</a></p>
 <p align="center"><a href="https://newpipe.net">Website</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">FAQ</a> &bull; <a href="https://newpipe.net/press/">Press</a></p>

app/src/main/java/org/schabi/newpipe/MainActivity.java

@@ -122,7 +122,10 @@ public class MainActivity extends AppCompatActivity {
     private static final int ITEM_ID_ABOUT = 2;
 
     private static final int ORDER = 0;
+    public static final String KEY_IS_IN_BACKGROUND = "is_in_background";
 
+    private SharedPreferences sharedPreferences;
+    private SharedPreferences.Editor sharedPrefEditor;
     /*//////////////////////////////////////////////////////////////////////////
     // Activity's LifeCycle
     //////////////////////////////////////////////////////////////////////////*/
@@ -152,6 +155,8 @@ protected void onCreate(final Bundle savedInstanceState) {
 
         assureCorrectAppLanguage(this);
         super.onCreate(savedInstanceState);
+        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        sharedPrefEditor = sharedPreferences.edit();
 
         mainBinding = ActivityMainBinding.inflate(getLayoutInflater());
         drawerLayoutBinding = mainBinding.drawerLayout;
@@ -195,16 +200,29 @@ protected void onPostCreate(final Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
 
         final App app = App.getInstance();
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(app);
 
-        if (prefs.getBoolean(app.getString(R.string.update_app_key), false)
-                && prefs.getBoolean(app.getString(R.string.update_check_consent_key), false)) {
+        if (sharedPreferences.getBoolean(app.getString(R.string.update_app_key), false)
+                && sharedPreferences
+                .getBoolean(app.getString(R.string.update_check_consent_key), false)) {
             // Start the worker which is checking all conditions
             // and eventually searching for a new version.
             NewVersionWorker.enqueueNewVersionCheckingWork(app, false);
         }
     }
 
+    @Override
+    protected void onStart() {
+        super.onStart();
+        sharedPrefEditor.putBoolean(KEY_IS_IN_BACKGROUND, false).apply();
+        Log.d(TAG, "App moved to foreground");
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        sharedPrefEditor.putBoolean(KEY_IS_IN_BACKGROUND, true).apply();
+        Log.d(TAG, "App moved to background");
+    }
     private void setupDrawer() throws ExtractionException {
         addDrawerMenuForCurrentService();
 
@@ -504,21 +522,19 @@ protected void onResume() {
             ErrorUtil.showUiErrorSnackbar(this, "Setting up service toggle", e);
         }
 
-        final SharedPreferences sharedPreferences =
-                PreferenceManager.getDefaultSharedPreferences(this);
         if (sharedPreferences.getBoolean(Constants.KEY_THEME_CHANGE, false)) {
             if (DEBUG) {
                 Log.d(TAG, "Theme has changed, recreating activity...");
             }
-            sharedPreferences.edit().putBoolean(Constants.KEY_THEME_CHANGE, false).apply();
+            sharedPrefEditor.putBoolean(Constants.KEY_THEME_CHANGE, false).apply();
             ActivityCompat.recreate(this);
         }
 
         if (sharedPreferences.getBoolean(Constants.KEY_MAIN_PAGE_CHANGE, false)) {
             if (DEBUG) {
                 Log.d(TAG, "main page has changed, recreating main fragment...");
             }
-            sharedPreferences.edit().putBoolean(Constants.KEY_MAIN_PAGE_CHANGE, false).apply();
+            sharedPrefEditor.putBoolean(Constants.KEY_MAIN_PAGE_CHANGE, false).apply();
             NavigationHelper.openMainActivity(this);
         }
 

app/src/main/java/org/schabi/newpipe/error/ErrorUtil.kt

@@ -11,7 +11,9 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.PendingIntentCompat
 import androidx.fragment.app.Fragment
+import androidx.preference.PreferenceManager
 import com.google.android.material.snackbar.Snackbar
+import org.schabi.newpipe.MainActivity
 import org.schabi.newpipe.R
 
 /**
@@ -35,12 +37,20 @@ class ErrorUtil {
          * activity (since the workflow would be interrupted anyway in that case). So never use this
          * for background services.
          *
+         * If the crashed occurred while the app was in the background open a notification instead
+         *
          * @param context the context to use to start the new activity
          * @param errorInfo the error info to be reported
          */
         @JvmStatic
         fun openActivity(context: Context, errorInfo: ErrorInfo) {
-            context.startActivity(getErrorActivityIntent(context, errorInfo))
+            if (PreferenceManager.getDefaultSharedPreferences(context)
+                .getBoolean(MainActivity.KEY_IS_IN_BACKGROUND, true)
+            ) {
+                createNotification(context, errorInfo)
+            } else {
+                context.startActivity(getErrorActivityIntent(context, errorInfo))
+            }
         }
 
         /**

app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt

@@ -274,7 +274,12 @@ class FeedFragment : BaseStateFragment<FeedState>() {
     @Deprecated("Deprecated in Java")
     override fun onDestroyOptionsMenu() {
         super.onDestroyOptionsMenu()
-        activity?.supportActionBar?.subtitle = null
+        if (
+            (groupName != "") &&
+            (activity?.supportActionBar?.subtitle == groupName)
+        ) {
+            activity?.supportActionBar?.subtitle = null
+        }
     }
 
     override fun onDestroy() {
@@ -286,7 +291,13 @@ class FeedFragment : BaseStateFragment<FeedState>() {
         }
 
         super.onDestroy()
-        activity?.supportActionBar?.subtitle = null
+
+        if (
+            (groupName != "") &&
+            (activity?.supportActionBar?.subtitle == groupName)
+        ) {
+            activity?.supportActionBar?.subtitle = null
+        }
     }
 
     override fun onDestroyView() {

app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt

@@ -12,6 +12,7 @@ import android.view.MenuItem
 import android.view.SubMenu
 import android.view.View
 import android.view.ViewGroup
+import android.webkit.MimeTypeMap
 import android.widget.Toast
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
@@ -456,6 +457,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
     }
 
     companion object {
-        const val JSON_MIME_TYPE = "application/json"
+        val JSON_MIME_TYPE = MimeTypeMap.getSingleton()
+            .getMimeTypeFromExtension("json") ?: "application/octet-stream"
     }
 }

app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java

@@ -167,6 +167,11 @@ class PlayerServiceConnection implements ServiceConnection {
 
         private boolean playAfterConnect = false;
 
+        /**
+         * @param playAfterConnection Sets the value of `playAfterConnect` to pass to the {@link
+         * PlayerServiceExtendedEventListener#onPlayerConnected(Player, boolean)} the next time it
+         * is called. The value of `playAfterConnect` will be reset to false after that.
+         */
         public void doPlayAfterConnect(final boolean playAfterConnection) {
             this.playAfterConnect = playAfterConnection;
         }
@@ -371,6 +376,8 @@ public void onServiceStopped() {
                 listener.onPlayerDisconnected();
             } else {
                 listener.onPlayerConnected(player, serviceConnection.playAfterConnect);
+                // reset the value of playAfterConnect: if it was true before, it is now "consumed"
+                serviceConnection.playAfterConnect = false;
                 player.setFragmentListener(internalListener);
             }
         }

app/src/main/java/org/schabi/newpipe/player/mediabrowser/MediaBrowserImpl.kt

@@ -8,6 +8,7 @@ import android.support.v4.media.MediaBrowserCompat
 import android.support.v4.media.MediaDescriptionCompat
 import android.util.Log
 import androidx.annotation.DrawableRes
+import androidx.core.net.toUri
 import androidx.media.MediaBrowserServiceCompat
 import androidx.media.MediaBrowserServiceCompat.Result
 import androidx.media.utils.MediaConstants
@@ -103,7 +104,7 @@ class MediaBrowserImpl(
 
     private fun onLoadChildren(parentId: String): Single<List<MediaBrowserCompat.MediaItem>> {
         try {
-            val parentIdUri = Uri.parse(parentId)
+            val parentIdUri = parentId.toUri()
             val path = ArrayList(parentIdUri.pathSegments)
 
             if (path.isEmpty()) {
@@ -185,7 +186,7 @@ class MediaBrowserImpl(
         builder
             .setMediaId(createMediaIdForInfoItem(playlist is PlaylistRemoteEntity, playlist.uid))
             .setTitle(playlist.orderingName)
-            .setIconUri(playlist.thumbnailUrl?.let { Uri.parse(it) })
+            .setIconUri(imageUriOrNullIfDisabled(playlist.thumbnailUrl))
 
         val extras = Bundle()
         extras.putString(
@@ -212,7 +213,7 @@ class MediaBrowserImpl(
         }
 
         ImageStrategy.choosePreferredImage(item.thumbnails)?.let {
-            builder.setIconUri(Uri.parse(it))
+            builder.setIconUri(imageUriOrNullIfDisabled(it))
         }
 
         return MediaBrowserCompat.MediaItem(
@@ -258,7 +259,7 @@ class MediaBrowserImpl(
         builder.setMediaId(createMediaIdForPlaylistIndex(false, playlistId, index))
             .setTitle(item.streamEntity.title)
             .setSubtitle(item.streamEntity.uploader)
-            .setIconUri(Uri.parse(item.streamEntity.thumbnailUrl))
+            .setIconUri(imageUriOrNullIfDisabled(item.streamEntity.thumbnailUrl))
 
         return MediaBrowserCompat.MediaItem(
             builder.build(),
@@ -277,7 +278,7 @@ class MediaBrowserImpl(
             .setSubtitle(item.uploaderName)
 
         ImageStrategy.choosePreferredImage(item.thumbnails)?.let {
-            builder.setIconUri(Uri.parse(it))
+            builder.setIconUri(imageUriOrNullIfDisabled(it))
         }
 
         return MediaBrowserCompat.MediaItem(
@@ -316,7 +317,7 @@ class MediaBrowserImpl(
         builder.setMediaId(mediaId)
             .setTitle(streamHistoryEntry.streamEntity.title)
             .setSubtitle(streamHistoryEntry.streamEntity.uploader)
-            .setIconUri(Uri.parse(streamHistoryEntry.streamEntity.thumbnailUrl))
+            .setIconUri(imageUriOrNullIfDisabled(streamHistoryEntry.streamEntity.thumbnailUrl))
 
         return MediaBrowserCompat.MediaItem(
             builder.build(),
@@ -395,5 +396,13 @@ class MediaBrowserImpl(
 
     companion object {
         private val TAG: String = MediaBrowserImpl::class.java.getSimpleName()
+
+        fun imageUriOrNullIfDisabled(url: String?): Uri? {
+            return if (ImageStrategy.shouldLoadImages()) {
+                url?.toUri()
+            } else {
+                null
+            }
+        }
     }
 }

app/src/main/java/org/schabi/newpipe/player/mediabrowser/MediaBrowserPlaybackPreparer.kt

@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.os.ResultReceiver
 import android.support.v4.media.session.PlaybackStateCompat
 import android.util.Log
+import androidx.core.net.toUri
 import com.google.android.exoplayer2.Player
 import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector.PlaybackPreparer
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
@@ -137,7 +138,7 @@ class MediaBrowserPlaybackPreparer(
 
     private fun extractPlayQueueFromMediaId(mediaId: String): Single<PlayQueue> {
         try {
-            val mediaIdUri = Uri.parse(mediaId)
+            val mediaIdUri = mediaId.toUri()
             val path = ArrayList(mediaIdUri.pathSegments)
             if (path.isEmpty()) {
                 throw parseError(mediaId)