Updated ERefactor ErrorPanel to use ErrorInfo directly and remove UI models

Author: SttApollo

app/src/androidTest/java/org/schabi/newpipe/ui/components/video/comment/CommentSectionErrorIntegrationTest.kt

@@ -0,0 +1,119 @@
+package org.schabi.newpipe.ui.components.video.comment
+
+import android.content.Context
+import android.content.Intent
+import androidx.paging.LoadState
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.schabi.newpipe.error.ErrorInfo
+import org.schabi.newpipe.error.UserAction
+import org.schabi.newpipe.extractor.exceptions.ReCaptchaException
+import org.schabi.newpipe.ui.components.common.ErrorAction
+import org.schabi.newpipe.ui.components.common.determineErrorAction
+import org.schabi.newpipe.viewmodels.util.Resource
+import java.io.IOException
+import java.net.SocketTimeoutException
+
+@RunWith(AndroidJUnit4::class)
+class CommentSectionErrorIntegrationTest {
+
+    private lateinit var context: Context
+
+    @Before
+    fun setUp() {
+        context = ApplicationProvider.getApplicationContext()
+    }
+
+    // Test 1: Network error on initial load (Resource.Error)
+    @Test
+    fun testInitialCommentNetworkError() {
+        val expectedMessage = "Connection timeout"
+        val networkError = SocketTimeoutException(expectedMessage)
+        val resourceError = Resource.Error(networkError)
+
+        val errorInfo = ErrorInfo(
+            throwable = resourceError.throwable,
+            userAction = UserAction.REQUESTED_COMMENTS,
+            request = "comments"
+        )
+        assertEquals(networkError, errorInfo.throwable)
+        assertEquals(ErrorAction.REPORT, determineErrorAction(errorInfo))
+        assertEquals(expectedMessage, errorInfo.getExplanation())
+    }
+
+    // Test 2: Network error on paging (LoadState.Error)
+    @Test
+    fun testPagingNetworkError() {
+        val expectedMessage = "Paging failed"
+        val pagingError = IOException(expectedMessage)
+        val loadStateError = LoadState.Error(pagingError)
+
+        val errorInfo = ErrorInfo(
+            throwable = loadStateError.error,
+            userAction = UserAction.REQUESTED_COMMENTS,
+            request = "comments"
+        )
+        assertEquals(pagingError, errorInfo.throwable)
+        assertEquals(ErrorAction.REPORT, determineErrorAction(errorInfo))
+        assertEquals(expectedMessage, errorInfo.getExplanation())
+    }
+
+    // Test 3: ReCaptcha during comments load
+    @Test
+    fun testReCaptchaDuringComments() {
+        val url = "https://www.google.com/recaptcha/api/fallback?k=test"
+        val expectedMessage = "ReCaptcha needed"
+        val captcha = ReCaptchaException(expectedMessage, url)
+        val errorInfo = ErrorInfo(
+            throwable = captcha,
+            userAction = UserAction.REQUESTED_COMMENTS,
+            request = "comments"
+        )
+        assertEquals(ErrorAction.SOLVE_CAPTCHA, determineErrorAction(errorInfo))
+        assertEquals(expectedMessage, errorInfo.getExplanation())
+
+        val intent = Intent(context, org.schabi.newpipe.error.ReCaptchaActivity::class.java).apply {
+            putExtra(org.schabi.newpipe.error.ReCaptchaActivity.RECAPTCHA_URL_EXTRA, url)
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        }
+        assertEquals(url, intent.getStringExtra(org.schabi.newpipe.error.ReCaptchaActivity.RECAPTCHA_URL_EXTRA))
+    }
+
+    // Test 4: Retry functionality integration with ErrorPanel
+    @Test
+    fun testRetryIntegrationWithErrorPanel() {
+        val expectedMessage = "Network request failed"
+        val networkError = IOException(expectedMessage)
+        val loadStateError = LoadState.Error(networkError)
+
+        val errorInfo = ErrorInfo(
+            throwable = loadStateError.error,
+            userAction = UserAction.REQUESTED_COMMENTS,
+            request = "comments"
+        )
+
+        val errorAction = determineErrorAction(errorInfo)
+        assertEquals("Network errors should get REPORT action", ErrorAction.REPORT, errorAction)
+        var retryCallbackInvoked = false
+        val mockCommentRetry = {
+            retryCallbackInvoked = true
+        }
+
+        mockCommentRetry()
+        assertTrue("Retry callback should be invoked when user clicks retry", retryCallbackInvoked)
+
+        assertEquals(
+            "Error explanation should be available for retry scenarios",
+            expectedMessage, errorInfo.getExplanation()
+        )
+        assertEquals(
+            "Error should maintain comment context for retry",
+            UserAction.REQUESTED_COMMENTS, errorInfo.userAction
+        )
+    }
+}

app/src/androidTest/java/org/schabi/newpipe/ui/components/video/comments/CommentSectionErrorTest.kt

@@ -38,6 +38,7 @@ public void send(@NonNull final Context context, @NonNull final CrashReportData
                 UserAction.UI_ERROR,
                 ErrorInfo.SERVICE_NONE,
                 "ACRA report",
-                R.string.app_ui_crash));
+                R.string.app_ui_crash,
+                null));
     }
 }

app/src/main/java/org/schabi/newpipe/error/AcraReportSender.java

@@ -20,7 +20,8 @@ class ErrorInfo(
     val userAction: UserAction,
     val serviceName: String,
     val request: String,
-    val messageStringId: Int
+    val messageStringId: Int,
+    val openInBrowserUrl: String? = null
 ) : Parcelable {
 
     // no need to store throwable, all data for report is in other variables
@@ -113,4 +114,9 @@ class ErrorInfo(
             }
         }
     }
+
+    // fun to extract service explanation
+    fun getExplanation(): String {
+        return throwable?.message ?: return ""
+    }
 }

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

@@ -1352,13 +1352,14 @@ public void handleError() {
         super.handleError();
         setErrorImage();
 
-        if (binding.relatedItemsLayout != null) { // hide related streams for tablets
+        // hide related streams for tablets
+        if (binding.relatedItemsLayout != null) {
             binding.relatedItemsLayout.setVisibility(View.INVISIBLE);
         }
-
         // hide comments / related streams / description tabs
         binding.viewPager.setVisibility(View.GONE);
         binding.tabLayout.setVisibility(View.GONE);
+
     }
 
     private void hideAgeRestrictedContent() {

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

@@ -87,7 +87,8 @@ public void onCreate(final Bundle savedInstanceState) {
                     new ErrorInfo(new String[]{}, UserAction.SUBSCRIPTION_IMPORT_EXPORT,
                             ServiceHelper.getNameOfServiceById(currentServiceId),
                             "Service does not support importing subscriptions",
-                            R.string.general_error));
+                            R.string.general_error,
+                            null));
             activity.finish();
         }
     }

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

@@ -17,7 +17,7 @@ class CommentsSource(private val commentInfo: CommentInfo) : PagingSource<Page,
     override suspend fun load(params: LoadParams<Page>): LoadResult<Page, CommentsInfoItem> {
         // params.key is null the first time the load() function is called, so we need to return the
         // first batch of already-loaded comments
-        return LoadResult.Error(IOException("💥 forced test error"))
+
         if (params.key == null) {
             return LoadResult.Page(commentInfo.comments, null, commentInfo.nextPage)
         } else {