selectTextTrack(
}
}
return selectedGroup == null ? null
- : Pair.create(new TrackSelection.Definition(selectedGroup, selectedTrackIndex),
+ : Pair.create(new ExoTrackSelection.Definition(selectedGroup, selectedTrackIndex),
Assertions.checkNotNull(selectedTrackScore));
}
}
diff --git a/app/src/main/java/org/schabi/newpipe/player/playererror/PlayerErrorHandler.java b/app/src/main/java/org/schabi/newpipe/player/playererror/PlayerErrorHandler.java
new file mode 100644
index 00000000000..626200ae1b0
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/player/playererror/PlayerErrorHandler.java
@@ -0,0 +1,89 @@
+package org.schabi.newpipe.player.playererror;
+
+import android.content.Context;
+import android.util.Log;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.preference.PreferenceManager;
+
+import com.google.android.exoplayer2.ExoPlaybackException;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.error.EnsureExceptionSerializable;
+import org.schabi.newpipe.error.ErrorActivity;
+import org.schabi.newpipe.error.ErrorInfo;
+import org.schabi.newpipe.error.UserAction;
+import org.schabi.newpipe.extractor.Info;
+
+/**
+ * Handles (exoplayer)errors that occur in the player.
+ */
+public class PlayerErrorHandler {
+ // This has to be <= 23 chars on devices running Android 7 or lower (API <= 25)
+ // or it fails with an IllegalArgumentException
+ // https://stackoverflow.com/a/54744028
+ private static final String TAG = "PlayerErrorHandler";
+
+ @Nullable
+ private Toast errorToast;
+
+ @NonNull
+ private final Context context;
+
+ public PlayerErrorHandler(@NonNull final Context context) {
+ this.context = context;
+ }
+
+ public void showPlayerError(
+ @NonNull final ExoPlaybackException exception,
+ @NonNull final Info info,
+ @StringRes final int textResId
+ ) {
+ // Hide existing toast message
+ if (errorToast != null) {
+ Log.d(TAG, "Trying to cancel previous player error error toast");
+ errorToast.cancel();
+ errorToast = null;
+ }
+
+ if (shouldReportError()) {
+ try {
+ reportError(exception, info);
+ // When a report pops up we need no toast
+ return;
+ } catch (final Exception ex) {
+ Log.w(TAG, "Unable to report error:", ex);
+ // This will show the toast as fallback
+ }
+ }
+
+ Log.d(TAG, "Showing player error toast");
+ errorToast = Toast.makeText(context, textResId, Toast.LENGTH_SHORT);
+ errorToast.show();
+ }
+
+ private void reportError(@NonNull final ExoPlaybackException exception,
+ @NonNull final Info info) {
+ ErrorActivity.reportError(
+ context,
+ new ErrorInfo(
+ EnsureExceptionSerializable.ensureSerializable(exception),
+ UserAction.PLAY_STREAM,
+ "Player error[type=" + exception.type + "] occurred while playing: "
+ + info.getUrl(),
+ info
+ )
+ );
+ }
+
+ private boolean shouldReportError() {
+ return PreferenceManager
+ .getDefaultSharedPreferences(context)
+ .getBoolean(
+ context.getString(R.string.report_player_errors_key),
+ false);
+ }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java
index 014c1333901..f2259b1202c 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java
@@ -436,14 +436,16 @@ public synchronized void unsetRecovery(final int index) {
* top, so shuffling a size-2 list does nothing)
*/
public synchronized void shuffle() {
- // Can't shuffle an list that's empty or only has one element
- if (size() <= 2) {
- return;
- }
// Create a backup if it doesn't already exist
+ // Note: The backup-list has to be created at all cost (even when size <= 2).
+ // Otherwise it's not possible to enter shuffle-mode!
if (backup == null) {
backup = new ArrayList<>(streams);
}
+ // Can't shuffle a list that's empty or only has one element
+ if (size() <= 2) {
+ return;
+ }
final int originalIndex = getIndex();
final PlayQueueItem currentItem = getItem();
diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemTouchCallback.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemTouchCallback.java
index 5fee436596e..b283e105ec6 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemTouchCallback.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemTouchCallback.java
@@ -51,6 +51,6 @@ public boolean isItemViewSwipeEnabled() {
@Override
public void onSwiped(final RecyclerView.ViewHolder viewHolder, final int swipeDir) {
- onSwiped(viewHolder.getAdapterPosition());
+ onSwiped(viewHolder.getBindingAdapterPosition());
}
}
diff --git a/app/src/main/java/org/schabi/newpipe/player/resolver/PlaybackResolver.java b/app/src/main/java/org/schabi/newpipe/player/resolver/PlaybackResolver.java
index 81e629c2f30..cfe9dbb62b2 100644
--- a/app/src/main/java/org/schabi/newpipe/player/resolver/PlaybackResolver.java
+++ b/app/src/main/java/org/schabi/newpipe/player/resolver/PlaybackResolver.java
@@ -9,6 +9,7 @@
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.MediaSourceFactory;
import com.google.android.exoplayer2.util.Util;
import org.schabi.newpipe.extractor.stream.StreamInfo;
@@ -41,20 +42,28 @@ default MediaSource buildLiveMediaSource(@NonNull final PlayerDataSource dataSou
@NonNull final String sourceUrl,
@C.ContentType final int type,
@NonNull final MediaSourceTag metadata) {
- final Uri uri = Uri.parse(sourceUrl);
+ final MediaSourceFactory factory;
switch (type) {
case C.TYPE_SS:
- return dataSource.getLiveSsMediaSourceFactory().setTag(metadata)
- .createMediaSource(MediaItem.fromUri(uri));
+ factory = dataSource.getLiveSsMediaSourceFactory();
+ break;
case C.TYPE_DASH:
- return dataSource.getLiveDashMediaSourceFactory().setTag(metadata)
- .createMediaSource(MediaItem.fromUri(uri));
+ factory = dataSource.getLiveDashMediaSourceFactory();
+ break;
case C.TYPE_HLS:
- return dataSource.getLiveHlsMediaSourceFactory().setTag(metadata)
- .createMediaSource(MediaItem.fromUri(uri));
+ factory = dataSource.getLiveHlsMediaSourceFactory();
+ break;
default:
throw new IllegalStateException("Unsupported type: " + type);
}
+
+ return factory.createMediaSource(
+ new MediaItem.Builder()
+ .setTag(metadata)
+ .setUri(Uri.parse(sourceUrl))
+ .setLiveTargetOffsetMs(PlayerDataSource.LIVE_STREAM_EDGE_GAP_MILLIS)
+ .build()
+ );
}
@NonNull
@@ -67,21 +76,30 @@ default MediaSource buildMediaSource(@NonNull final PlayerDataSource dataSource,
@C.ContentType final int type = TextUtils.isEmpty(overrideExtension)
? Util.inferContentType(uri) : Util.inferContentType("." + overrideExtension);
+ final MediaSourceFactory factory;
switch (type) {
case C.TYPE_SS:
- return dataSource.getLiveSsMediaSourceFactory().setTag(metadata)
- .createMediaSource(MediaItem.fromUri(uri));
+ factory = dataSource.getLiveSsMediaSourceFactory();
+ break;
case C.TYPE_DASH:
- return dataSource.getDashMediaSourceFactory().setTag(metadata)
- .createMediaSource(MediaItem.fromUri(uri));
+ factory = dataSource.getDashMediaSourceFactory();
+ break;
case C.TYPE_HLS:
- return dataSource.getHlsMediaSourceFactory().setTag(metadata)
- .createMediaSource(MediaItem.fromUri(uri));
+ factory = dataSource.getHlsMediaSourceFactory();
+ break;
case C.TYPE_OTHER:
- return dataSource.getExtractorMediaSourceFactory(cacheKey).setTag(metadata)
- .createMediaSource(MediaItem.fromUri(uri));
+ factory = dataSource.getExtractorMediaSourceFactory();
+ break;
default:
throw new IllegalStateException("Unsupported type: " + type);
}
+
+ return factory.createMediaSource(
+ new MediaItem.Builder()
+ .setTag(metadata)
+ .setUri(uri)
+ .setCustomCacheKey(cacheKey)
+ .build()
+ );
}
}
diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
index 6bc63a56aa9..3ac2756952e 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
@@ -1,6 +1,7 @@
package org.schabi.newpipe.settings
import android.content.SharedPreferences
+import android.util.Log
import org.schabi.newpipe.streams.io.SharpOutputStream
import org.schabi.newpipe.streams.io.StoredFileHelper
import org.schabi.newpipe.util.ZipHelper
@@ -13,6 +14,9 @@ import java.io.ObjectOutputStream
import java.util.zip.ZipOutputStream
class ContentSettingsManager(private val fileLocator: NewPipeFileLocator) {
+ companion object {
+ const val TAG = "ContentSetManager"
+ }
/**
* Exports given [SharedPreferences] to the file in given outputPath.
@@ -31,7 +35,7 @@ class ContentSettingsManager(private val fileLocator: NewPipeFileLocator) {
output.flush()
}
} catch (e: IOException) {
- e.printStackTrace()
+ Log.e(TAG, "Unable to exportDatabase", e)
}
ZipHelper.addFileToZip(outZip, fileLocator.settings.path, "newpipe.settings")
@@ -101,9 +105,9 @@ class ContentSettingsManager(private val fileLocator: NewPipeFileLocator) {
preferenceEditor.commit()
}
} catch (e: IOException) {
- e.printStackTrace()
+ Log.e(TAG, "Unable to loadSharedPreferences", e)
} catch (e: ClassNotFoundException) {
- e.printStackTrace()
+ Log.e(TAG, "Unable to loadSharedPreferences", e)
}
}
}
diff --git a/app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java
index 2f65af4d6b0..12599b828b4 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java
@@ -16,8 +16,9 @@ public class MainSettingsFragment extends BasePreferenceFragment {
public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
addPreferencesFromResource(R.xml.main_settings);
- if (!CheckForNewAppVersion.isGithubApk(App.getApp())) {
- final Preference update = findPreference(getString(R.string.update_pref_screen_key));
+ if (!CheckForNewAppVersion.isReleaseApk(App.getApp())) {
+ final Preference update
+ = findPreference(getString(R.string.update_pref_screen_key));
getPreferenceScreen().removePreference(update);
defaultPreferences.edit().putBoolean(getString(R.string.update_app_key), false).apply();
diff --git a/app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java b/app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java
index 5f388efb75d..dfc053a6257 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java
@@ -303,8 +303,8 @@ public boolean onMove(@NonNull final RecyclerView recyclerView,
return false;
}
- final int sourceIndex = source.getAdapterPosition();
- final int targetIndex = target.getAdapterPosition();
+ final int sourceIndex = source.getBindingAdapterPosition();
+ final int targetIndex = target.getBindingAdapterPosition();
instanceListAdapter.swapItems(sourceIndex, targetIndex);
return true;
}
@@ -322,7 +322,7 @@ public boolean isItemViewSwipeEnabled() {
@Override
public void onSwiped(@NonNull final RecyclerView.ViewHolder viewHolder,
final int swipeDir) {
- final int position = viewHolder.getAdapterPosition();
+ final int position = viewHolder.getBindingAdapterPosition();
// do not allow swiping the selected instance
if (instanceList.get(position).getUrl().equals(selectedInstance.getUrl())) {
instanceListAdapter.notifyItemChanged(position);
diff --git a/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java
index d2f56b4874b..bc183d08a6a 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java
@@ -1,34 +1,48 @@
package org.schabi.newpipe.settings;
+import static org.schabi.newpipe.CheckForNewAppVersion.startNewVersionCheckService;
+
import android.os.Bundle;
+import android.widget.Toast;
import androidx.preference.Preference;
import org.schabi.newpipe.R;
-import static org.schabi.newpipe.CheckForNewAppVersion.startNewVersionCheckService;
-
public class UpdateSettingsFragment extends BasePreferenceFragment {
private final Preference.OnPreferenceChangeListener updatePreferenceChange
= (preference, checkForUpdates) -> {
defaultPreferences.edit()
.putBoolean(getString(R.string.update_app_key), (boolean) checkForUpdates).apply();
- if ((boolean) checkForUpdates) {
- // Search for updates immediately when update checks are enabled.
- // Reset the expire time. This is necessary to check for an update immediately.
- defaultPreferences.edit()
- .putLong(getString(R.string.update_expiry_key), 0).apply();
- startNewVersionCheckService();
- }
+ if ((boolean) checkForUpdates) {
+ checkNewVersionNow();
+ }
+ return true;
+ };
+
+ private final Preference.OnPreferenceClickListener manualUpdateClick
+ = preference -> {
+ Toast.makeText(getContext(), R.string.checking_updates_toast, Toast.LENGTH_SHORT).show();
+ checkNewVersionNow();
return true;
};
+ private void checkNewVersionNow() {
+ // Search for updates immediately when update checks are enabled.
+ // Reset the expire time. This is necessary to check for an update immediately.
+ defaultPreferences.edit()
+ .putLong(getString(R.string.update_expiry_key), 0).apply();
+ startNewVersionCheckService();
+ }
+
@Override
public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
addPreferencesFromResource(R.xml.update_settings);
- final String updateToggleKey = getString(R.string.update_app_key);
- findPreference(updateToggleKey).setOnPreferenceChangeListener(updatePreferenceChange);
+ findPreference(getString(R.string.update_app_key))
+ .setOnPreferenceChangeListener(updatePreferenceChange);
+ findPreference(getString(R.string.manual_update_key))
+ .setOnPreferenceClickListener(manualUpdateClick);
}
}
diff --git a/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java
index 6e50765ba8d..c9eb42fca17 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java
@@ -299,8 +299,8 @@ public boolean onMove(@NonNull final RecyclerView recyclerView,
return false;
}
- final int sourceIndex = source.getAdapterPosition();
- final int targetIndex = target.getAdapterPosition();
+ final int sourceIndex = source.getBindingAdapterPosition();
+ final int targetIndex = target.getBindingAdapterPosition();
selectedTabsAdapter.swapItems(sourceIndex, targetIndex);
return true;
}
@@ -318,7 +318,7 @@ public boolean isItemViewSwipeEnabled() {
@Override
public void onSwiped(@NonNull final RecyclerView.ViewHolder viewHolder,
final int swipeDir) {
- final int position = viewHolder.getAdapterPosition();
+ final int position = viewHolder.getBindingAdapterPosition();
tabList.remove(position);
selectedTabsAdapter.notifyItemRemoved(position);
diff --git a/app/src/main/java/org/schabi/newpipe/util/DeviceUtils.java b/app/src/main/java/org/schabi/newpipe/util/DeviceUtils.java
index bdf5e8ce4ce..bbe9a7edb29 100644
--- a/app/src/main/java/org/schabi/newpipe/util/DeviceUtils.java
+++ b/app/src/main/java/org/schabi/newpipe/util/DeviceUtils.java
@@ -6,6 +6,7 @@
import android.content.res.Configuration;
import android.os.BatteryManager;
import android.os.Build;
+import android.provider.Settings;
import android.util.TypedValue;
import android.view.KeyEvent;
@@ -144,4 +145,11 @@ public static boolean isLandscape(final Context context) {
public static boolean isInMultiWindow(final AppCompatActivity activity) {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && activity.isInMultiWindowMode();
}
+
+ public static boolean hasAnimationsAnimatorDurationEnabled(final Context context) {
+ return Settings.System.getFloat(
+ context.getContentResolver(),
+ Settings.Global.ANIMATOR_DURATION_SCALE,
+ 1F) != 0F;
+ }
}
diff --git a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
index cb796a7a685..c01e051b023 100644
--- a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
@@ -157,7 +157,9 @@ public static void playOnPopupPlayer(final Context context,
return;
}
- Toast.makeText(context, R.string.popup_playing_toast, Toast.LENGTH_SHORT).show();
+ if (PlayerHolder.getInstance().getType() != PlayerType.POPUP) {
+ Toast.makeText(context, R.string.popup_playing_toast, Toast.LENGTH_SHORT).show();
+ }
final Intent intent = getPlayerIntent(context, MainPlayer.class, queue, resumePlayback);
intent.putExtra(Player.PLAYER_TYPE, MainPlayer.PlayerType.POPUP.ordinal());
ContextCompat.startForegroundService(context, intent);
@@ -166,8 +168,10 @@ public static void playOnPopupPlayer(final Context context,
public static void playOnBackgroundPlayer(final Context context,
final PlayQueue queue,
final boolean resumePlayback) {
- Toast.makeText(context, R.string.background_player_playing_toast, Toast.LENGTH_SHORT)
- .show();
+ if (PlayerHolder.getInstance().getType() != MainPlayer.PlayerType.AUDIO) {
+ Toast.makeText(context, R.string.background_player_playing_toast, Toast.LENGTH_SHORT)
+ .show();
+ }
final Intent intent = getPlayerIntent(context, MainPlayer.class, queue, resumePlayback);
intent.putExtra(Player.PLAYER_TYPE, MainPlayer.PlayerType.AUDIO.ordinal());
ContextCompat.startForegroundService(context, intent);
@@ -502,6 +506,27 @@ public static void openVideoDetail(final Context context,
context.startActivity(intent);
}
+ /**
+ * Opens {@link ChannelFragment}.
+ * Use this instead of {@link #openChannelFragment(FragmentManager, int, String, String)}
+ * when no fragments are used / no FragmentManager is available.
+ * @param context
+ * @param serviceId
+ * @param url
+ * @param title
+ */
+ public static void openChannelFragmentUsingIntent(final Context context,
+ final int serviceId,
+ final String url,
+ @NonNull final String title) {
+ final Intent intent = getOpenIntent(context, url, serviceId,
+ StreamingService.LinkType.CHANNEL);
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ intent.putExtra(Constants.KEY_TITLE, title);
+
+ context.startActivity(intent);
+ }
+
public static void openMainActivity(final Context context) {
final Intent mIntent = new Intent(context, MainActivity.class);
mIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
diff --git a/app/src/main/java/org/schabi/newpipe/util/NewPipeTextViewHelper.java b/app/src/main/java/org/schabi/newpipe/util/NewPipeTextViewHelper.java
new file mode 100644
index 00000000000..cf1a9a03ad9
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/util/NewPipeTextViewHelper.java
@@ -0,0 +1,61 @@
+package org.schabi.newpipe.util;
+
+import android.content.Context;
+import android.text.Selection;
+import android.text.Spannable;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.schabi.newpipe.util.external_communication.ShareUtils;
+import org.schabi.newpipe.views.NewPipeEditText;
+import org.schabi.newpipe.views.NewPipeTextView;
+
+public final class NewPipeTextViewHelper {
+ private NewPipeTextViewHelper() {
+ }
+
+ /**
+ * Share the selected text of {@link NewPipeTextView NewPipeTextViews} and
+ * {@link NewPipeEditText NewPipeEditTexts} with
+ * {@link ShareUtils#shareText(Context, String, String)}.
+ *
+ *
+ * This allows EMUI users to get the Android share sheet instead of the EMUI share sheet when
+ * using the {@code Share} command of the popup menu which appears when selecting text.
+ *
+ *
+ * @param textView the {@link TextView} on which sharing the selected text. It should be a
+ * {@link NewPipeTextView} or a {@link NewPipeEditText} (even if
+ * {@link TextView standard TextViews} are supported).
+ */
+ public static void shareSelectedTextWithShareUtils(@NonNull final TextView textView) {
+ final CharSequence textViewText = textView.getText();
+ shareSelectedTextIfNotNullAndNotEmpty(textView, getSelectedText(textView, textViewText));
+ if (textViewText instanceof Spannable) {
+ Selection.setSelection((Spannable) textViewText, textView.getSelectionEnd());
+ }
+ }
+
+ @Nullable
+ private static CharSequence getSelectedText(@NonNull final TextView textView,
+ @Nullable final CharSequence text) {
+ if (!textView.hasSelection() || text == null) {
+ return null;
+ }
+
+ final int start = textView.getSelectionStart();
+ final int end = textView.getSelectionEnd();
+ return String.valueOf(start > end ? text.subSequence(end, start)
+ : text.subSequence(start, end));
+ }
+
+ private static void shareSelectedTextIfNotNullAndNotEmpty(
+ @NonNull final TextView textView,
+ @Nullable final CharSequence selectedText) {
+ if (selectedText != null && selectedText.length() != 0) {
+ ShareUtils.shareText(textView.getContext(), "", selectedText.toString());
+ }
+ }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java b/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
index ec51cc37013..0ffbe4137bf 100644
--- a/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
+++ b/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
@@ -5,12 +5,15 @@
import android.widget.Toast;
import androidx.fragment.app.Fragment;
+import androidx.preference.PreferenceManager;
import org.schabi.newpipe.NewPipeDatabase;
import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.stream.model.StreamEntity;
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+import org.schabi.newpipe.extractor.stream.StreamType;
import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
-import org.schabi.newpipe.local.dialog.PlaylistCreationDialog;
+import org.schabi.newpipe.local.dialog.PlaylistDialog;
import org.schabi.newpipe.local.history.HistoryRecordManager;
import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
import org.schabi.newpipe.util.external_communication.KoreUtils;
@@ -81,14 +84,16 @@ public enum StreamDialogEntry {
delete(R.string.delete, (fragment, item) -> {
}), // has to be set manually
- append_playlist(R.string.append_playlist, (fragment, item) -> {
- final PlaylistAppendDialog d = PlaylistAppendDialog
- .fromStreamInfoItems(Collections.singletonList(item));
-
- PlaylistAppendDialog.onPlaylistFound(fragment.getContext(),
- () -> d.show(fragment.getParentFragmentManager(), "StreamDialogEntry@append_playlist"),
- () -> PlaylistCreationDialog.newInstance(d)
- .show(fragment.getParentFragmentManager(), "StreamDialogEntry@create_playlist")
+ append_playlist(R.string.add_to_playlist, (fragment, item) -> {
+ PlaylistDialog.createCorrespondingDialog(
+ fragment.getContext(),
+ Collections.singletonList(new StreamEntity(item)),
+ dialog -> dialog.show(
+ fragment.getParentFragmentManager(),
+ "StreamDialogEntry@"
+ + (dialog instanceof PlaylistAppendDialog ? "append" : "create")
+ + "_playlist"
+ )
);
}),
@@ -191,6 +196,16 @@ public interface StreamDialogEntryAction {
void onClick(Fragment fragment, StreamInfoItem infoItem);
}
+ public static boolean shouldAddMarkAsWatched(final StreamType streamType,
+ final Context context) {
+ final boolean isWatchHistoryEnabled = PreferenceManager
+ .getDefaultSharedPreferences(context)
+ .getBoolean(context.getString(R.string.enable_watch_history_key), false);
+ return streamType != StreamType.AUDIO_LIVE_STREAM
+ && streamType != StreamType.LIVE_STREAM
+ && isWatchHistoryEnabled;
+ }
+
/////////////////////////////////////////////
// private method to open channel fragment //
/////////////////////////////////////////////
diff --git a/app/src/main/java/org/schabi/newpipe/util/TLSSocketFactoryCompat.java b/app/src/main/java/org/schabi/newpipe/util/TLSSocketFactoryCompat.java
index 8cf5a4cdf83..05e69408a9d 100644
--- a/app/src/main/java/org/schabi/newpipe/util/TLSSocketFactoryCompat.java
+++ b/app/src/main/java/org/schabi/newpipe/util/TLSSocketFactoryCompat.java
@@ -10,9 +10,8 @@
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-import static org.schabi.newpipe.MainActivity.DEBUG;
+import android.util.Log;
/**
@@ -21,6 +20,7 @@
*/
public class TLSSocketFactoryCompat extends SSLSocketFactory {
+ private static final String TAG = "TLSSocketFactoryCom";
private static TLSSocketFactoryCompat instance = null;
@@ -32,14 +32,6 @@ public TLSSocketFactoryCompat() throws KeyManagementException, NoSuchAlgorithmEx
internalSSLSocketFactory = context.getSocketFactory();
}
-
- public TLSSocketFactoryCompat(final TrustManager[] tm)
- throws KeyManagementException, NoSuchAlgorithmException {
- final SSLContext context = SSLContext.getInstance("TLS");
- context.init(null, tm, new java.security.SecureRandom());
- internalSSLSocketFactory = context.getSocketFactory();
- }
-
public static TLSSocketFactoryCompat getInstance()
throws NoSuchAlgorithmException, KeyManagementException {
if (instance != null) {
@@ -53,9 +45,7 @@ public static void setAsDefault() {
try {
HttpsURLConnection.setDefaultSSLSocketFactory(getInstance());
} catch (NoSuchAlgorithmException | KeyManagementException e) {
- if (DEBUG) {
- e.printStackTrace();
- }
+ Log.e(TAG, "Unable to setAsDefault", e);
}
}
diff --git a/app/src/main/java/org/schabi/newpipe/views/NewPipeEditText.java b/app/src/main/java/org/schabi/newpipe/views/NewPipeEditText.java
new file mode 100644
index 00000000000..2adc28d0e5e
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/views/NewPipeEditText.java
@@ -0,0 +1,45 @@
+package org.schabi.newpipe.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatEditText;
+
+import org.schabi.newpipe.util.NewPipeTextViewHelper;
+import org.schabi.newpipe.util.external_communication.ShareUtils;
+
+/**
+ * An {@link AppCompatEditText} which uses {@link ShareUtils#shareText(Context, String, String)}
+ * when sharing selected text by using the {@code Share} command of the floating actions.
+ *
+ * This allows NewPipe to show Android share sheet instead of EMUI share sheet when sharing text
+ * from {@link AppCompatEditText} on EMUI devices.
+ *
+ */
+public class NewPipeEditText extends AppCompatEditText {
+
+ public NewPipeEditText(@NonNull final Context context) {
+ super(context);
+ }
+
+ public NewPipeEditText(@NonNull final Context context, @Nullable final AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ public NewPipeEditText(@NonNull final Context context,
+ @Nullable final AttributeSet attrs,
+ final int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+ }
+
+ @Override
+ public boolean onTextContextMenuItem(final int id) {
+ if (id == android.R.id.shareText) {
+ NewPipeTextViewHelper.shareSelectedTextWithShareUtils(this);
+ return true;
+ }
+ return super.onTextContextMenuItem(id);
+ }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/views/NewPipeTextView.java b/app/src/main/java/org/schabi/newpipe/views/NewPipeTextView.java
new file mode 100644
index 00000000000..8fdac32db7e
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/views/NewPipeTextView.java
@@ -0,0 +1,45 @@
+package org.schabi.newpipe.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatTextView;
+
+import org.schabi.newpipe.util.NewPipeTextViewHelper;
+import org.schabi.newpipe.util.external_communication.ShareUtils;
+
+/**
+ * An {@link AppCompatTextView} which uses {@link ShareUtils#shareText(Context, String, String)}
+ * when sharing selected text by using the {@code Share} command of the floating actions.
+ *
+ * This allows NewPipe to show Android share sheet instead of EMUI share sheet when sharing text
+ * from {@link AppCompatTextView} on EMUI devices.
+ *
+ */
+public class NewPipeTextView extends AppCompatTextView {
+
+ public NewPipeTextView(@NonNull final Context context) {
+ super(context);
+ }
+
+ public NewPipeTextView(@NonNull final Context context, @Nullable final AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ public NewPipeTextView(@NonNull final Context context,
+ @Nullable final AttributeSet attrs,
+ final int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+ }
+
+ @Override
+ public boolean onTextContextMenuItem(final int id) {
+ if (id == android.R.id.shareText) {
+ NewPipeTextViewHelper.shareSelectedTextWithShareUtils(this);
+ return true;
+ }
+ return super.onTextContextMenuItem(id);
+ }
+}
diff --git a/app/src/main/res/layout-land/activity_player_queue_control.xml b/app/src/main/res/layout-land/activity_player_queue_control.xml
index 4b79d92f60a..c2359552ecd 100644
--- a/app/src/main/res/layout-land/activity_player_queue_control.xml
+++ b/app/src/main/res/layout-land/activity_player_queue_control.xml
@@ -60,7 +60,7 @@
android:padding="8dp"
tools:ignore="RtlHardcoded,RtlSymmetry">
-
-
-
-
-
-
-
-
-
-
+ tools:visibility="gone" />
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -82,7 +82,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:paddingStart="6dp"
+ android:paddingTop="4dp"
+ android:paddingEnd="6dp">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:orientation="vertical">
+
+
+
+
+
diff --git a/app/src/main/res/layout/dialog_playlists.xml b/app/src/main/res/layout/dialog_playlists.xml
index b64a9241c14..99c46e55264 100644
--- a/app/src/main/res/layout/dialog_playlists.xml
+++ b/app/src/main/res/layout/dialog_playlists.xml
@@ -23,7 +23,7 @@
app:srcCompat="@drawable/ic_playlist_add"
tools:ignore="ContentDescription,RtlHardcoded" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -85,14 +85,14 @@
android:layout_gravity="end"
android:text="@string/give_back" />
-
-
@@ -105,14 +105,14 @@
android:layout_gravity="end"
android:text="@string/open_in_browser" />
-
-
diff --git a/app/src/main/res/layout/fragment_channel.xml b/app/src/main/res/layout/fragment_channel.xml
index 873f3c88489..9e22575391d 100644
--- a/app/src/main/res/layout/fragment_channel.xml
+++ b/app/src/main/res/layout/fragment_channel.xml
@@ -30,7 +30,7 @@
android:visibility="gone"
tools:visibility="visible">
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ tools:visibility="gone" />
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
- -->
-
-
-
- -->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ tools:listitem="@layout/select_channel_item" />
-
-
-
+ tools:listitem="@layout/select_kiosk_item" />
diff --git a/app/src/main/res/layout/select_kiosk_item.xml b/app/src/main/res/layout/select_kiosk_item.xml
index 6cd04ae345a..680767bba0c 100644
--- a/app/src/main/res/layout/select_kiosk_item.xml
+++ b/app/src/main/res/layout/select_kiosk_item.xml
@@ -22,7 +22,7 @@
app:tint="@color/contrastColor"
tools:ignore="RtlHardcoded" />
-
-
-
-
diff --git a/app/src/main/res/layout/settings_category_header_title.xml b/app/src/main/res/layout/settings_category_header_title.xml
index 679b9048c3e..c7d6920b049 100644
--- a/app/src/main/res/layout/settings_category_header_title.xml
+++ b/app/src/main/res/layout/settings_category_header_title.xml
@@ -1,5 +1,5 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/menu/menu_play_queue_item.xml b/app/src/main/res/menu/menu_play_queue_item.xml
index ebb361be971..b23f8008f72 100644
--- a/app/src/main/res/menu/menu_play_queue_item.xml
+++ b/app/src/main/res/menu/menu_play_queue_item.xml
@@ -9,7 +9,10 @@
android:title="@string/play_queue_stream_detail" />
- @string/never
+ report_player_errors_key
+
seekbar_preview_thumbnail_key
seekbar_preview_thumbnail_high_quality
seekbar_preview_thumbnail_low_quality
@@ -188,6 +190,7 @@
disable_media_tunneling_key
crash_the_app_key
show_image_indicators_key
+ show_crash_the_player_key
theme
@@ -263,6 +266,7 @@
feed_update_threshold_key
300
+ feed_show_played_items
show_thumbnail_key
@@ -359,6 +363,7 @@
background_player
popup_player
download
+ add_to_playlist
always_ask_player
@@ -367,6 +372,7 @@
- @string/background_player
- @string/popup_player
- @string/download
+ - @string/add_to_playlist
- @string/always_ask_open_action
@@ -375,11 +381,13 @@
- @string/background_player_key
- @string/popup_player_key
- @string/download_key
+ - @string/add_to_playlist_key
- @string/always_ask_open_action_key
update_app_key
+ manual_update_key
update_pref_screen_key
update_expiry_key
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 225ccd126f9..a8bb4c78883 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -52,6 +52,9 @@
org.xbmc.kore
Show \"Play with Kodi\" option
Display an option to play a video via Kodi media center
+ Crash the player
+ Report player errors
+ Reports player errors in full detail instead of showing a short-lived toast message (useful for diagnosing problems)
Scale thumbnail to 1:1 aspect ratio
Scale the video thumbnail shown in the notification from 16:9 to 1:1 aspect ratio (may introduce distortions)
First action button
@@ -439,7 +442,8 @@
New Playlist
Rename
Name
- Add to playlist
+ Add to playlist
+ Processing... May take a moment
Mute
Unmute
Set as playlist thumbnail
@@ -472,6 +476,8 @@
Show image indicators
Show Picasso colored ribbons on top of images indicating their source: red for network, blue for disk and green for memory
Crash the app
+ Show \"crash the player\"
+ Shows a crash option when using the player
Import
Import from
@@ -516,6 +522,8 @@
Updates
Show a notification to prompt app update when a new version is available
+ Check for updates
+ Manually check for new versions
Minimize on app switch
Action when switching to other app from main video player — %s
@@ -546,6 +554,7 @@
recovering
Queue
Action denied by the system
+ Checking for updates…
Download failed
@@ -632,6 +641,7 @@
Not loaded: %d
Loading feed…
Processing feed…
+ New feed items
Select subscriptions
No subscription selected
diff --git a/app/src/main/res/xml/debug_settings.xml b/app/src/main/res/xml/debug_settings.xml
index 22abebcae94..5e2cc28edc9 100644
--- a/app/src/main/res/xml/debug_settings.xml
+++ b/app/src/main/res/xml/debug_settings.xml
@@ -49,9 +49,26 @@
android:title="@string/show_image_indicators_title"
app:iconSpaceReserved="false" />
+
+
+
+
diff --git a/app/src/main/res/xml/update_settings.xml b/app/src/main/res/xml/update_settings.xml
index adaa4735276..ef121ec4efa 100644
--- a/app/src/main/res/xml/update_settings.xml
+++ b/app/src/main/res/xml/update_settings.xml
@@ -12,4 +12,11 @@
app:singleLineTitle="false"
app:iconSpaceReserved="false" />
+
+
diff --git a/app/src/main/res/xml/video_audio_settings.xml b/app/src/main/res/xml/video_audio_settings.xml
index f605fbe170e..4dc5d5c9aed 100644
--- a/app/src/main/res/xml/video_audio_settings.xml
+++ b/app/src/main/res/xml/video_audio_settings.xml
@@ -89,6 +89,7 @@
android:title="@string/show_play_with_kodi_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />
+