diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java index 53a872f616f994..f529a44911180a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java @@ -350,7 +350,7 @@ public void run() { // JS errors are reported here after source mapping. if (mRedBoxHandler != null) { mRedBoxHandler.handleRedbox(message, stack, RedBoxHandler.ErrorType.JS); - mRedBoxDialog.resetReporting(true); + mRedBoxDialog.resetReporting(); } mRedBoxDialog.show(); } @@ -403,10 +403,8 @@ public void run() { // inside {@link #updateJSError} after source mapping. if (mRedBoxHandler != null && errorType == ErrorType.NATIVE) { mRedBoxHandler.handleRedbox(message, stack, RedBoxHandler.ErrorType.NATIVE); - mRedBoxDialog.resetReporting(true); - } else { - mRedBoxDialog.resetReporting(false); } + mRedBoxDialog.resetReporting(); mRedBoxDialog.show(); } }); diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialog.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialog.java index f2611763c51acc..4c4d046da66768 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialog.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialog.java @@ -99,10 +99,11 @@ public void onClick(View view) { String sourceUrl = mDevSupportManager.getSourceUrl(); mRedBoxHandler.reportRedbox( - title, - stack, - sourceUrl, - Assertions.assertNotNull(mReportCompletedListener)); + view.getContext(), + title, + stack, + sourceUrl, + Assertions.assertNotNull(mReportCompletedListener)); } }; @@ -322,7 +323,7 @@ public void setExceptionDetails(String title, StackFrame[] stack) { /** * Show the report button, hide the report textview and the loading indicator. */ - public void resetReporting(boolean enabled) { + public void resetReporting() { if (mRedBoxHandler == null || !mRedBoxHandler.isReportEnabled()) { return; } @@ -330,8 +331,7 @@ public void resetReporting(boolean enabled) { Assertions.assertNotNull(mReportTextView).setVisibility(View.GONE); Assertions.assertNotNull(mLoadingIndicator).setVisibility(View.GONE); Assertions.assertNotNull(mLineSeparator).setVisibility(View.GONE); - Assertions.assertNotNull(mReportButton).setVisibility( - enabled ? View.VISIBLE : View.GONE); + Assertions.assertNotNull(mReportButton).setVisibility(View.VISIBLE); Assertions.assertNotNull(mReportButton).setEnabled(true); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxHandler.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxHandler.java index 33b8eb6b18abed..ad20145a21c6b8 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxHandler.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxHandler.java @@ -9,6 +9,7 @@ package com.facebook.react.devsupport; +import android.content.Context; import android.text.SpannedString; import com.facebook.react.devsupport.interfaces.StackFrame; @@ -54,8 +55,9 @@ interface ReportCompletedListener { * Report the information from the redbox and set up a callback listener. */ void reportRedbox( - String title, - StackFrame[] stack, - String sourceUrl, - ReportCompletedListener reportCompletedListener); + Context context, + String title, + StackFrame[] stack, + String sourceUrl, + ReportCompletedListener reportCompletedListener); }