Include all button conditions in ErrorPanel

Author: Stypox

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

@@ -3,7 +3,6 @@ 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
@@ -275,6 +274,9 @@ class ErrorInfo private constructor(
                 // we don't have an exception, so this is a manually built error, which likely
                 // indicates that it's important and is thus reportable
                 null -> true
+                // a recaptcha was detected, and the user needs to solve it, there is no use in
+                // letting users report it
+                is ReCaptchaException -> false
                 // the service explicitly said that content is not available (e.g. age restrictions,
                 // video deleted, etc.), there is no use in letting users report it
                 is ContentNotAvailableException -> false

app/src/main/java/org/schabi/newpipe/ui/components/common/ErrorPanel.kt

@@ -1,9 +1,8 @@
 package org.schabi.newpipe.ui.components.common
 
 import android.content.Intent
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.height
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -14,37 +13,35 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
 import org.schabi.newpipe.R
 import org.schabi.newpipe.error.ErrorInfo
 import org.schabi.newpipe.error.ErrorUtil
 import org.schabi.newpipe.error.ReCaptchaActivity
+import org.schabi.newpipe.error.UserAction
+import org.schabi.newpipe.extractor.exceptions.ReCaptchaException
 import org.schabi.newpipe.ui.theme.AppTheme
-import org.schabi.newpipe.ui.theme.SizeTokens.SpacingExtraLarge
-import org.schabi.newpipe.ui.theme.SizeTokens.SpacingMedium
 import org.schabi.newpipe.util.external_communication.ShareUtils
 
 @Composable
 fun ErrorPanel(
     errorInfo: ErrorInfo,
     modifier: Modifier = Modifier,
     onRetry: (() -> Unit)? = null,
-
 ) {
     val context = LocalContext.current
 
     Column(
+        verticalArrangement = Arrangement.spacedBy(12.dp),
         horizontalAlignment = Alignment.CenterHorizontally,
-        modifier = modifier
+        modifier = modifier,
     ) {
-
         Text(
             text = errorInfo.getMessage(context),
             style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Bold),
             textAlign = TextAlign.Center
         )
 
-        Spacer(Modifier.height(SpacingMedium))
-
         if (errorInfo.recaptchaUrl != null) {
             ServiceColoredButton(onClick = {
                 // Starting ReCaptcha Challenge Activity
@@ -58,19 +55,24 @@ fun ErrorPanel(
             }) {
                 Text(stringResource(R.string.recaptcha_solve).uppercase())
             }
-        } else if (errorInfo.isReportable) {
+        }
+
+        if (errorInfo.isRetryable) {
+            onRetry?.let {
+                ServiceColoredButton(onClick = it) {
+                    Text(stringResource(R.string.retry).uppercase())
+                }
+            }
+        }
+
+        if (errorInfo.isReportable) {
             ServiceColoredButton(onClick = {
                 ErrorUtil.openActivity(context, errorInfo)
             }) {
                 Text(stringResource(R.string.error_snackbar_action).uppercase())
             }
         }
 
-        onRetry?.let {
-            ServiceColoredButton(onClick = it) {
-                Text(stringResource(R.string.retry).uppercase())
-            }
-        }
         if (errorInfo.openInBrowserUrl != null) {
             ServiceColoredButton(onClick = {
                 errorInfo.openInBrowserUrl.let { url ->
@@ -80,22 +82,21 @@ fun ErrorPanel(
                 Text(stringResource(R.string.open_in_browser).uppercase())
             }
         }
-
-        Spacer(Modifier.height(SpacingExtraLarge))
     }
 }
 
-@Preview(showBackground = true, widthDp = 360, heightDp = 640)
-
+@Preview(showBackground = true, widthDp = 360, heightDp = 640, backgroundColor = 0xffffffff)
 @Composable
 fun ErrorPanelPreview() {
     AppTheme {
         ErrorPanel(
             errorInfo = ErrorInfo(
-                throwable = Exception("Network error"),
-                userAction = org.schabi.newpipe.error.UserAction.UI_ERROR,
-                request = "Preview request"
-            )
+                throwable = ReCaptchaException("An error", "https://example.com"),
+                userAction = UserAction.REQUESTED_STREAM,
+                request = "Preview request",
+                openInBrowserUrl = "https://example.com",
+            ),
+            onRetry = {},
         )
     }
 }