Replace ErrorActivity with ErrorUtil

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

@@ -16,8 +16,8 @@ import org.acra.ACRA;
 import org.acra.config.ACRAConfigurationException;
 import org.acra.config.CoreConfiguration;
 import org.acra.config.CoreConfigurationBuilder;
-import org.schabi.newpipe.error.ErrorActivity;
 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.NewPipe;
@@ -217,7 +217,7 @@ public class App extends MultiDexApplication {
             ACRA.init(this, acraConfig);
         } catch (final ACRAConfigurationException exception) {
             exception.printStackTrace();
-            ErrorActivity.reportError(this, new ErrorInfo(exception,
+            ErrorUtil.openActivity(this, new ErrorInfo(exception,
                     UserAction.SOMETHING_ELSE, "Could not initialize ACRA crash report"));
         }
     }

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

@@ -21,8 +21,8 @@ import com.grack.nanojson.JsonObject;
 import com.grack.nanojson.JsonParser;
 import com.grack.nanojson.JsonParserException;
 
-import org.schabi.newpipe.error.ErrorActivity;
 import org.schabi.newpipe.error.ErrorInfo;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.extractor.downloader.Response;
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
@@ -64,7 +64,7 @@ public final class CheckForNewAppVersion extends IntentService {
             signatures = PackageInfoCompat.getSignatures(application.getPackageManager(),
                     application.getPackageName());
         } catch (final PackageManager.NameNotFoundException e) {
-            ErrorActivity.reportError(application, new ErrorInfo(e,
+            ErrorUtil.createNotification(application, new ErrorInfo(e,
                     UserAction.CHECK_FOR_NEW_APP_VERSION, "Could not find package info"));
             return "";
         }
@@ -79,7 +79,7 @@ public final class CheckForNewAppVersion extends IntentService {
             final CertificateFactory cf = CertificateFactory.getInstance("X509");
             c = (X509Certificate) cf.generateCertificate(input);
         } catch (final CertificateException e) {
-            ErrorActivity.reportError(application, new ErrorInfo(e,
+            ErrorUtil.createNotification(application, new ErrorInfo(e,
                     UserAction.CHECK_FOR_NEW_APP_VERSION, "Certificate error"));
             return "";
         }
@@ -89,7 +89,7 @@ public final class CheckForNewAppVersion extends IntentService {
             final byte[] publicKey = md.digest(c.getEncoded());
             return byte2HexFormatted(publicKey);
         } catch (NoSuchAlgorithmException | CertificateEncodingException e) {
-            ErrorActivity.reportError(application, new ErrorInfo(e,
+            ErrorUtil.createNotification(application, new ErrorInfo(e,
                     UserAction.CHECK_FOR_NEW_APP_VERSION, "Could not retrieve SHA1 key"));
             return "";
         }

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

@@ -63,7 +63,7 @@ import org.schabi.newpipe.databinding.DrawerHeaderBinding;
 import org.schabi.newpipe.databinding.DrawerLayoutBinding;
 import org.schabi.newpipe.databinding.InstanceSpinnerLayoutBinding;
 import org.schabi.newpipe.databinding.ToolbarLayoutBinding;
-import org.schabi.newpipe.error.ErrorActivity;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
@@ -157,7 +157,7 @@ public class MainActivity extends AppCompatActivity {
         try {
             setupDrawer();
         } catch (final Exception e) {
-            ErrorActivity.reportUiErrorInSnackbar(this, "Setting up drawer", e);
+            ErrorUtil.showUiErrorSnackbar(this, "Setting up drawer", e);
         }
 
         if (DeviceUtils.isTv(this)) {
@@ -214,7 +214,7 @@ public class MainActivity extends AppCompatActivity {
     /**
      * Builds the drawer menu for the current service.
      *
-     * @throws ExtractionException
+     * @throws ExtractionException if the service didn't provide available kiosks
      */
     private void addDrawerMenuForCurrentService() throws ExtractionException {
         //Tabs
@@ -266,7 +266,7 @@ public class MainActivity extends AppCompatActivity {
                 try {
                     tabSelected(item);
                 } catch (final Exception e) {
-                    ErrorActivity.reportUiErrorInSnackbar(this, "Selecting main page tab", e);
+                    ErrorUtil.showUiErrorSnackbar(this, "Selecting main page tab", e);
                 }
                 break;
             case R.id.menu_options_about_group:
@@ -372,7 +372,7 @@ public class MainActivity extends AppCompatActivity {
             try {
                 addDrawerMenuForCurrentService();
             } catch (final Exception e) {
-                ErrorActivity.reportUiErrorInSnackbar(this, "Showing main page tabs", e);
+                ErrorUtil.showUiErrorSnackbar(this, "Showing main page tabs", e);
             }
         }
     }
@@ -475,7 +475,7 @@ public class MainActivity extends AppCompatActivity {
             drawerHeaderBinding.drawerHeaderActionButton.setContentDescription(
                     getString(R.string.drawer_header_description) + selectedServiceName);
         } catch (final Exception e) {
-            ErrorActivity.reportUiErrorInSnackbar(this, "Setting up service toggle", e);
+            ErrorUtil.showUiErrorSnackbar(this, "Setting up service toggle", e);
         }
 
         final SharedPreferences sharedPreferences
@@ -785,7 +785,7 @@ public class MainActivity extends AppCompatActivity {
                 NavigationHelper.gotoMainFragment(getSupportFragmentManager());
             }
         } catch (final Exception e) {
-            ErrorActivity.reportUiErrorInSnackbar(this, "Handling intent", e);
+            ErrorUtil.showUiErrorSnackbar(this, "Handling intent", e);
         }
     }
 

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

@@ -37,8 +37,8 @@ import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.databinding.ListRadioIconItemBinding;
 import org.schabi.newpipe.databinding.SingleChoiceDialogViewBinding;
 import org.schabi.newpipe.download.DownloadDialog;
-import org.schabi.newpipe.error.ErrorActivity;
 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.Info;
@@ -231,7 +231,7 @@ public class RouterActivity extends AppCompatActivity {
         } else if (errorInfo.getThrowable() instanceof ContentNotSupportedException) {
             Toast.makeText(context, R.string.content_not_supported, Toast.LENGTH_LONG).show();
         } else {
-            ErrorActivity.reportError(context, errorInfo);
+            ErrorUtil.createNotification(context, errorInfo);
         }
 
         if (context instanceof RouterActivity) {

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

@@ -41,8 +41,8 @@ import com.nononsenseapps.filepicker.Utils;
 import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.databinding.DownloadDialogBinding;
-import org.schabi.newpipe.error.ErrorActivity;
 import org.schabi.newpipe.error.ErrorInfo;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.NewPipe;
@@ -402,7 +402,7 @@ public class DownloadDialog extends DialogFragment
                             == R.id.video_button) {
                         setupVideoSpinner();
                     }
-                }, throwable -> ErrorActivity.reportErrorInSnackbar(context,
+                }, throwable -> ErrorUtil.showSnackbar(context,
                         new ErrorInfo(throwable, UserAction.DOWNLOAD_OPEN_DIALOG,
                                 "Downloading video stream size",
                                 currentInfo.getServiceId()))));
@@ -412,7 +412,7 @@ public class DownloadDialog extends DialogFragment
                             == R.id.audio_button) {
                         setupAudioSpinner();
                     }
-                }, throwable -> ErrorActivity.reportErrorInSnackbar(context,
+                }, throwable -> ErrorUtil.showSnackbar(context,
                         new ErrorInfo(throwable, UserAction.DOWNLOAD_OPEN_DIALOG,
                                 "Downloading audio stream size",
                                 currentInfo.getServiceId()))));
@@ -422,7 +422,7 @@ public class DownloadDialog extends DialogFragment
                             == R.id.subtitle_button) {
                         setupSubtitleSpinner();
                     }
-                }, throwable -> ErrorActivity.reportErrorInSnackbar(context,
+                }, throwable -> ErrorUtil.showSnackbar(context,
                         new ErrorInfo(throwable, UserAction.DOWNLOAD_OPEN_DIALOG,
                                 "Downloading subtitle stream size",
                                 currentInfo.getServiceId()))));
