Add Invidious support

app/build.gradle

@@ -190,7 +190,7 @@ dependencies {
     // name and the commit hash with the commit hash of the (pushed) commit you want to test
     // This works thanks to JitPack: https://jitpack.io/
     implementation 'com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751'
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:ac1c22d81c65b7b0c5427f4e1989f5256d617f32'
+    implementation 'com.github.litetex:NewPipeExtractor:invidious-SNAPSHOT'
 
 /** Checkstyle **/
     checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"

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

@@ -21,8 +21,8 @@
 import org.schabi.newpipe.settings.NewPipeSettings;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.PicassoHelper;
-import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.util.StateSaver;
+import org.schabi.newpipe.util.services.ServiceHelper;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;

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

@@ -63,10 +63,11 @@
 import org.schabi.newpipe.databinding.InstanceSpinnerLayoutBinding;
 import org.schabi.newpipe.databinding.ToolbarLayoutBinding;
 import org.schabi.newpipe.error.ErrorUtil;
+import org.schabi.newpipe.extractor.InstanceBasedStreamingService;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.services.peertube.PeertubeInstance;
+import org.schabi.newpipe.extractor.instance.Instance;
 import org.schabi.newpipe.fragments.BackPressable;
 import org.schabi.newpipe.fragments.MainFragment;
 import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
@@ -81,18 +82,20 @@
 import org.schabi.newpipe.util.KioskTranslator;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
-import org.schabi.newpipe.util.PeertubeHelper;
 import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.SerializedCache;
-import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.util.StateSaver;
 import org.schabi.newpipe.util.TLSSocketFactoryCompat;
 import org.schabi.newpipe.util.ThemeHelper;
+import org.schabi.newpipe.util.services.InstanceManager;
+import org.schabi.newpipe.util.services.InstanceManagerHelper;
+import org.schabi.newpipe.util.services.ServiceHelper;
 import org.schabi.newpipe.views.FocusOverlayView;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.OptionalInt;
 
 public class MainActivity extends AppCompatActivity {
     private static final String TAG = "MainActivity";
@@ -388,25 +391,24 @@ private void showServices() {
                     .add(R.id.menu_services_group, s.getServiceId(), ORDER, title)
                     .setIcon(ServiceHelper.getIcon(s.getServiceId()));
 
-            // peertube specifics
-            if (s.getServiceId() == 3) {
-                enhancePeertubeMenu(s, menuItem);
-            }
+            // instance specifics
+            InstanceManagerHelper.getManagerForServiceId(s.getServiceId())
+                    .ifPresent(im -> enhanceServiceMenu(menuItem, im));
         }
         drawerLayoutBinding.navigation.getMenu()
                 .getItem(ServiceHelper.getSelectedServiceId(this))
                 .setChecked(true);
     }
 
-    private void enhancePeertubeMenu(final StreamingService s, final MenuItem menuItem) {
-        final PeertubeInstance currentInstance = PeertubeHelper.getCurrentInstance();
-        menuItem.setTitle(currentInstance.getName() + (ServiceHelper.isBeta(s) ? " (beta)" : ""));
-        final Spinner spinner = InstanceSpinnerLayoutBinding.inflate(LayoutInflater.from(this))
-                .getRoot();
-        final List<PeertubeInstance> instances = PeertubeHelper.getInstanceList(this);
+    private <I extends Instance> void enhanceServiceMenu(final MenuItem menuItem,
+                                                         final InstanceManager<I> manager) {
+        final I currentInstance = manager.getCurrentInstance();
+        menuItem.setTitle(currentInstance.getName());
+
+        final List<I> allInstances = manager.getInstanceList(getApplicationContext());
         final List<String> items = new ArrayList<>();
         int defaultSelect = 0;
-        for (final PeertubeInstance instance : instances) {
+        for (final I instance : allInstances) {
             items.add(instance.getName());
             if (instance.getUrl().equals(currentInstance.getUrl())) {
                 defaultSelect = items.size() - 1;
@@ -415,29 +417,34 @@ private void enhancePeertubeMenu(final StreamingService s, final MenuItem menuIt
         final ArrayAdapter<String> adapter = new ArrayAdapter<>(this,
                 R.layout.instance_spinner_item, items);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+
+        final Spinner spinner =
+                InstanceSpinnerLayoutBinding.inflate(LayoutInflater.from(this)).getRoot();
         spinner.setAdapter(adapter);
         spinner.setSelection(defaultSelect, false);
         spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(final AdapterView<?> parent, final View view,
                                        final int position, final long id) {
-                final PeertubeInstance newInstance = instances.get(position);
-                if (newInstance.getUrl().equals(PeertubeHelper.getCurrentInstance().getUrl())) {
+                final I newInstance = allInstances.get(position);
+                if (newInstance.getUrl().equals(manager.getCurrentInstance().getUrl())) {
                     return;
                 }
-                PeertubeHelper.selectInstance(newInstance, getApplicationContext());
+
+                manager.saveCurrentInstance(newInstance, getApplicationContext());
+
                 changeService(menuItem);
                 mainBinding.getRoot().closeDrawers();
                 new Handler(Looper.getMainLooper()).postDelayed(() -> {
-                    getSupportFragmentManager().popBackStack(null,
-                            FragmentManager.POP_BACK_STACK_INCLUSIVE);
+                    getSupportFragmentManager()
+                            .popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
                     ActivityCompat.recreate(MainActivity.this);
                 }, 300);
             }
 
             @Override
             public void onNothingSelected(final AdapterView<?> parent) {
-
+                // Do nothing
             }
         });
         menuItem.setActionView(spinner);
@@ -466,11 +473,27 @@ protected void onResume() {
         mainBinding.getRoot().closeDrawer(GravityCompat.START, false);
         try {
             final int selectedServiceId = ServiceHelper.getSelectedServiceId(this);
-            final String selectedServiceName = NewPipe.getService(selectedServiceId)
-                    .getServiceInfo().getName();
+            final StreamingService service = NewPipe.getService(selectedServiceId);
+
+            String selectedServiceName = service.getServiceInfo().getName();
+            int icon = ServiceHelper.getIcon(selectedServiceId);
+
+            if (service instanceof InstanceBasedStreamingService) {
+                final Instance instance =
+                        ((InstanceBasedStreamingService<?>) service).getInstance();
+                selectedServiceName =
+                        (instance.getServiceName() != null
+                                ? instance.getServiceName() + " / "
+                                : "") + instance.getName();
+
+                final OptionalInt overrideIcon = ServiceHelper.getOverrideIconForInstance(instance);
+                if (overrideIcon.isPresent()) {
+                    icon = overrideIcon.getAsInt();
+                }
+            }
+
             drawerHeaderBinding.drawerHeaderServiceView.setText(selectedServiceName);
-            drawerHeaderBinding.drawerHeaderServiceIcon.setImageResource(ServiceHelper
-                    .getIcon(selectedServiceId));
+            drawerHeaderBinding.drawerHeaderServiceIcon.setImageResource(icon);
 
             drawerHeaderBinding.drawerHeaderServiceView.post(() -> drawerHeaderBinding
                     .drawerHeaderServiceView.setSelected(true));

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

@@ -12,7 +12,7 @@ import org.schabi.newpipe.extractor.exceptions.AccountTerminatedException
 import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException
 import org.schabi.newpipe.extractor.exceptions.ContentNotSupportedException
 import org.schabi.newpipe.extractor.exceptions.ExtractionException
-import org.schabi.newpipe.extractor.services.youtube.extractors.YoutubeStreamExtractor.DeobfuscateException
+import org.schabi.newpipe.extractor.services.youtube.youtube.extractors.YoutubeStreamExtractor.DeobfuscateException
 import org.schabi.newpipe.ktx.isNetworkRelated
 import java.io.PrintWriter
 import java.io.StringWriter

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

@@ -30,7 +30,7 @@ import org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty
 import org.schabi.newpipe.ktx.animate
 import org.schabi.newpipe.ktx.isInterruptedCaused
 import org.schabi.newpipe.ktx.isNetworkRelated
-import org.schabi.newpipe.util.ServiceHelper
+import org.schabi.newpipe.util.services.ServiceHelper
 import java.util.concurrent.TimeUnit
 
 class ErrorPanelHelper(

app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java

@@ -28,7 +28,7 @@
 import org.schabi.newpipe.settings.tabs.Tab;
 import org.schabi.newpipe.settings.tabs.TabsManager;
 import org.schabi.newpipe.util.NavigationHelper;
-import org.schabi.newpipe.util.ServiceHelper;
+import org.schabi.newpipe.util.services.ServiceHelper;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/DefaultKioskFragment.java

@@ -8,7 +8,7 @@
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.kiosk.KioskList;
 import org.schabi.newpipe.util.KioskTranslator;
-import org.schabi.newpipe.util.ServiceHelper;
+import org.schabi.newpipe.util.services.ServiceHelper;
 
 public class DefaultKioskFragment extends KioskFragment {
 

app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java

@@ -37,7 +37,7 @@
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.ServiceList;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
-import org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper;
+import org.schabi.newpipe.extractor.services.youtube.shared.YoutubePlaylistHelper;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
 import org.schabi.newpipe.info_list.dialog.InfoItemDialog;
@@ -286,8 +286,8 @@ public void handleResult(@NonNull final PlaylistInfo result) {
 
         final String avatarUrl = result.getUploaderAvatarUrl();
         if (result.getServiceId() == ServiceList.YouTube.getServiceId()
-                && (YoutubeParsingHelper.isYoutubeMixId(result.getId())
-                || YoutubeParsingHelper.isYoutubeMusicMixId(result.getId()))) {
+                && (YoutubePlaylistHelper.isYoutubeMixId(result.getId())
+                || YoutubePlaylistHelper.isYoutubeMusicMixId(result.getId()))) {
             // this is an auto-generated playlist (e.g. Youtube mix), so a radio is shown
             final ShapeAppearanceModel model = ShapeAppearanceModel.builder()
                     .setAllCorners(CornerFamily.ROUNDED, 0f)

app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java

@@ -53,7 +53,7 @@
 import org.schabi.newpipe.extractor.search.SearchExtractor;
 import org.schabi.newpipe.extractor.search.SearchInfo;
 import org.schabi.newpipe.extractor.services.peertube.linkHandler.PeertubeSearchQueryHandlerFactory;
-import org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeSearchQueryHandlerFactory;
+import org.schabi.newpipe.extractor.services.youtube.youtube.linkHandler.YoutubeSearchQueryHandlerFactory;
 import org.schabi.newpipe.fragments.BackPressable;
 import org.schabi.newpipe.fragments.list.BaseListFragment;
 import org.schabi.newpipe.ktx.AnimationType;
@@ -65,7 +65,7 @@
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.KeyboardUtil;
 import org.schabi.newpipe.util.NavigationHelper;
-import org.schabi.newpipe.util.ServiceHelper;
+import org.schabi.newpipe.util.services.ServiceHelper;
 
 import java.util.ArrayList;
 import java.util.Arrays;

app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionsImportFragment.java

@@ -33,7 +33,7 @@
 import org.schabi.newpipe.streams.io.NoFileManagerSafeGuard;
 import org.schabi.newpipe.streams.io.StoredFileHelper;
 import org.schabi.newpipe.util.Constants;
-import org.schabi.newpipe.util.ServiceHelper;
+import org.schabi.newpipe.util.services.ServiceHelper;
 
 import java.util.Collections;
 import java.util.List;

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

@@ -14,8 +14,8 @@ import org.schabi.newpipe.databinding.FeedImportExportGroupBinding
 import org.schabi.newpipe.extractor.NewPipe
 import org.schabi.newpipe.extractor.exceptions.ExtractionException
 import org.schabi.newpipe.ktx.animateRotation
-import org.schabi.newpipe.util.ServiceHelper
 import org.schabi.newpipe.util.ThemeHelper
+import org.schabi.newpipe.util.services.ServiceHelper
 import org.schabi.newpipe.views.CollapsibleView
 
 class FeedImportExportItem(

app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java

@@ -40,7 +40,7 @@
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PermissionHelper;
-import org.schabi.newpipe.util.ServiceHelper;
+import org.schabi.newpipe.util.services.ServiceHelper;
 import org.schabi.newpipe.util.ThemeHelper;
 
 public final class PlayQueueActivity extends AppCompatActivity

app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java

@@ -23,7 +23,7 @@
 import org.schabi.newpipe.player.playqueue.events.PlayQueueEvent;
 import org.schabi.newpipe.player.playqueue.events.RemoveEvent;
 import org.schabi.newpipe.player.playqueue.events.ReorderEvent;
-import org.schabi.newpipe.util.ServiceHelper;
+import org.schabi.newpipe.util.services.ServiceHelper;
 
 import java.util.Collection;
 import java.util.Collections;

app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java

@@ -4,7 +4,6 @@
 import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
@@ -20,7 +19,6 @@
 import androidx.preference.Preference;
 import androidx.preference.PreferenceManager;
 
-import org.schabi.newpipe.DownloaderImpl;
 import org.schabi.newpipe.NewPipeDatabase;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.error.ErrorUtil;
@@ -49,7 +47,6 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
     private ContentSettingsManager manager;
 
     private String importExportDataPathKey;
-    private String youtubeRestrictedModeEnabledKey;
 
     private Localization initialSelectedLocalization;
     private ContentCountry initialSelectedContentCountry;
@@ -67,7 +64,6 @@ public void onCreatePreferences(final Bundle savedInstanceState, final String ro
         manager.deleteSettingsFile();
 
         importExportDataPathKey = getString(R.string.import_export_data_path);
-        youtubeRestrictedModeEnabledKey = getString(R.string.youtube_restricted_mode_enabled);
 
         addPreferencesFromResourceRegistry();
 
@@ -119,20 +115,6 @@ ZIP_MIME_TYPE, getImportExportDataUri()),
                 });
     }
 
-    @Override
-    public boolean onPreferenceTreeClick(final Preference preference) {
-        if (preference.getKey().equals(youtubeRestrictedModeEnabledKey)) {
-            final Context context = getContext();
-            if (context != null) {
-                DownloaderImpl.getInstance().updateYoutubeRestrictedModeCookies(context);
-            } else {
-                Log.w(TAG, "onPreferenceTreeClick: null context");
-            }
-        }
-
-        return super.onPreferenceTreeClick(preference);
-    }
-
     @Override
     public void onDestroy() {
         super.onDestroy();