Merge from upstream and apply legacy patches

app/build.gradle

@@ -13,8 +13,8 @@ android {
         resValue "string", "app_name", "NewPipe Legacy"
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 81
-        versionName "0.19.5-fdroid"
+        versionCode 90
+        versionName "0.19.8"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

app/src/main/java/org/schabi/newpipelegacy/database/playlist/PlaylistLocalItem.java

@@ -1,7 +1,33 @@
 package org.schabi.newpipelegacy.database.playlist;
 
 import org.schabi.newpipelegacy.database.LocalItem;
+import org.schabi.newpipelegacy.database.playlist.model.PlaylistRemoteEntity;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 public interface PlaylistLocalItem extends LocalItem {
     String getOrderingName();
+
+    static List<PlaylistLocalItem> merge(
+            final List<PlaylistMetadataEntry> localPlaylists,
+            final List<PlaylistRemoteEntity> remotePlaylists) {
+        final List<PlaylistLocalItem> items = new ArrayList<>(
+                localPlaylists.size() + remotePlaylists.size());
+        items.addAll(localPlaylists);
+        items.addAll(remotePlaylists);
+
+        Collections.sort(items, (left, right) -> {
+            final String on1 = left.getOrderingName();
+            final String on2 = right.getOrderingName();
+            if (on1 == null) {
+                return on2 == null ? 0 : 1;
+            } else {
+                return on2 == null ? -1 : on1.compareToIgnoreCase(on2);
+            }
+        });
+
+        return items;
+    }
 }

app/src/main/java/org/schabi/newpipelegacy/fragments/list/BaseListInfoFragment.java

@@ -10,8 +10,8 @@
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.ListInfo;
 import org.schabi.newpipe.extractor.Page;
-import org.schabi.newpipe.util.Constants;
-import org.schabi.newpipe.views.NewPipeRecyclerView;
+import org.schabi.newpipelegacy.util.Constants;
+import org.schabi.newpipelegacy.views.NewPipeRecyclerView;
 
 import java.util.Queue;
 

app/src/main/java/org/schabi/newpipelegacy/info_list/holder/CommentsMiniInfoItemHolder.java

@@ -12,15 +12,15 @@
 import org.schabi.newpipelegacy.R;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
-import org.schabi.newpipe.info_list.InfoItemBuilder;
-import org.schabi.newpipe.local.history.HistoryRecordManager;
-import org.schabi.newpipe.report.ErrorActivity;
-import org.schabi.newpipe.util.AndroidTvUtils;
-import org.schabi.newpipe.util.CommentTextOnTouchListener;
-import org.schabi.newpipe.util.ImageDisplayConstants;
-import org.schabi.newpipe.util.Localization;
-import org.schabi.newpipe.util.NavigationHelper;
-import org.schabi.newpipe.util.ShareUtils;
+import org.schabi.newpipelegacy.info_list.InfoItemBuilder;
+import org.schabi.newpipelegacy.local.history.HistoryRecordManager;
+import org.schabi.newpipelegacy.report.ErrorActivity;
+import org.schabi.newpipelegacy.util.AndroidTvUtils;
+import org.schabi.newpipelegacy.util.CommentTextOnTouchListener;
+import org.schabi.newpipelegacy.util.ImageDisplayConstants;
+import org.schabi.newpipelegacy.util.Localization;
+import org.schabi.newpipelegacy.util.NavigationHelper;
+import org.schabi.newpipelegacy.util.ShareUtils;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

app/src/main/java/org/schabi/newpipelegacy/local/subscription/SubscriptionManager.kt

@@ -5,15 +5,15 @@ import io.reactivex.Completable
 import io.reactivex.Flowable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
-import org.schabi.newpipe.NewPipeDatabase
-import org.schabi.newpipe.database.feed.model.FeedGroupEntity
-import org.schabi.newpipe.database.subscription.SubscriptionDAO
-import org.schabi.newpipe.database.subscription.SubscriptionEntity
 import org.schabi.newpipe.extractor.ListInfo
 import org.schabi.newpipe.extractor.channel.ChannelInfo
 import org.schabi.newpipe.extractor.feed.FeedInfo
 import org.schabi.newpipe.extractor.stream.StreamInfoItem
-import org.schabi.newpipe.local.feed.FeedDatabaseManager
+import org.schabi.newpipelegacy.NewPipeDatabase
+import org.schabi.newpipelegacy.database.feed.model.FeedGroupEntity
+import org.schabi.newpipelegacy.database.subscription.SubscriptionDAO
+import org.schabi.newpipelegacy.database.subscription.SubscriptionEntity
+import org.schabi.newpipelegacy.local.feed.FeedDatabaseManager
 
 class SubscriptionManager(context: Context) {
     private val database = NewPipeDatabase.getInstance(context)

app/src/main/java/org/schabi/newpipelegacy/local/subscription/dialog/FeedGroupDialog.kt

@@ -27,21 +27,21 @@ import java.io.Serializable
 import kotlin.collections.contains
 import kotlinx.android.synthetic.main.dialog_feed_group_create.*
 import kotlinx.android.synthetic.main.toolbar_search_layout.*
-import org.schabi.newpipe.R
-import org.schabi.newpipe.database.feed.model.FeedGroupEntity
-import org.schabi.newpipe.fragments.BackPressable
-import org.schabi.newpipe.local.subscription.FeedGroupIcon
-import org.schabi.newpipe.local.subscription.dialog.FeedGroupDialog.ScreenState.DeleteScreen
-import org.schabi.newpipe.local.subscription.dialog.FeedGroupDialog.ScreenState.IconPickerScreen
-import org.schabi.newpipe.local.subscription.dialog.FeedGroupDialog.ScreenState.InitialScreen
-import org.schabi.newpipe.local.subscription.dialog.FeedGroupDialog.ScreenState.SubscriptionsPickerScreen
-import org.schabi.newpipe.local.subscription.dialog.FeedGroupDialogViewModel.DialogEvent.ProcessingEvent
-import org.schabi.newpipe.local.subscription.dialog.FeedGroupDialogViewModel.DialogEvent.SuccessEvent
-import org.schabi.newpipe.local.subscription.item.EmptyPlaceholderItem
-import org.schabi.newpipe.local.subscription.item.PickerIconItem
-import org.schabi.newpipe.local.subscription.item.PickerSubscriptionItem
-import org.schabi.newpipe.util.AndroidTvUtils
-import org.schabi.newpipe.util.ThemeHelper
+import org.schabi.newpipelegacy.R
+import org.schabi.newpipelegacy.database.feed.model.FeedGroupEntity
+import org.schabi.newpipelegacy.fragments.BackPressable
+import org.schabi.newpipelegacy.local.subscription.FeedGroupIcon
+import org.schabi.newpipelegacy.local.subscription.dialog.FeedGroupDialog.ScreenState.DeleteScreen
+import org.schabi.newpipelegacy.local.subscription.dialog.FeedGroupDialog.ScreenState.IconPickerScreen
+import org.schabi.newpipelegacy.local.subscription.dialog.FeedGroupDialog.ScreenState.InitialScreen
+import org.schabi.newpipelegacy.local.subscription.dialog.FeedGroupDialog.ScreenState.SubscriptionsPickerScreen
+import org.schabi.newpipelegacy.local.subscription.dialog.FeedGroupDialogViewModel.DialogEvent.ProcessingEvent
+import org.schabi.newpipelegacy.local.subscription.dialog.FeedGroupDialogViewModel.DialogEvent.SuccessEvent
+import org.schabi.newpipelegacy.local.subscription.item.EmptyPlaceholderItem
+import org.schabi.newpipelegacy.local.subscription.item.PickerIconItem
+import org.schabi.newpipelegacy.local.subscription.item.PickerSubscriptionItem
+import org.schabi.newpipelegacy.util.AndroidTvUtils
+import org.schabi.newpipelegacy.util.ThemeHelper
 
 class FeedGroupDialog : DialogFragment(), BackPressable {
     private lateinit var viewModel: FeedGroupDialogViewModel

app/src/main/java/org/schabi/newpipelegacy/local/subscription/dialog/FeedGroupDialogViewModel.kt

@@ -11,11 +11,11 @@ import io.reactivex.disposables.Disposable
 import io.reactivex.functions.BiFunction
 import io.reactivex.processors.BehaviorProcessor
 import io.reactivex.schedulers.Schedulers
-import org.schabi.newpipe.database.feed.model.FeedGroupEntity
-import org.schabi.newpipe.local.feed.FeedDatabaseManager
-import org.schabi.newpipe.local.subscription.FeedGroupIcon
-import org.schabi.newpipe.local.subscription.SubscriptionManager
-import org.schabi.newpipe.local.subscription.item.PickerSubscriptionItem
+import org.schabi.newpipelegacy.database.feed.model.FeedGroupEntity
+import org.schabi.newpipelegacy.local.feed.FeedDatabaseManager
+import org.schabi.newpipelegacy.local.subscription.FeedGroupIcon
+import org.schabi.newpipelegacy.local.subscription.SubscriptionManager
+import org.schabi.newpipelegacy.local.subscription.item.PickerSubscriptionItem
 
 class FeedGroupDialogViewModel(
     applicationContext: Context,

app/src/main/java/org/schabi/newpipelegacy/local/subscription/item/PickerSubscriptionItem.kt

@@ -6,11 +6,11 @@ import com.xwray.groupie.kotlinandroidextensions.GroupieViewHolder
 import com.xwray.groupie.kotlinandroidextensions.Item
 import kotlinx.android.synthetic.main.picker_subscription_item.*
 import kotlinx.android.synthetic.main.picker_subscription_item.view.*
-import org.schabi.newpipe.R
-import org.schabi.newpipe.database.subscription.SubscriptionEntity
-import org.schabi.newpipe.util.AnimationUtils
-import org.schabi.newpipe.util.AnimationUtils.animateView
-import org.schabi.newpipe.util.ImageDisplayConstants
+import org.schabi.newpipelegacy.R
+import org.schabi.newpipelegacy.database.subscription.SubscriptionEntity
+import org.schabi.newpipelegacy.util.AnimationUtils
+import org.schabi.newpipelegacy.util.AnimationUtils.animateView
+import org.schabi.newpipelegacy.util.ImageDisplayConstants
 
 data class PickerSubscriptionItem(
     val subscriptionEntity: SubscriptionEntity,

app/src/main/java/org/schabi/newpipelegacy/player/BasePlayer.java

@@ -58,22 +58,22 @@
 import org.schabi.newpipelegacy.DownloaderImpl;
 import org.schabi.newpipelegacy.R;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
-import org.schabi.newpipe.local.history.HistoryRecordManager;
-import org.schabi.newpipe.player.helper.AudioReactor;
-import org.schabi.newpipe.player.helper.LoadController;
-import org.schabi.newpipe.player.helper.MediaSessionManager;
-import org.schabi.newpipe.player.helper.PlayerDataSource;
-import org.schabi.newpipe.player.helper.PlayerHelper;
-import org.schabi.newpipe.player.playback.BasePlayerMediaSession;
-import org.schabi.newpipe.player.playback.CustomTrackSelector;
-import org.schabi.newpipe.player.playback.MediaSourceManager;
-import org.schabi.newpipe.player.playback.PlaybackListener;
-import org.schabi.newpipe.player.playqueue.PlayQueue;
-import org.schabi.newpipe.player.playqueue.PlayQueueAdapter;
-import org.schabi.newpipe.player.playqueue.PlayQueueItem;
-import org.schabi.newpipe.player.resolver.MediaSourceTag;
-import org.schabi.newpipe.util.ImageDisplayConstants;
-import org.schabi.newpipe.util.SerializedCache;
+import org.schabi.newpipelegacy.local.history.HistoryRecordManager;
+import org.schabi.newpipelegacy.player.helper.AudioReactor;
+import org.schabi.newpipelegacy.player.helper.LoadController;
+import org.schabi.newpipelegacy.player.helper.MediaSessionManager;
+import org.schabi.newpipelegacy.player.helper.PlayerDataSource;
+import org.schabi.newpipelegacy.player.helper.PlayerHelper;
+import org.schabi.newpipelegacy.player.playback.BasePlayerMediaSession;
+import org.schabi.newpipelegacy.player.playback.CustomTrackSelector;
+import org.schabi.newpipelegacy.player.playback.MediaSourceManager;
+import org.schabi.newpipelegacy.player.playback.PlaybackListener;
+import org.schabi.newpipelegacy.player.playqueue.PlayQueue;
+import org.schabi.newpipelegacy.player.playqueue.PlayQueueAdapter;
+import org.schabi.newpipelegacy.player.playqueue.PlayQueueItem;
+import org.schabi.newpipelegacy.player.resolver.MediaSourceTag;
+import org.schabi.newpipelegacy.util.ImageDisplayConstants;
+import org.schabi.newpipelegacy.util.SerializedCache;
 
 import java.io.IOException;
 

app/src/main/java/org/schabi/newpipelegacy/player/ServicePlayerActivity.java

@@ -45,8 +45,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import static org.schabi.newpipe.player.helper.PlayerHelper.formatSpeed;
-import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
+import static org.schabi.newpipelegacy.player.helper.PlayerHelper.formatSpeed;
+import static org.schabi.newpipelegacy.util.Localization.assureCorrectAppLanguage;
 
 public abstract class ServicePlayerActivity extends AppCompatActivity
         implements PlayerEventListener, SeekBar.OnSeekBarChangeListener,

app/src/main/java/org/schabi/newpipelegacy/report/ErrorActivity.java

@@ -33,13 +33,13 @@
 
 import org.acra.ReportField;
 import org.acra.data.CrashReportData;
-import org.schabi.newpipe.ActivityCommunicator;
-import org.schabi.newpipe.BuildConfig;
-import org.schabi.newpipe.MainActivity;
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.util.Localization;
-import org.schabi.newpipe.util.ShareUtils;
-import org.schabi.newpipe.util.ThemeHelper;
+import org.schabi.newpipelegacy.ActivityCommunicator;
+import org.schabi.newpipelegacy.BuildConfig;
+import org.schabi.newpipelegacy.MainActivity;
+import org.schabi.newpipelegacy.R;
+import org.schabi.newpipelegacy.util.Localization;
+import org.schabi.newpipelegacy.util.ShareUtils;
+import org.schabi.newpipelegacy.util.ThemeHelper;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

app/src/main/java/org/schabi/newpipe/settings/SelectPlaylistFragment.java → app/src/main/java/org/schabi/newpipelegacy/settings/SelectPlaylistFragment.java

@@ -1,4 +1,4 @@
-package org.schabi.newpipe.settings;
+package org.schabi.newpipelegacy.settings;
 
 import android.app.Activity;
 import android.content.DialogInterface;
@@ -18,17 +18,17 @@
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
 
-import org.schabi.newpipe.NewPipeDatabase;
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.database.AppDatabase;
-import org.schabi.newpipe.database.LocalItem;
-import org.schabi.newpipe.database.playlist.PlaylistLocalItem;
-import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;
-import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
-import org.schabi.newpipe.local.playlist.LocalPlaylistManager;
-import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
-import org.schabi.newpipe.report.ErrorActivity;
-import org.schabi.newpipe.report.UserAction;
+import org.schabi.newpipelegacy.NewPipeDatabase;
+import org.schabi.newpipelegacy.R;
+import org.schabi.newpipelegacy.database.AppDatabase;
+import org.schabi.newpipelegacy.database.LocalItem;
+import org.schabi.newpipelegacy.database.playlist.PlaylistLocalItem;
+import org.schabi.newpipelegacy.database.playlist.PlaylistMetadataEntry;
+import org.schabi.newpipelegacy.database.playlist.model.PlaylistRemoteEntity;
+import org.schabi.newpipelegacy.local.playlist.LocalPlaylistManager;
+import org.schabi.newpipelegacy.local.playlist.RemotePlaylistManager;
+import org.schabi.newpipelegacy.report.ErrorActivity;
+import org.schabi.newpipelegacy.report.UserAction;
 
 import java.util.List;
 import java.util.Vector;

app/src/main/java/org/schabi/newpipelegacy/settings/tabs/ChooseTabsFragment.java

@@ -30,13 +30,13 @@
 
 import org.schabi.newpipelegacy.R;
 import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.report.ErrorActivity;
-import org.schabi.newpipe.report.UserAction;
-import org.schabi.newpipe.settings.SelectChannelFragment;
-import org.schabi.newpipe.settings.SelectKioskFragment;
-import org.schabi.newpipe.settings.SelectPlaylistFragment;
-import org.schabi.newpipe.settings.tabs.AddTabDialog.ChooseTabListItem;
-import org.schabi.newpipe.util.ThemeHelper;
+import org.schabi.newpipelegacy.report.ErrorActivity;
+import org.schabi.newpipelegacy.report.UserAction;
+import org.schabi.newpipelegacy.settings.SelectChannelFragment;
+import org.schabi.newpipelegacy.settings.SelectKioskFragment;
+import org.schabi.newpipelegacy.settings.SelectPlaylistFragment;
+import org.schabi.newpipelegacy.settings.tabs.AddTabDialog.ChooseTabListItem;
+import org.schabi.newpipelegacy.util.ThemeHelper;
 
 import java.util.ArrayList;
 import java.util.Collections;

app/src/main/java/org/schabi/newpipelegacy/settings/tabs/Tab.java

@@ -11,26 +11,26 @@
 import com.grack.nanojson.JsonObject;
 import com.grack.nanojson.JsonSink;
 
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.database.LocalItem.LocalItemType;
+import org.schabi.newpipelegacy.R;
+import org.schabi.newpipelegacy.database.LocalItem.LocalItemType;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.fragments.BlankFragment;
-import org.schabi.newpipe.fragments.list.channel.ChannelFragment;
-import org.schabi.newpipe.fragments.list.kiosk.DefaultKioskFragment;
-import org.schabi.newpipe.fragments.list.kiosk.KioskFragment;
-import org.schabi.newpipe.fragments.list.playlist.PlaylistFragment;
-import org.schabi.newpipe.local.bookmark.BookmarkFragment;
-import org.schabi.newpipe.local.feed.FeedFragment;
-import org.schabi.newpipe.local.history.StatisticsPlaylistFragment;
-import org.schabi.newpipe.local.playlist.LocalPlaylistFragment;
-import org.schabi.newpipe.local.subscription.SubscriptionFragment;
-import org.schabi.newpipe.report.ErrorActivity;
-import org.schabi.newpipe.report.UserAction;
-import org.schabi.newpipe.util.KioskTranslator;
-import org.schabi.newpipe.util.ServiceHelper;
-import org.schabi.newpipe.util.ThemeHelper;
+import org.schabi.newpipelegacy.fragments.BlankFragment;
+import org.schabi.newpipelegacy.fragments.list.channel.ChannelFragment;
+import org.schabi.newpipelegacy.fragments.list.kiosk.DefaultKioskFragment;
+import org.schabi.newpipelegacy.fragments.list.kiosk.KioskFragment;
+import org.schabi.newpipelegacy.fragments.list.playlist.PlaylistFragment;
+import org.schabi.newpipelegacy.local.bookmark.BookmarkFragment;
+import org.schabi.newpipelegacy.local.feed.FeedFragment;
+import org.schabi.newpipelegacy.local.history.StatisticsPlaylistFragment;
+import org.schabi.newpipelegacy.local.playlist.LocalPlaylistFragment;
+import org.schabi.newpipelegacy.local.subscription.SubscriptionFragment;
+import org.schabi.newpipelegacy.report.ErrorActivity;
+import org.schabi.newpipelegacy.report.UserAction;
+import org.schabi.newpipelegacy.util.KioskTranslator;
+import org.schabi.newpipelegacy.util.ServiceHelper;
+import org.schabi.newpipelegacy.util.ThemeHelper;
 
 import java.util.Objects;
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri May 01 19:39:41 CEST 2020
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+#Fri May 01 19:39:41 CEST 2020
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip