Merge pull request #13420 from TeamNewPipe/mergeDev

Merge dev into refactor

Author: TobiGr

app/build.gradle.kts

@@ -49,9 +49,9 @@ configure<ApplicationExtension> {
         minSdk = 23
         targetSdk = 35
 
-        versionCode = System.getProperty("versionCodeOverride")?.toInt() ?: 1008
+        versionCode = System.getProperty("versionCodeOverride")?.toInt() ?: 1010
 
-        versionName = "0.28.3"
+        versionName = "0.28.5"
         System.getProperty("versionNameSuffix")?.let { versionNameSuffix = it }
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

app/proguard-rules.pro

@@ -59,3 +59,18 @@
 -keepclassmembers class * extends com.google.protobuf.GeneratedMessageLite {
     <fields>;
 }
+
+## Keep Kotlinx Serialization classes
+-keepclassmembers class kotlinx.serialization.json.** {
+    *** Companion;
+}
+-keepclasseswithmembers class kotlinx.serialization.json.** {
+    kotlinx.serialization.KSerializer serializer(...);
+}
+-keep,includedescriptorclasses class org.schabi.newpipe.**$$serializer { *; }
+-keepclassmembers class org.schabi.newpipe.** {
+    *** Companion;
+}
+-keepclasseswithmembers class org.schabi.newpipe.** {
+    kotlinx.serialization.KSerializer serializer(...);
+}

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

@@ -20,6 +20,7 @@
 
 package org.schabi.newpipe;
 
+import android.app.AlertDialog;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -92,6 +93,8 @@
 import org.schabi.newpipe.util.external_communication.ShareUtils;
 import org.schabi.newpipe.views.FocusOverlayView;
 
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -192,6 +195,12 @@ protected void onCreate(final Bundle savedInstanceState) {
             UpdateSettingsFragment.askForConsentToUpdateChecks(this);
         }
 
+        // ReleaseVersionUtil.INSTANCE.isReleaseApk() will be true only for main official build
+        // We want every release build (nightly, nightly-refactor) to show the popup
+        if (!DEBUG) {
+            showKeepAndroidDialog();
+        }
+
         MigrationManager.showUserInfoIfPresent(this);
     }
 
@@ -889,4 +898,57 @@ private boolean bottomSheetHiddenOrCollapsed() {
                 || sheetState == BottomSheetBehavior.STATE_COLLAPSED;
     }
 
+    private void showKeepAndroidDialog() {
+        final var prefs = PreferenceManager.getDefaultSharedPreferences(this);
+
+        final var now = Instant.now();
+        final var kaoLastCheck = Instant.ofEpochMilli(prefs.getLong(
+                getString(R.string.kao_last_checked_key),
+                0
+        ));
+
+        final var supportedLannguages = List.of("fr", "de", "ca", "es", "id", "it", "pl",
+                "pt", "cs", "sk", "fa", "ar", "tr", "el", "th", "ru", "uk", "ko", "zh", "ja");
+        final var locale = Localization.getAppLocale();
+        final String kaoBaseUrl = "https://keepandroidopen.org/";
+        final String kaoURI;
+        if (supportedLannguages.contains(locale.getLanguage())) {
+            if ("zh".equals(locale.getLanguage())) {
+                kaoURI = kaoBaseUrl + ("TW".equals(locale.getCountry()) ? "zh-TW" : "zh-CN");
+            } else {
+                kaoURI = kaoBaseUrl + locale.getLanguage();
+            }
+        } else {
+            kaoURI = kaoBaseUrl;
+        }
+        final var solutionURI =
+                "https://github.com/woheller69/FreeDroidWarn?tab=readme-ov-file#solutions";
+
+        if (kaoLastCheck.plus(30, ChronoUnit.DAYS).isBefore(now)) {
+            final var dialog = new AlertDialog.Builder(this)
+                    .setTitle("Keep Android Open")
+                    .setCancelable(false)
+                    .setMessage(this.getString(R.string.kao_dialog_warning))
+                    .setPositiveButton(this.getString(android.R.string.ok), (d, w) -> {
+                        prefs.edit()
+                                .putLong(
+                                        getString(R.string.kao_last_checked_key),
+                                        now.toEpochMilli()
+                                )
+                                .apply();
+                    })
+                    .setNeutralButton(this.getString(R.string.kao_solution), null)
+                    .setNegativeButton(this.getString(R.string.kao_dialog_more_info), null)
+                    .show();
+
+            // If we use setNeutralButton and etc. dialog will close after pressing the buttons,
+            // but we want it to close only when positive button is pressed
+            dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(v ->
+                    ShareUtils.openUrlInBrowser(this, kaoURI)
+            );
+            dialog.getButton(AlertDialog.BUTTON_NEUTRAL).setOnClickListener(v ->
+                    ShareUtils.openUrlInBrowser(this, solutionURI)
+            );
+        }
+    }
 }

app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java

@@ -344,7 +344,7 @@ private void initToolbar(final Toolbar toolbar) {
         toolbar.setNavigationOnClickListener(v -> dismiss());
         toolbar.setNavigationContentDescription(R.string.cancel);
 
-        okButton = toolbar.findViewById(R.id.okay);
+        okButton = toolbar.getMenu().findItem(R.id.okay);
         okButton.setEnabled(false); // disable until the download service connection is done
 
         toolbar.setOnMenuItemClickListener(item -> {

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

@@ -25,6 +25,7 @@ import org.schabi.newpipe.databinding.ActivityErrorBinding
 import org.schabi.newpipe.util.Localization
 import org.schabi.newpipe.util.ThemeHelper
 import org.schabi.newpipe.util.external_communication.ShareUtils
+import org.schabi.newpipe.util.text.setTextWithLinks
 
 /**
  * This activity is used to show error details and allow reporting them in various ways.
@@ -100,7 +101,7 @@ class ErrorActivity : AppCompatActivity() {
 
         // normal bugreport
         buildInfo(errorInfo)
-        binding.errorMessageView.text = errorInfo.getMessage(this)
+        binding.errorMessageView.setTextWithLinks(errorInfo.getMessage(this))
         binding.errorView.text = formErrorText(errorInfo.stackTraces)
 
         // print stack trace once again for debugging:

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

@@ -3,6 +3,7 @@ package org.schabi.newpipe.error
 import android.content.Context
 import android.os.Parcelable
 import androidx.annotation.StringRes
+import androidx.core.content.ContextCompat
 import com.google.android.exoplayer2.ExoPlaybackException
 import com.google.android.exoplayer2.upstream.HttpDataSource
 import com.google.android.exoplayer2.upstream.Loader
@@ -28,7 +29,7 @@ import org.schabi.newpipe.extractor.exceptions.YoutubeMusicPremiumContentExcepti
 import org.schabi.newpipe.ktx.isNetworkRelated
 import org.schabi.newpipe.player.mediasource.FailedMediaSource
 import org.schabi.newpipe.player.resolver.PlaybackResolver
-import org.schabi.newpipe.util.Localization
+import org.schabi.newpipe.util.text.getText
 
 /**
  * An error has occurred in the app. This class contains plain old parcelable data that can be used
@@ -135,8 +136,8 @@ class ErrorInfo private constructor(
         return getServiceName(serviceId)
     }
 
-    fun getMessage(context: Context): String {
-        return message.getString(context)
+    fun getMessage(context: Context): CharSequence {
+        return message.getText(context)
     }
 
     companion object {
@@ -146,18 +147,23 @@ class ErrorInfo private constructor(
             private val stringRes: Int,
             private vararg val formatArgs: String
         ) : Parcelable {
-            fun getString(context: Context): String {
-                // use Localization.compatGetString() just in case context is not AppCompatActivity
+            fun getText(context: Context): CharSequence {
+                // Ensure locale aware context via ContextCompat.getContextForLanguage() (just in case context is not AppCompatActivity)
+                val ctx = ContextCompat.getContextForLanguage(context)
                 return if (formatArgs.isEmpty()) {
-                    Localization.compatGetString(context, stringRes)
+                    ctx.getText(stringRes)
                 } else {
-                    Localization.compatGetString(context, stringRes, *formatArgs)
+                    // ContextCompat.getString() with formatArgs does not exist, so we just
+                    // replicate its source code but with formatArgs
+                    ctx.resources.getText(stringRes, *formatArgs)
                 }
             }
         }
 
         const val SERVICE_NONE = "<unknown_service>"
 
+        const val YOUTUBE_IP_BAN_FAQ_URL = "https://newpipe.net/FAQ/#ip-banned-youtube"
+
         private fun getServiceName(serviceId: Int?) = // not using getNameOfServiceById since we want to accept a nullable serviceId and we
             // want to default to SERVICE_NONE
             ServiceList.all()?.firstOrNull { it.serviceId == serviceId }?.serviceInfo?.name
@@ -245,7 +251,11 @@ class ErrorInfo private constructor(
                     ErrorMessage(R.string.youtube_music_premium_content)
 
                 throwable is SignInConfirmNotBotException ->
-                    ErrorMessage(R.string.sign_in_confirm_not_bot_error, getServiceName(serviceId))
+                    ErrorMessage(
+                        R.string.sign_in_confirm_not_bot_error,
+                        getServiceName(serviceId),
+                        YOUTUBE_IP_BAN_FAQ_URL
+                    )
 
                 throwable is ContentNotAvailableException ->
                     ErrorMessage(R.string.content_not_available)

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

@@ -16,6 +16,7 @@ import org.schabi.newpipe.MainActivity
 import org.schabi.newpipe.R
 import org.schabi.newpipe.ktx.animate
 import org.schabi.newpipe.util.external_communication.ShareUtils
+import org.schabi.newpipe.util.text.setTextWithLinks
 
 class ErrorPanelHelper(
     private val fragment: Fragment,
@@ -64,7 +65,7 @@ class ErrorPanelHelper(
 
     fun showError(errorInfo: ErrorInfo) {
         ensureDefaultVisibility()
-        errorTextView.text = errorInfo.getMessage(context)
+        errorTextView.setTextWithLinks(errorInfo.getMessage(context))
 
         if (errorInfo.recaptchaUrl != null) {
             showAndSetErrorButtonAction(R.string.recaptcha_solve) {
@@ -109,7 +110,7 @@ class ErrorPanelHelper(
     fun showTextError(errorString: String) {
         ensureDefaultVisibility()
 
-        errorTextView.text = errorString
+        errorTextView.setTextWithLinks(errorString)
 
         setRootVisible()
     }

app/src/main/java/org/schabi/newpipe/fragments/detail/BaseDescriptionFragment.java

@@ -216,9 +216,9 @@ protected void addImagesMetadataItem(final LayoutInflater inflater,
                     || image.getWidth() != Image.WIDTH_UNKNOWN
                     // if even the resolution level is unknown, ?x? will be shown
                     || image.getEstimatedResolutionLevel() == Image.ResolutionLevel.UNKNOWN) {
-                urls.append(imageSizeToText(image.getHeight()));
-                urls.append('x');
                 urls.append(imageSizeToText(image.getWidth()));
+                urls.append('x');
+                urls.append(imageSizeToText(image.getHeight()));
             } else {
                 switch (image.getEstimatedResolutionLevel()) {
                     case LOW -> urls.append(getString(R.string.image_quality_low));

app/src/main/java/org/schabi/newpipe/info_list/dialog/StreamDialogDefaultEntry.java

@@ -5,6 +5,7 @@
 import static org.schabi.newpipe.util.SparseItemUtil.fetchStreamInfoAndSaveToDatabase;
 import static org.schabi.newpipe.util.SparseItemUtil.fetchUploaderUrlIfSparse;
 
+import android.content.Context;
 import android.net.Uri;
 
 import androidx.annotation.NonNull;
@@ -53,28 +54,33 @@ public enum StreamDialogDefaultEntry {
     /**
      * Enqueues the stream automatically to the current PlayerType.
      */
-    ENQUEUE(R.string.enqueue_stream, (fragment, item) ->
-            fetchItemInfoIfSparse(fragment.requireContext(), item, singlePlayQueue ->
-                NavigationHelper.enqueueOnPlayer(fragment.getContext(), singlePlayQueue))
-    ),
+    ENQUEUE(R.string.enqueue_stream, (fragment, item) -> {
+            final Context ctx = fragment.requireContext().getApplicationContext();
+            fetchItemInfoIfSparse(ctx, item, singlePlayQueue ->
+                NavigationHelper.enqueueOnPlayer(ctx, singlePlayQueue));
+    }),
 
     /**
      * Enqueues the stream automatically to the current PlayerType
      * after the currently playing stream.
      */
-    ENQUEUE_NEXT(R.string.enqueue_next_stream, (fragment, item) ->
-            fetchItemInfoIfSparse(fragment.requireContext(), item, singlePlayQueue ->
-                NavigationHelper.enqueueNextOnPlayer(fragment.getContext(), singlePlayQueue))
-    ),
+    ENQUEUE_NEXT(R.string.enqueue_next_stream, (fragment, item) -> {
+            final Context ctx = fragment.requireContext().getApplicationContext();
+            fetchItemInfoIfSparse(ctx, item, singlePlayQueue ->
+                NavigationHelper.enqueueNextOnPlayer(ctx, singlePlayQueue));
+    }),
 
-    START_HERE_ON_BACKGROUND(R.string.start_here_on_background, (fragment, item) ->
-            fetchItemInfoIfSparse(fragment.requireContext(), item, singlePlayQueue ->
-                NavigationHelper.playOnBackgroundPlayer(
-                        fragment.getContext(), singlePlayQueue, true))),
+    START_HERE_ON_BACKGROUND(R.string.start_here_on_background, (fragment, item) -> {
+            final Context ctx = fragment.requireContext().getApplicationContext();
+            fetchItemInfoIfSparse(ctx, item, singlePlayQueue ->
+                NavigationHelper.playOnBackgroundPlayer(ctx, singlePlayQueue, true));
+    }),
 
-    START_HERE_ON_POPUP(R.string.start_here_on_popup, (fragment, item) ->
-            fetchItemInfoIfSparse(fragment.requireContext(), item, singlePlayQueue ->
-                NavigationHelper.playOnPopupPlayer(fragment.getContext(), singlePlayQueue, true))),
+    START_HERE_ON_POPUP(R.string.start_here_on_popup, (fragment, item) -> {
+            final Context ctx = fragment.requireContext().getApplicationContext();
+            fetchItemInfoIfSparse(ctx, item, singlePlayQueue ->
+                NavigationHelper.playOnPopupPlayer(ctx, singlePlayQueue, true));
+    }),
 
     SET_AS_PLAYLIST_THUMBNAIL(R.string.set_as_playlist_thumbnail, (fragment, item) -> {
         throw new UnsupportedOperationException("This needs to be implemented manually "

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

@@ -49,7 +49,7 @@ import org.schabi.newpipe.util.NavigationHelper
  */
 class MediaBrowserPlaybackPreparer(
     private val context: Context,
-    private val setMediaSessionError: BiConsumer<String, Int>, // error string, error code
+    private val setMediaSessionError: BiConsumer<CharSequence, Int>, // error string, error code
     private val clearMediaSessionError: Runnable,
     private val onPrepare: Consumer<Boolean>
 ) : PlaybackPreparer {
@@ -118,7 +118,7 @@ class MediaBrowserPlaybackPreparer(
 
     private fun onPrepareError(throwable: Throwable) {
         setMediaSessionError.accept(
-            ErrorInfo.getMessage(throwable, null, null).getString(context),
+            ErrorInfo.getMessage(throwable, null, null).getText(context),
             PlaybackStateCompat.ERROR_CODE_APP_ERROR
         )
     }