@@ -799,7 +799,7 @@ public class DownloadDialog extends DialogFragment
                         mainStorage.getTag());
             }
         } catch (final Exception e) {
-            ErrorActivity.reportErrorInSnackbar(this,
+            ErrorUtil.createNotification(requireContext(),
                     new ErrorInfo(e, UserAction.DOWNLOAD_FAILED, "Getting storage"));
             return;
         }

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

@@ -33,7 +33,7 @@ public class AcraReportSender implements ReportSender {
 
     @Override
     public void send(@NonNull final Context context, @NonNull final CrashReportData report) {
-        ErrorActivity.reportError(context, new ErrorInfo(
+        ErrorUtil.openActivity(context, new ErrorInfo(
                 new String[]{report.getString(ReportField.STACK_TRACE)},
                 UserAction.UI_ERROR,
                 ErrorInfo.SERVICE_NONE,

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

@@ -52,7 +52,7 @@ import java.util.Arrays;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class ErrorActivity extends AppCompatActivity {
+public class ErrorActivity extends AppCompatActivity {
     // LOG TAGS
     public static final String TAG = ErrorActivity.class.toString();
     // BUNDLE TAGS

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

@@ -118,7 +118,7 @@ class ErrorPanelHelper(
             showAndSetErrorButtonAction(
                 R.string.error_snackbar_action
             ) {
-                ErrorActivity.reportError(context, errorInfo)
+                ErrorUtil.openActivity(context, errorInfo)
             }
 
             errorTextView.setText(getExceptionDescription(errorInfo.throwable))
@@ -178,7 +178,7 @@ class ErrorPanelHelper(
         val DEBUG: Boolean = MainActivity.DEBUG
 
         @StringRes
-        public fun getExceptionDescription(throwable: Throwable?): Int {
+        fun getExceptionDescription(throwable: Throwable?): Int {
             return when (throwable) {
                 is AgeRestrictedContentException -> R.string.restricted_video_no_stream
                 is GeographicRestrictionException -> R.string.georestricted_content

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

@@ -14,7 +14,7 @@ import org.schabi.newpipe.R
 
 class ErrorUtil {
     companion object {
-        private const val ERROR_REPORT_NOTIFICATION_ID = 5340681;
+        private const val ERROR_REPORT_NOTIFICATION_ID = 5340681
 
         /**
          * Reports a new error by starting a new activity.
@@ -62,35 +62,35 @@ class ErrorUtil {
         @JvmStatic
         fun createNotification(context: Context, errorInfo: ErrorInfo) {
             val notificationManager =
-                    ContextCompat.getSystemService(context, NotificationManager::class.java)
+                ContextCompat.getSystemService(context, NotificationManager::class.java)
             if (notificationManager == null) {
                 // this should never happen, but just in case open error activity
                 openActivity(context, errorInfo)
             }
 
             val notificationBuilder: NotificationCompat.Builder =
-                    NotificationCompat.Builder(context,
-                            context.getString(R.string.error_report_channel_id))
-                            .setSmallIcon(R.drawable.ic_bug_report)
-                            .setContentTitle(context.getString(R.string.error_report_title))
-                            .setContentText(context.getString(errorInfo.messageStringId))
+                NotificationCompat.Builder(
+                    context,
+                    context.getString(R.string.error_report_channel_id)
+                )
+                    .setSmallIcon(R.drawable.ic_bug_report)
+                    .setContentTitle(context.getString(R.string.error_report_title))
+                    .setContentText(context.getString(errorInfo.messageStringId))
 
             notificationManager!!.notify(ERROR_REPORT_NOTIFICATION_ID, notificationBuilder.build())
         }
 
-
         private fun showSnackbar(context: Context, rootView: View?, errorInfo: ErrorInfo) {
             if (rootView == null) {
                 // fallback to showing a notification if no root view is available
                 createNotification(context, errorInfo)
-
             } else {
                 Snackbar.make(rootView, R.string.error_snackbar_message, Snackbar.LENGTH_LONG)
-                        .setActionTextColor(Color.YELLOW)
-                        .setAction(context.getString(R.string.error_snackbar_action).uppercase()) {
-                            openActivity(context, errorInfo)
-                        }.show()
+                    .setActionTextColor(Color.YELLOW)
+                    .setAction(context.getString(R.string.error_snackbar_action).uppercase()) {
+                        openActivity(context, errorInfo)
+                    }.show()
             }
         }
     }
-}
+}

app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java

@@ -7,12 +7,13 @@ import android.widget.ProgressBar;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 
 import org.schabi.newpipe.BaseFragment;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.error.ErrorActivity;
 import org.schabi.newpipe.error.ErrorInfo;
 import org.schabi.newpipe.error.ErrorPanelHelper;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.util.InfoCache;
 
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -198,9 +199,8 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
     }
 
     /**
-     * Show a SnackBar and only call
-     * {@link ErrorActivity#reportErrorInSnackbar(androidx.fragment.app.Fragment, ErrorInfo)}
-     * IF we a find a valid view (otherwise the error screen appears).
+     * Directly calls {@link ErrorUtil#showSnackbar(Fragment, ErrorInfo)}, that shows a snackbar if
+     * a valid view can be found, otherwise creates an error report notification.
      *
      * @param errorInfo The error information
      */
@@ -208,6 +208,6 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
         if (DEBUG) {
             Log.d(TAG, "showSnackBarError() called with: errorInfo = [" + errorInfo + "]");
         }
-        ErrorActivity.reportErrorInSnackbar(this, errorInfo);
+        ErrorUtil.showSnackbar(this, errorInfo);
     }
 }

app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java

@@ -23,7 +23,7 @@ import com.google.android.material.tabs.TabLayout;
 import org.schabi.newpipe.BaseFragment;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.databinding.FragmentMainBinding;
-import org.schabi.newpipe.error.ErrorActivity;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.settings.tabs.Tab;
 import org.schabi.newpipe.settings.tabs.TabsManager;
@@ -145,7 +145,7 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
                 NavigationHelper.openSearchFragment(getFM(),
                         ServiceHelper.getSelectedServiceId(activity), "");
             } catch (final Exception e) {
-                ErrorActivity.reportUiErrorInSnackbar(this, "Opening search fragment", e);
+                ErrorUtil.showUiErrorSnackbar(this, "Opening search fragment", e);
             }
             return true;
         }
@@ -227,16 +227,11 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
         public Fragment getItem(final int position) {
             final Tab tab = internalTabsList.get(position);
 
-            Throwable throwable = null;
-            Fragment fragment = null;
+            final Fragment fragment;
             try {
                 fragment = tab.getFragment(context);
             } catch (final ExtractionException e) {
-                throwable = e;
-            }
-
-            if (throwable != null) {
-                ErrorActivity.reportUiErrorInSnackbar(context, "Getting fragment item", throwable);
+                ErrorUtil.showUiErrorSnackbar(context, "Getting fragment item", e);
                 return new BlankFragment();
             }
 

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

@@ -55,8 +55,8 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.databinding.FragmentVideoDetailBinding;
 import org.schabi.newpipe.download.DownloadDialog;
-import org.schabi.newpipe.error.ErrorActivity;
 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.InfoItem;
@@ -533,7 +533,7 @@ public final class VideoDetailFragment
             NavigationHelper.openChannelFragment(getFM(), currentInfo.getServiceId(),
                     subChannelUrl, subChannelName);
         } catch (final Exception e) {
-            ErrorActivity.reportUiErrorInSnackbar(this, "Opening channel fragment", e);
+            ErrorUtil.showUiErrorSnackbar(this, "Opening channel fragment", e);
         }
     }
 
@@ -1681,9 +1681,8 @@ public final class VideoDetailFragment
 
             downloadDialog.show(activity.getSupportFragmentManager(), "downloadDialog");
         } catch (final Exception e) {
-            ErrorActivity.reportErrorInSnackbar(activity,
-                    new ErrorInfo(e, UserAction.DOWNLOAD_OPEN_DIALOG, "Showing download dialog",
-                            currentInfo));
+            ErrorUtil.showSnackbar(activity, new ErrorInfo(e, UserAction.DOWNLOAD_OPEN_DIALOG,
+                    "Showing download dialog", currentInfo));
         }
     }
 

app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java

@@ -21,7 +21,7 @@ import androidx.viewbinding.ViewBinding;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.databinding.PignateFooterBinding;
-import org.schabi.newpipe.error.ErrorActivity;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
 import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
@@ -293,7 +293,7 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I>
                             selectedItem.getUrl(),
                             selectedItem.getName());
                 } catch (final Exception e) {
-                    ErrorActivity.reportUiErrorInSnackbar(
+                    ErrorUtil.showUiErrorSnackbar(
                             BaseListFragment.this, "Opening channel fragment", e);
                 }
             }
@@ -309,7 +309,7 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I>
                             selectedItem.getUrl(),
                             selectedItem.getName());
                 } catch (final Exception e) {
-                    ErrorActivity.reportUiErrorInSnackbar(BaseListFragment.this,
+                    ErrorUtil.showUiErrorSnackbar(BaseListFragment.this,
                             "Opening playlist fragment", e);
                 }
             }

app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java

@@ -26,8 +26,8 @@ import org.schabi.newpipe.database.subscription.SubscriptionEntity;
 import org.schabi.newpipe.databinding.ChannelHeaderBinding;
 import org.schabi.newpipe.databinding.FragmentChannelBinding;
 import org.schabi.newpipe.databinding.PlaylistControlBinding;
-import org.schabi.newpipe.error.ErrorActivity;
 import org.schabi.newpipe.error.ErrorInfo;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.ListExtractor;
@@ -407,7 +407,7 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
                                 currentInfo.getParentChannelUrl(),
                                 currentInfo.getParentChannelName());
                     } catch (final Exception e) {
-                        ErrorActivity.reportUiErrorInSnackbar(this, "Opening channel fragment", e);
+                        ErrorUtil.showUiErrorSnackbar(this, "Opening channel fragment", e);
                     }
                 } else if (DEBUG) {
                     Log.i(TAG, "Can't open parent channel because we got no channel URL");

app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java

@@ -24,8 +24,8 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
 import org.schabi.newpipe.databinding.PlaylistControlBinding;
 import org.schabi.newpipe.databinding.PlaylistHeaderBinding;
-import org.schabi.newpipe.error.ErrorActivity;
 import org.schabi.newpipe.error.ErrorInfo;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.ListExtractor;
@@ -310,7 +310,7 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
                         NavigationHelper.openChannelFragment(getFM(), result.getServiceId(),
                                 result.getUploaderUrl(), result.getUploaderName());
                     } catch (final Exception e) {
-                        ErrorActivity.reportUiErrorInSnackbar(this, "Opening channel fragment", e);
+                        ErrorUtil.showUiErrorSnackbar(this, "Opening channel fragment", e);
                     }
                 });
             }

