Merge branch 'master_tubular'

.github/changelog.md

@@ -1,14 +1 @@
-New
-- "Shuffle and play" menu option for playlists
-- Option to show dislikes as a percentage
-
-Improved
-- Streamlined the release process with Github Actions (thanks @thekyber)
-
-Fixed
-- The database should now be exportable to vanilla NewPipe (this breaks the SponsorBlock whitelist functionality and will be fixed in a later version)
-- Changed some graphics to be specific to Tubular
-- Privacy-related changes to comply with FDroid rules
-- No longer crashing when attempting to send a crash report with a huge stack trace
-- Unskip didn't work on certain segments sometimes (thanks @mikooomich)
-- Some translation changes (thanks @onkq, @mikropsoft, @Mr-Bajs)
+- merged latest changes from NewPipe's dev branch

app/build.gradle

@@ -205,7 +205,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.MaintainTeam:LastPipeExtractor:4faa5669b67d62526c3af39e11bb9d29d284bcd0'
+ implementation 'com.github.MaintainTeam:LastPipeExtractor:09982b035210d8be2d04e712eb4fd0ac2495cbba'
  implementation 'com.github.TeamNewPipe:NoNonsense-FilePicker:5.0.0'
 
 /** Checkstyle **/
@@ -289,7 +289,7 @@ dependencies {
  implementation "com.jakewharton.rxbinding4:rxbinding:4.0.0"
 
  // Date and time formatting
- implementation "org.ocpsoft.prettytime:prettytime:5.0.7.Final"
+ implementation "org.ocpsoft.prettytime:prettytime:5.0.8.Final"
 
 /** Debugging **/
  // Memory leak detection

app/proguard-rules.pro

@@ -35,3 +35,10 @@
 
 ## For some reason NotificationModeConfigFragment wasn't kept (only referenced in a preference xml)
 -keep class org.schabi.newpipe.settings.notifications.** { *; }
+
+## TODO: figure out why we need these here to get a successful release build
+-dontwarn java.beans.BeanDescriptor
+-dontwarn java.beans.BeanInfo
+-dontwarn java.beans.IntrospectionException
+-dontwarn java.beans.Introspector
+-dontwarn java.beans.PropertyDescriptor

app/src/main/AndroidManifest.xml

@@ -367,6 +367,7 @@
  <data android:host="tilvids.com" />
  <data android:host="video.lqdn.fr" />
  <data android:host="video.ploud.fr" />
+ <data android:host="subscribeto.me" />
 
  <data android:pathPrefix="/videos/" /> <!-- it contains playlists -->
  <data android:pathPrefix="/w/" /> <!-- short video URLs -->

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

@@ -54,7 +54,7 @@ class ErrorUtil {
  */
  @JvmStatic
  fun showSnackbar(context: Context, errorInfo: ErrorInfo) {
- val rootView = if (context is Activity) context.findViewById<View>(R.id.content) else null
+ val rootView = (context as? Activity)?.findViewById<View>(android.R.id.content)
  showSnackbar(context, rootView, errorInfo)
  }
 
@@ -71,7 +71,7 @@ class ErrorUtil {
  fun showSnackbar(fragment: Fragment, errorInfo: ErrorInfo) {
  var rootView = fragment.view
  if (rootView == null && fragment.activity != null) {
- rootView = fragment.requireActivity().findViewById(R.id.content)
+ rootView = fragment.requireActivity().findViewById(android.R.id.content)
  }
  showSnackbar(fragment.requireContext(), rootView, errorInfo)
  }

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

@@ -245,10 +245,10 @@ private void updateTabLayoutPosition() {
  // change the background and icon color of the tab layout:
  // service-colored at the top, app-background-colored at the bottom
  tabLayout.setBackgroundColor(ThemeHelper.resolveColorFromAttr(requireContext(),
- bottom ? R.attr.colorSecondary : R.attr.colorPrimary));
+ bottom ? android.R.attr.windowBackground : R.attr.colorPrimary));
 
  @ColorInt final int iconColor = bottom
- ? ThemeHelper.resolveColorFromAttr(requireContext(), R.attr.colorAccent)
+ ? ThemeHelper.resolveColorFromAttr(requireContext(), android.R.attr.colorAccent)
  : Color.WHITE;
  tabLayout.setTabRippleColor(ColorStateList.valueOf(iconColor).withAlpha(32));
  tabLayout.setTabIconTint(ColorStateList.valueOf(iconColor));

app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java

@@ -22,6 +22,7 @@
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.ColorUtils;
+import androidx.core.view.MenuProvider;
 import androidx.preference.PreferenceManager;
 
 import com.google.android.material.snackbar.Snackbar;
@@ -99,6 +100,7 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo>
  private MenuItem menuRssButton;
  private MenuItem menuNotifyButton;
  private SubscriptionEntity channelSubscription;
+ private MenuProvider menuProvider;
 
  public static ChannelFragment getInstance(final int serviceId, final String url,
  final String name) {
@@ -121,7 +123,62 @@ private void setInitialData(final int sid, final String u, final String title) {
  @Override
  public void onCreate(final Bundle savedInstanceState) {
  super.onCreate(savedInstanceState);
- setHasOptionsMenu(true);
+ menuProvider = new MenuProvider() {
+ @Override
+ public void onCreateMenu(@NonNull final Menu menu,
+ @NonNull final MenuInflater inflater) {
+ inflater.inflate(R.menu.menu_channel, menu);
+
+ if (DEBUG) {
+ Log.d(TAG, "onCreateOptionsMenu() called with: "
+ + "menu = [" + menu + "], inflater = [" + inflater + "]");
+ }
+
+ }
+
+ @Override
+ public void onPrepareMenu(@NonNull final Menu menu) {
+ menuRssButton = menu.findItem(R.id.menu_item_rss);
+ menuNotifyButton = menu.findItem(R.id.menu_item_notify);
+ updateRssButton();
+ updateNotifyButton(channelSubscription);
+ }
+
+ @Override
+ public boolean onMenuItemSelected(@NonNull final MenuItem item) {
+ switch (item.getItemId()) {
+ case R.id.menu_item_notify:
+ final boolean value = !item.isChecked();
+ item.setEnabled(false);
+ setNotify(value);
+ break;
+ case R.id.action_settings:
+ NavigationHelper.openSettings(requireContext());
+ break;
+ case R.id.menu_item_rss:
+ if (currentInfo != null) {
+ ShareUtils.openUrlInApp(requireContext(), currentInfo.getFeedUrl());
+ }
+ break;
+ case R.id.menu_item_openInBrowser:
+ if (currentInfo != null) {
+ ShareUtils.openUrlInBrowser(requireContext(),
+ currentInfo.getOriginalUrl());
+ }
+ break;
+ case R.id.menu_item_share:
+ if (currentInfo != null) {
+ ShareUtils.shareText(requireContext(), name,
+ currentInfo.getOriginalUrl(), currentInfo.getAvatars());
+ }
+ break;
+ default:
+ return false;
+ }
+ return true;
+ }
+ };
+ activity.addMenuProvider(menuProvider);
  }
 
  @Override
@@ -183,67 +240,10 @@ public void onDestroy() {
  }
  disposables.clear();
  binding = null;
+ activity.removeMenuProvider(menuProvider);
+ menuProvider = null;
  }
 
-
- /*//////////////////////////////////////////////////////////////////////////
- // Menu
- //////////////////////////////////////////////////////////////////////////*/
-
- @Override
- public void onCreateOptionsMenu(@NonNull final Menu menu,
- @NonNull final MenuInflater inflater) {
- super.onCreateOptionsMenu(menu, inflater);
- inflater.inflate(R.menu.menu_channel, menu);
-
- if (DEBUG) {
- Log.d(TAG, "onCreateOptionsMenu() called with: "
- + "menu = [" + menu + "], inflater = [" + inflater + "]");
- }
- }
-
- @Override
- public void onPrepareOptionsMenu(@NonNull final Menu menu) {
- super.onPrepareOptionsMenu(menu);
- menuRssButton = menu.findItem(R.id.menu_item_rss);
- menuNotifyButton = menu.findItem(R.id.menu_item_notify);
- updateNotifyButton(channelSubscription);
- }
-
- @Override
- public boolean onOptionsItemSelected(@NonNull final MenuItem item) {
- switch (item.getItemId()) {
- case R.id.menu_item_notify:
- final boolean value = !item.isChecked();
- item.setEnabled(false);
- setNotify(value);
- break;
- case R.id.action_settings:
- NavigationHelper.openSettings(requireContext());
- break;
- case R.id.menu_item_rss:
- if (currentInfo != null) {
- ShareUtils.openUrlInApp(requireContext(), currentInfo.getFeedUrl());
- }
- break;
- case R.id.menu_item_openInBrowser:
- if (currentInfo != null) {
- ShareUtils.openUrlInBrowser(requireContext(), currentInfo.getOriginalUrl());
- }
- break;
- case R.id.menu_item_share:
- if (currentInfo != null) {
- ShareUtils.shareText(requireContext(), name, currentInfo.getOriginalUrl(),
- currentInfo.getAvatars());
- }
- break;
- default:
- return super.onOptionsItemSelected(item);
- }
- return true;
- }
-
-
  /*//////////////////////////////////////////////////////////////////////////
  // Channel Subscription
  //////////////////////////////////////////////////////////////////////////*/
@@ -408,6 +408,13 @@ private void updateSubscribeButton(final boolean isSubscribed) {
  animate(binding.channelSubscribeButton, true, 100, AnimationType.LIGHT_SCALE_AND_ALPHA);
  }
 
+ private void updateRssButton() {
+ if (menuRssButton == null || currentInfo == null) {
+ return;
+ }
+ menuRssButton.setVisible(!TextUtils.isEmpty(currentInfo.getFeedUrl()));
+ }
+
  private void updateNotifyButton(@Nullable final SubscriptionEntity subscription) {
  if (menuNotifyButton == null) {
  return;
@@ -610,9 +617,7 @@ public void handleResult(@NonNull final ChannelInfo result) {
  binding.subChannelAvatarView.setVisibility(View.VISIBLE);
  }
 
- if (menuRssButton != null) {
- menuRssButton.setVisible(!TextUtils.isEmpty(result.getFeedUrl()));
- }
+ updateRssButton();
 
  channelContentNotSupported = false;
  for (final Throwable throwable : result.getErrors()) {

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

@@ -356,6 +356,7 @@ public void handleResult(@NonNull final PlaylistInfo result) {
  });
  ellipsizer.setContent(description);
  headerBinding.playlistDescriptionReadMore.setOnClickListener(v -> ellipsizer.toggle());
+ headerBinding.playlistDescription.setOnClickListener(v -> ellipsizer.toggle());
  } else {
  headerBinding.playlistDescription.setVisibility(View.GONE);
  headerBinding.playlistDescriptionReadMore.setVisibility(View.GONE);

app/src/main/java/org/schabi/newpipe/info_list/holder/CommentInfoItemHolder.java

@@ -1,9 +1,13 @@
 package org.schabi.newpipe.info_list.holder;
 
 import static org.schabi.newpipe.util.ServiceHelper.getServiceById;
+import static org.schabi.newpipe.util.text.TouchUtils.getOffsetForHorizontalLine;
 
+import android.text.Spanned;
 import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
 import android.text.style.URLSpan;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -25,7 +29,6 @@
 import org.schabi.newpipe.util.external_communication.ShareUtils;
 import org.schabi.newpipe.util.image.ImageStrategy;
 import org.schabi.newpipe.util.image.PicassoHelper;
-import org.schabi.newpipe.util.text.CommentTextOnTouchListener;
 import org.schabi.newpipe.util.text.TextEllipsizer;
 
 public class CommentInfoItemHolder extends InfoItemHolder {
@@ -128,7 +131,26 @@ public void updateFromItem(final InfoItem infoItem,
  textEllipsizer.ellipsize();
 
  //noinspection ClickableViewAccessibility
- itemContentView.setOnTouchListener(CommentTextOnTouchListener.INSTANCE);
+ itemContentView.setOnTouchListener((v, event) -> {
+ final CharSequence text = itemContentView.getText();
+ if (text instanceof Spanned buffer) {
+ final int action = event.getAction();
+
+ if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_DOWN) {
+ final int offset = getOffsetForHorizontalLine(itemContentView, event);
+ final var links = buffer.getSpans(offset, offset, ClickableSpan.class);
+
+ if (links.length != 0) {
+ if (action == MotionEvent.ACTION_UP) {
+ links[0].onClick(itemContentView);
+ }
+ // we handle events that intersect links, so return true
+ return true;
+ }
+ }
+ }
+ return false;
+ });
 
  itemView.setOnClickListener(view -> {
  textEllipsizer.toggle();

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

@@ -549,7 +549,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
 
  var typeface = Typeface.DEFAULT
  var backgroundSupplier = { ctx: Context ->
- resolveDrawable(ctx, R.attr.selectableItemBackground)
+ resolveDrawable(ctx, android.R.attr.selectableItemBackground)
  }
  if (doCheck) {
  // If the uploadDate is null or true we should highlight the item
@@ -562,7 +562,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
  LayerDrawable(
  arrayOf(
  resolveDrawable(ctx, R.attr.dashed_border),
- resolveDrawable(ctx, R.attr.selectableItemBackground)
+ resolveDrawable(ctx, android.R.attr.selectableItemBackground)
  )
  )
  }

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

@@ -573,16 +573,16 @@ private void onStateChanged(final int state) {
  private void onPlayModeChanged(final int repeatMode, final boolean shuffled) {
  switch (repeatMode) {
  case com.google.android.exoplayer2.Player.REPEAT_MODE_OFF:
- queueControlBinding.controlRepeat
- .setImageResource(R.drawable.exo_controls_repeat_off);
+ queueControlBinding.controlRepeat.setImageResource(
+ com.google.android.exoplayer2.ui.R.drawable.exo_controls_repeat_off);
  break;
  case com.google.android.exoplayer2.Player.REPEAT_MODE_ONE:
- queueControlBinding.controlRepeat
- .setImageResource(R.drawable.exo_controls_repeat_one);
+ queueControlBinding.controlRepeat.setImageResource(
+ com.google.android.exoplayer2.ui.R.drawable.exo_controls_repeat_one);
  break;
  case com.google.android.exoplayer2.Player.REPEAT_MODE_ALL:
- queueControlBinding.controlRepeat
- .setImageResource(R.drawable.exo_controls_repeat_all);
+ queueControlBinding.controlRepeat.setImageResource(
+ com.google.android.exoplayer2.ui.R.drawable.exo_controls_repeat_all);
  break;
  }