Adapt compose code to new ErrorInfo

Author: Stypox

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

@@ -302,9 +302,4 @@ class ErrorInfo private constructor(
             }
         }
     }
-
-    // fun to extract service explanation
-    fun getExplanation(): String {
-        return ""
-    }
 }

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

@@ -1,7 +1,6 @@
 package org.schabi.newpipe.ui.components.common
 
 import android.content.Intent
-import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
@@ -19,42 +18,18 @@ 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.extractor.exceptions.AccountTerminatedException
-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.ui.theme.SizeTokens.SpacingSmall
 import org.schabi.newpipe.util.external_communication.ShareUtils
 
-enum class ErrorAction(@StringRes val actionStringId: Int) {
-    REPORT(R.string.error_snackbar_action),
-    SOLVE_CAPTCHA(R.string.recaptcha_solve)
-}
-
-/**
- * Determines the error action type based on the throwable in ErrorInfo
- *
- */
-fun determineErrorAction(errorInfo: ErrorInfo): ErrorAction {
-    return when (errorInfo.throwable) {
-        is ReCaptchaException -> ErrorAction.SOLVE_CAPTCHA
-        is AccountTerminatedException -> ErrorAction.REPORT
-        else -> ErrorAction.REPORT
-    }
-}
-
 @Composable
 fun ErrorPanel(
     errorInfo: ErrorInfo,
     modifier: Modifier = Modifier,
     onRetry: (() -> Unit)? = null,
 
 ) {
-    val explanation = errorInfo.getExplanation()
-    val canOpenInBrowser = errorInfo.openInBrowserUrl != null
-    val errorActionType = determineErrorAction(errorInfo)
-
     val context = LocalContext.current
 
     Column(
@@ -68,37 +43,26 @@ fun ErrorPanel(
             textAlign = TextAlign.Center
         )
 
-        if (explanation.isNotBlank()) {
-            Spacer(Modifier.height(SpacingSmall))
-            Text(
-                text = explanation,
-                style = MaterialTheme.typography.bodyMedium,
-                textAlign = TextAlign.Center
-            )
-        }
-
         Spacer(Modifier.height(SpacingMedium))
-        when (errorActionType) {
-            ErrorAction.REPORT -> {
-                ServiceColoredButton(onClick = {
-                    ErrorUtil.openActivity(context, errorInfo)
-                }) {
-                    Text(stringResource(errorActionType.actionStringId).uppercase())
-                }
+
+        if (errorInfo.recaptchaUrl != null) {
+            ServiceColoredButton(onClick = {
+                // Starting ReCaptcha Challenge Activity
+                val intent = Intent(context, ReCaptchaActivity::class.java)
+                    .putExtra(
+                        ReCaptchaActivity.RECAPTCHA_URL_EXTRA,
+                        errorInfo.recaptchaUrl
+                    )
+                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                context.startActivity(intent)
+            }) {
+                Text(stringResource(R.string.recaptcha_solve).uppercase())
             }
-            ErrorAction.SOLVE_CAPTCHA -> {
-                ServiceColoredButton(onClick = {
-                    // Starting ReCaptcha Challenge Activity
-                    val intent = Intent(context, ReCaptchaActivity::class.java)
-                        .putExtra(
-                            ReCaptchaActivity.RECAPTCHA_URL_EXTRA,
-                            (errorInfo.throwable as ReCaptchaException).url
-                        )
-                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                    context.startActivity(intent)
-                }) {
-                    Text(stringResource(errorActionType.actionStringId).uppercase())
-                }
+        } else if (errorInfo.isReportable) {
+            ServiceColoredButton(onClick = {
+                ErrorUtil.openActivity(context, errorInfo)
+            }) {
+                Text(stringResource(R.string.error_snackbar_action).uppercase())
             }
         }
 
@@ -107,9 +71,9 @@ fun ErrorPanel(
                 Text(stringResource(R.string.retry).uppercase())
             }
         }
-        if (canOpenInBrowser) {
+        if (errorInfo.openInBrowserUrl != null) {
             ServiceColoredButton(onClick = {
-                errorInfo.openInBrowserUrl?.let { url ->
+                errorInfo.openInBrowserUrl.let { url ->
                     ShareUtils.openUrlInBrowser(context, url)
                 }
             }) {