app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java

@@ -38,8 +38,8 @@ import androidx.recyclerview.widget.RecyclerView;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.history.model.SearchHistoryEntry;
 import org.schabi.newpipe.databinding.FragmentSearchBinding;
-import org.schabi.newpipe.error.ErrorActivity;
 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.InfoItem;
@@ -225,8 +225,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
         try {
             service = NewPipe.getService(serviceId);
         } catch (final Exception e) {
-            ErrorActivity.reportUiErrorInSnackbar(this,
-                    "Getting service for id " + serviceId, e);
+            ErrorUtil.showUiErrorSnackbar(this, "Getting service for id " + serviceId, e);
         }
     }
 

app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java

@@ -13,7 +13,7 @@ import android.widget.TextView;
 import androidx.appcompat.app.AppCompatActivity;
 
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.error.ErrorActivity;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
@@ -171,7 +171,7 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
                     item.getUploaderUrl(),
                     item.getUploaderName());
         } catch (final Exception e) {
-            ErrorActivity.reportUiErrorInSnackbar(activity, "Opening channel fragment", e);
+            ErrorUtil.showUiErrorSnackbar(activity, "Opening channel fragment", e);
         }
     }
 

app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionsImportFragment.java

@@ -23,8 +23,8 @@ import androidx.core.text.util.LinkifyCompat;
 
 import org.schabi.newpipe.BaseFragment;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.error.ErrorActivity;
 import org.schabi.newpipe.error.ErrorInfo;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
@@ -86,7 +86,7 @@ public class SubscriptionsImportFragment extends BaseFragment {
 
         setupServiceVariables();
         if (supportedSources.isEmpty() && currentServiceId != Constants.NO_SERVICE_ID) {
-            ErrorActivity.reportErrorInSnackbar(activity,
+            ErrorUtil.showSnackbar(activity,
                     new ErrorInfo(new String[]{}, UserAction.SUBSCRIPTION_IMPORT_EXPORT,
                             NewPipe.getNameOfService(currentServiceId),
                             "Service does not support importing subscriptions",

app/src/main/java/org/schabi/newpipe/local/subscription/services/BaseImportExportService.java

@@ -35,8 +35,8 @@ import androidx.core.app.ServiceCompat;
 
 import org.reactivestreams.Publisher;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.error.ErrorActivity;
 import org.schabi.newpipe.error.ErrorInfo;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
 import org.schabi.newpipe.ktx.ExceptionUtils;
@@ -153,7 +153,7 @@ public abstract class BaseImportExportService extends Service {
 
     protected void stopAndReportError(final Throwable throwable, final String request) {
         stopService();
-        ErrorActivity.reportError(this, new ErrorInfo(
+        ErrorUtil.createNotification(this, new ErrorInfo(
                 throwable, UserAction.SUBSCRIPTION_IMPORT_EXPORT, request));
     }
 

app/src/main/java/org/schabi/newpipe/player/playererror/PlayerErrorHandler.java

@@ -13,8 +13,8 @@ import com.google.android.exoplayer2.ExoPlaybackException;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.error.EnsureExceptionSerializable;
-import org.schabi.newpipe.error.ErrorActivity;
 import org.schabi.newpipe.error.ErrorInfo;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.extractor.Info;
 
@@ -67,7 +67,7 @@ public class PlayerErrorHandler {
 
     private void reportError(@NonNull final ExoPlaybackException exception,
                              @NonNull final Info info) {
-        ErrorActivity.reportError(
+        ErrorUtil.createNotification(
                 context,
                 new ErrorInfo(
                         EnsureExceptionSerializable.ensureSerializable(exception),

app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java

@@ -20,7 +20,7 @@ import androidx.preference.PreferenceManager;
 import org.schabi.newpipe.DownloaderImpl;
 import org.schabi.newpipe.NewPipeDatabase;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.error.ErrorActivity;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.error.ReCaptchaActivity;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.localization.ContentCountry;
@@ -205,7 +205,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
             saveLastImportExportDataUri(exportDataUri); // save export path only on success
             Toast.makeText(getContext(), R.string.export_complete_toast, Toast.LENGTH_SHORT).show();
         } catch (final Exception e) {
-            ErrorActivity.reportUiErrorInSnackbar(this, "Exporting database", e);
+            ErrorUtil.showUiErrorSnackbar(this, "Exporting database", e);
         }
     }
 
@@ -247,7 +247,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
                 finishImport(importDataUri);
             }
         } catch (final Exception e) {
-            ErrorActivity.reportUiErrorInSnackbar(this, "Importing database", e);
+            ErrorUtil.showUiErrorSnackbar(this, "Importing database", e);
         }
     }
 

app/src/main/java/org/schabi/newpipe/settings/HistorySettingsFragment.java

@@ -9,8 +9,8 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.preference.Preference;
 
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.error.ErrorActivity;
 import org.schabi.newpipe.error.ErrorInfo;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.util.InfoCache;
@@ -64,7 +64,7 @@ public class HistorySettingsFragment extends BasePreferenceFragment {
                 .subscribe(
                         howManyDeleted -> Toast.makeText(context,
                                 R.string.watch_history_states_deleted,  Toast.LENGTH_SHORT).show(),
-                        throwable -> ErrorActivity.reportError(context,
+                        throwable -> ErrorUtil.openActivity(context,
                                 new ErrorInfo(throwable, UserAction.DELETE_FROM_HISTORY,
                                         "Delete playback states")));
     }
@@ -76,7 +76,7 @@ public class HistorySettingsFragment extends BasePreferenceFragment {
                 .subscribe(
                         howManyDeleted -> Toast.makeText(context,
                                 R.string.watch_history_deleted, Toast.LENGTH_SHORT).show(),
-                        throwable -> ErrorActivity.reportError(context,
+                        throwable -> ErrorUtil.openActivity(context,
                                 new ErrorInfo(throwable, UserAction.DELETE_FROM_HISTORY,
                                         "Delete from history")));
     }
@@ -87,7 +87,7 @@ public class HistorySettingsFragment extends BasePreferenceFragment {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
                         howManyDeleted -> { },
-                        throwable -> ErrorActivity.reportError(context,
+                        throwable -> ErrorUtil.openActivity(context,
                                 new ErrorInfo(throwable, UserAction.DELETE_FROM_HISTORY,
                                         "Clear orphaned records")));
     }
@@ -99,7 +99,7 @@ public class HistorySettingsFragment extends BasePreferenceFragment {
                 .subscribe(
                         howManyDeleted -> Toast.makeText(context,
                                 R.string.search_history_deleted, Toast.LENGTH_SHORT).show(),
-                        throwable -> ErrorActivity.reportError(context,
+                        throwable -> ErrorUtil.openActivity(context,
                                 new ErrorInfo(throwable, UserAction.DELETE_FROM_HISTORY,
                                         "Delete search history")));
     }

app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java

@@ -16,7 +16,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.subscription.SubscriptionEntity;
-import org.schabi.newpipe.error.ErrorActivity;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.local.subscription.SubscriptionManager;
 import org.schabi.newpipe.util.PicassoHelper;
 import org.schabi.newpipe.util.ThemeHelper;
@@ -153,7 +153,7 @@ public class SelectChannelFragment extends DialogFragment {
 
             @Override
             public void onError(@NonNull final Throwable exception) {
-                ErrorActivity.reportUiErrorInSnackbar(SelectChannelFragment.this,
+                ErrorUtil.showUiErrorSnackbar(SelectChannelFragment.this,
                         "Loading subscription", exception);
             }
 

app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java

@@ -16,7 +16,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.error.ErrorActivity;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.util.KioskTranslator;
@@ -48,7 +48,6 @@ import java.util.Vector;
  */
 
 public class SelectKioskFragment extends DialogFragment {
-    private RecyclerView recyclerView = null;
     private SelectKioskAdapter selectKioskAdapter = null;
 
     private OnSelectedListener onSelectedListener = null;
@@ -76,12 +75,12 @@ public class SelectKioskFragment extends DialogFragment {
     public View onCreateView(final LayoutInflater inflater, final ViewGroup container,
                              final Bundle savedInstanceState) {
         final View v = inflater.inflate(R.layout.select_kiosk_fragment, container, false);
-        recyclerView = v.findViewById(R.id.items_list);
+        final RecyclerView recyclerView = v.findViewById(R.id.items_list);
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         try {
             selectKioskAdapter = new SelectKioskAdapter();
         } catch (final Exception e) {
-            ErrorActivity.reportUiErrorInSnackbar(this, "Selecting kiosk", e);
+            ErrorUtil.showUiErrorSnackbar(this, "Selecting kiosk", e);
         }
         recyclerView.setAdapter(selectKioskAdapter);
 

app/src/main/java/org/schabi/newpipe/settings/SelectPlaylistFragment.java

@@ -1,6 +1,5 @@
 package org.schabi.newpipe.settings;
 
-import android.app.Activity;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -21,8 +20,8 @@ import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.playlist.PlaylistLocalItem;
 import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;
 import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
-import org.schabi.newpipe.error.ErrorActivity;
 import org.schabi.newpipe.error.ErrorInfo;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.local.playlist.LocalPlaylistManager;
 import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
@@ -105,8 +104,7 @@ public class SelectPlaylistFragment extends DialogFragment {
     }
 
     protected void onError(final Throwable e) {
-        final Activity activity = requireActivity();
-        ErrorActivity.reportErrorInSnackbar(activity, new ErrorInfo(e,
+        ErrorUtil.showSnackbar(requireActivity(), new ErrorInfo(e,
                 UserAction.UI_ERROR, "Loading playlists"));
     }
 

app/src/main/java/org/schabi/newpipe/settings/SettingMigrations.java

@@ -8,8 +8,8 @@ import android.util.Log;
 import androidx.preference.PreferenceManager;
 
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.error.ErrorActivity;
 import org.schabi.newpipe.error.ErrorInfo;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.util.DeviceUtils;
 
@@ -157,7 +157,7 @@ public final class SettingMigrations {
             } catch (final Exception e) {
                 // save the version with the last successful migration and report the error
                 sp.edit().putInt(lastPrefVersionKey, currentVersion).apply();
-                ErrorActivity.reportError(context, new ErrorInfo(
+                ErrorUtil.openActivity(context, new ErrorInfo(
                         e,
                         UserAction.PREFERENCES_MIGRATION,
                         "Migrating preferences from version " + lastPrefVersion + " to "

app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java

@@ -27,8 +27,8 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.error.ErrorActivity;
 import org.schabi.newpipe.error.ErrorInfo;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.settings.SelectChannelFragment;
@@ -182,7 +182,7 @@ public class ChooseTabsFragment extends Fragment {
         final Tab.Type type = typeFrom(tabId);
 
         if (type == null) {
-            ErrorActivity.reportErrorInSnackbar(this,
+            ErrorUtil.showSnackbar(this,
                     new ErrorInfo(new IllegalStateException("Tab id not found: " + tabId),
                             UserAction.SOMETHING_ELSE, "Choosing tabs on settings"));
             return;

app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java

@@ -12,8 +12,8 @@ import com.grack.nanojson.JsonSink;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.LocalItem.LocalItemType;
-import org.schabi.newpipe.error.ErrorActivity;
 import org.schabi.newpipe.error.ErrorInfo;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
@@ -506,7 +506,7 @@ public abstract class Tab {
                 final StreamingService service = NewPipe.getService(kioskServiceId);
                 kioskId = service.getKioskList().getDefaultKioskId();
             } catch (final ExtractionException e) {
-                ErrorActivity.reportErrorInSnackbar(context, new ErrorInfo(e,
+                ErrorUtil.showSnackbar(context, new ErrorInfo(e,
                         UserAction.REQUESTED_KIOSK, "Loading default kiosk for selected service"));
             }
             return kioskId;

app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java

@@ -39,8 +39,8 @@ import com.google.android.material.snackbar.Snackbar;
 
 import org.schabi.newpipe.BuildConfig;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.error.ErrorActivity;
 import org.schabi.newpipe.error.ErrorInfo;
 import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.util.Localization;
@@ -581,7 +581,7 @@ public class MissionAdapter extends Adapter<ViewHolder> implements Handler.Callb
             service = ErrorInfo.SERVICE_NONE;
         }
 
-        ErrorActivity.reportError(mContext,
+        ErrorUtil.createNotification(mContext,
                 new ErrorInfo(ErrorInfo.Companion.throwableToStringList(mission.errObject), action,
                         service, request.toString(), reason, null));
     }