Optimize imports and solve checkstyle issues

2020-12-11 15:07:18 +01:00 · 2020-12-11 15:07:18 +01:00 · 1fc8e4c148
parent c43bca6007
commit 1fc8e4c148
25 changed files with 101 additions and 98 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -155,7 +155,7 @@ task formatKtlint(type: JavaExec) {
 }

 afterEvaluate {
-    //preDebugBuild.dependsOn formatKtlint, runCheckstyle, runKtlint
+    preDebugBuild.dependsOn formatKtlint, runCheckstyle, runKtlint
 }

 dependencies {
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@ -60,6 +60,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.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
@ -72,7 +73,6 @@ import org.schabi.newpipe.player.Player;
 import org.schabi.newpipe.player.event.OnKeyDownListener;
 import org.schabi.newpipe.player.helper.PlayerHolder;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
-import org.schabi.newpipe.error.ErrorActivity;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.KioskTranslator;
@ -679,19 +679,16 @@ public class MainActivity extends AppCompatActivity {
    }

    @Override
-    public boolean onOptionsItemSelected(final MenuItem item) {
+    public boolean onOptionsItemSelected(@NonNull final MenuItem item) {
        if (DEBUG) {
            Log.d(TAG, "onOptionsItemSelected() called with: item = [" + item + "]");
        }
-        final int id = item.getItemId();

-        switch (id) {
-            case android.R.id.home:
-                onHomeButtonPressed();
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
+        if (item.getItemId() == android.R.id.home) {
+            onHomeButtonPressed();
+            return true;
        }
+        return super.onOptionsItemSelected(item);
    }

    /*//////////////////////////////////////////////////////////////////////////
--- a/app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistStreamEntry.kt
+++ b/app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistStreamEntry.kt
@ -7,7 +7,6 @@ import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity
 import org.schabi.newpipe.database.stream.model.StreamEntity
 import org.schabi.newpipe.database.stream.model.StreamStateEntity
 import org.schabi.newpipe.extractor.stream.StreamInfoItem
-import kotlin.jvm.Throws

 data class PlaylistStreamEntry(
    @Embedded
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
@ -37,6 +37,9 @@ import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.RouterActivity;
 import org.schabi.newpipe.databinding.DownloadDialogBinding;
+import org.schabi.newpipe.error.ErrorActivity;
+import org.schabi.newpipe.error.ErrorInfo;
+import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.localization.Localization;
@ -45,9 +48,6 @@ import org.schabi.newpipe.extractor.stream.Stream;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.SubtitlesStream;
 import org.schabi.newpipe.extractor.stream.VideoStream;
-import org.schabi.newpipe.error.ErrorActivity;
-import org.schabi.newpipe.error.ErrorInfo;
-import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.settings.NewPipeSettings;
 import org.schabi.newpipe.util.FilePickerActivityHelper;
 import org.schabi.newpipe.util.FilenameUtils;
@ -61,7 +61,6 @@ import org.schabi.newpipe.util.ThemeHelper;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Locale;

--- a/app/src/main/java/org/schabi/newpipe/error/ErrorActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/error/ErrorActivity.java
@ -259,7 +259,8 @@ public class ErrorActivity extends AppCompatActivity {
    }

    private void goToReturnActivity() {
-        final Class<? extends Activity> checkedReturnActivity = getReturnActivity(savedReturnActivity);
+        final Class<? extends Activity> checkedReturnActivity =
+                getReturnActivity(savedReturnActivity);
        if (checkedReturnActivity == null) {
            super.onBackPressed();
        } else {
--- a/app/src/main/java/org/schabi/newpipe/error/ErrorInfo.kt
+++ b/app/src/main/java/org/schabi/newpipe/error/ErrorInfo.kt
@ -16,58 +16,58 @@ import java.io.StringWriter

@Parcelize
 class ErrorInfo(
-        val stackTraces: Array<String>,
-        val userAction: UserAction,
-        val serviceName: String,
-        val request: String,
-        val messageStringId: Int,
-        @Transient // no need to store throwable, all data for report is in other variables
-        var throwable: Throwable? = null
+    val stackTraces: Array<String>,
+    val userAction: UserAction,
+    val serviceName: String,
+    val request: String,
+    val messageStringId: Int,
+    @Transient // no need to store throwable, all data for report is in other variables
+    var throwable: Throwable? = null
 ) : Parcelable {

    private constructor(
-            throwable: Throwable,
-            userAction: UserAction,
-            serviceName: String,
-            request: String
+        throwable: Throwable,
+        userAction: UserAction,
+        serviceName: String,
+        request: String
    ) : this(
-            throwableToStringList(throwable),
-            userAction,
-            serviceName,
-            request,
-            getMessageStringId(throwable, userAction),
-            throwable
+        throwableToStringList(throwable),
+        userAction,
+        serviceName,
+        request,
+        getMessageStringId(throwable, userAction),
+        throwable
    )

    private constructor(
-            throwable: List<Throwable>,
-            userAction: UserAction,
-            serviceName: String,
-            request: String
+        throwable: List<Throwable>,
+        userAction: UserAction,
+        serviceName: String,
+        request: String
    ) : this(
-            throwableListToStringList(throwable),
-            userAction,
-            serviceName,
-            request,
-            getMessageStringId(throwable.firstOrNull(), userAction),
-            throwable.firstOrNull()
+        throwableListToStringList(throwable),
+        userAction,
+        serviceName,
+        request,
+        getMessageStringId(throwable.firstOrNull(), userAction),
+        throwable.firstOrNull()
    )

    // constructors with single throwable
-    constructor(throwable: Throwable, userAction: UserAction, request: String)
-            : this(throwable, userAction, SERVICE_NONE, request)
-    constructor(throwable: Throwable, userAction: UserAction, request: String, serviceId: Int)
-            : this(throwable, userAction, NewPipe.getNameOfService(serviceId), request)
-    constructor(throwable: Throwable, userAction: UserAction, request: String, info: Info?)
-            : this(throwable, userAction, getInfoServiceName(info), request)
+    constructor(throwable: Throwable, userAction: UserAction, request: String) :
+        this(throwable, userAction, SERVICE_NONE, request)
+    constructor(throwable: Throwable, userAction: UserAction, request: String, serviceId: Int) :
+        this(throwable, userAction, NewPipe.getNameOfService(serviceId), request)
+    constructor(throwable: Throwable, userAction: UserAction, request: String, info: Info?) :
+        this(throwable, userAction, getInfoServiceName(info), request)

    // constructors with list of throwables
-    constructor(throwable: List<Throwable>, userAction: UserAction, request: String)
-            : this(throwable, userAction, SERVICE_NONE, request)
-    constructor(throwable: List<Throwable>, userAction: UserAction, request: String, serviceId: Int)
-            : this(throwable, userAction, NewPipe.getNameOfService(serviceId), request)
-    constructor(throwable: List<Throwable>, userAction: UserAction, request: String, info: Info?)
-            : this(throwable, userAction, getInfoServiceName(info), request)
+    constructor(throwable: List<Throwable>, userAction: UserAction, request: String) :
+        this(throwable, userAction, SERVICE_NONE, request)
+    constructor(throwable: List<Throwable>, userAction: UserAction, request: String, serviceId: Int) :
+        this(throwable, userAction, NewPipe.getNameOfService(serviceId), request)
+    constructor(throwable: List<Throwable>, userAction: UserAction, request: String, info: Info?) :
+        this(throwable, userAction, getInfoServiceName(info), request)

    companion object {
        const val SERVICE_NONE = "none"
@ -87,18 +87,20 @@ class ErrorInfo(
            Array(throwable.size) { i -> getStackTrace(throwable[i]) }

        private fun getInfoServiceName(info: Info?) =
-                if (info == null) SERVICE_NONE else NewPipe.getNameOfService(info.serviceId)
+            if (info == null) SERVICE_NONE else NewPipe.getNameOfService(info.serviceId)

        @StringRes
-        private fun getMessageStringId(throwable: Throwable?,
-                                       action: UserAction): Int {
+        private fun getMessageStringId(
+            throwable: Throwable?,
+            action: UserAction
+        ): Int {
            return when {
                throwable is ContentNotAvailableException -> R.string.content_not_available
                throwable != null && throwable.isNetworkRelated -> R.string.network_error
                throwable is ContentNotSupportedException -> R.string.content_not_supported
                throwable is DeobfuscateException -> R.string.youtube_signature_deobfuscation_error
                throwable is ExtractionException -> R.string.parsing_error
-                action == UserAction.UI_ERROR ->  R.string.app_ui_crash
+                action == UserAction.UI_ERROR -> R.string.app_ui_crash
                action == UserAction.REQUESTED_COMMENTS -> R.string.error_unable_to_load_comments
                action == UserAction.SUBSCRIPTION_CHANGE -> R.string.subscription_change_failed
                action == UserAction.SUBSCRIPTION_UPDATE -> R.string.subscription_update_failed
--- a/app/src/main/java/org/schabi/newpipe/error/ErrorPanelHelper.kt
+++ b/app/src/main/java/org/schabi/newpipe/error/ErrorPanelHelper.kt
@ -28,9 +28,9 @@ import org.schabi.newpipe.ktx.isNetworkRelated
 import java.util.concurrent.TimeUnit

 class ErrorPanelHelper(
-        private val fragment: Fragment,
-        rootView: View,
-        onRetry: Runnable
+    private val fragment: Fragment,
+    rootView: View,
+    onRetry: Runnable
 ) {
    private val context: Context = rootView.context!!
    private val errorPanelRoot: View = rootView.findViewById(R.id.error_panel)
@ -62,22 +62,23 @@ class ErrorPanelHelper(
            errorButtonAction.setOnClickListener {
                // Starting ReCaptcha Challenge Activity
                val intent = Intent(context, ReCaptchaActivity::class.java)
-                intent.putExtra(ReCaptchaActivity.RECAPTCHA_URL_EXTRA,
-                        (errorInfo.throwable as ReCaptchaException).url)
+                intent.putExtra(
+                    ReCaptchaActivity.RECAPTCHA_URL_EXTRA,
+                    (errorInfo.throwable as ReCaptchaException).url
+                )
                fragment.startActivityForResult(intent, ReCaptchaActivity.RECAPTCHA_REQUEST)
                errorButtonAction.setOnClickListener(null)
            }
            errorTextView.setText(R.string.recaptcha_request_toast)
            errorButtonRetry.isVisible = true
-
        } else {
            errorButtonAction.setText(R.string.error_snackbar_action)
            errorButtonAction.setOnClickListener {
                ErrorActivity.reportError(
-                        context,
-                        MainActivity::class.java,
-                        null,
-                        errorInfo
+                    context,
+                    MainActivity::class.java,
+                    null,
+                    errorInfo
                )
            }

--- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
@ -306,7 +306,8 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I>
                            selectedItem.getUrl(),
                            selectedItem.getName());
                } catch (final Exception e) {
-                    ErrorActivity.reportUiError(getActivity(), null, "Opening playlist fragment", e);
+                    ErrorActivity.reportUiError(getActivity(), null,
+                            "Opening playlist fragment", e);
                }
            }
        });
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
@ -403,7 +403,8 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
                                currentInfo.getParentChannelUrl(),
                                currentInfo.getParentChannelName());
                    } catch (final Exception e) {
-                        ErrorActivity.reportUiError(getActivity(), null, "Opening channel fragment", e);
+                        ErrorActivity.reportUiError(getActivity(), null,
+                                "Opening channel fragment", e);
                    }
                } else if (DEBUG) {
                    Log.i(TAG, "Can't open parent channel because we got no channel URL");
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/DefaultKioskFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/DefaultKioskFragment.java
@ -3,10 +3,10 @@ package org.schabi.newpipe.fragments.list.kiosk;
 import android.os.Bundle;

 import org.schabi.newpipe.error.ErrorInfo;
+import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.kiosk.KioskList;
-import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.util.KioskTranslator;
 import org.schabi.newpipe.util.ServiceHelper;

--- a/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java
@ -13,6 +13,7 @@ import androidx.appcompat.app.ActionBar;

 import org.schabi.newpipe.R;
 import org.schabi.newpipe.error.ErrorInfo;
+import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
@ -21,7 +22,6 @@ import org.schabi.newpipe.extractor.kiosk.KioskInfo;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
 import org.schabi.newpipe.extractor.localization.ContentCountry;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
-import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.KioskTranslator;
 import org.schabi.newpipe.util.Localization;
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
@ -286,7 +286,8 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
                        NavigationHelper.openChannelFragment(getFM(), result.getServiceId(),
                                result.getUploaderUrl(), result.getUploaderName());
                    } catch (final Exception e) {
-                        ErrorActivity.reportUiError(getActivity(), null, "Opening channel fragment", e);
+                        ErrorActivity.reportUiError(getActivity(), null,
+                                "Opening channel fragment", e);
                    }
                });
            }
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
@ -845,7 +845,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
        disposables.add(historyRecordManager.onSearched(serviceId, theSearchString)
                .observeOn(AndroidSchedulers.mainThread())
                .subscribe(
-                        ignored -> {},
+                        ignored -> { },
                        throwable -> showSnackBarError(new ErrorInfo(throwable, UserAction.SEARCHED,
                                theSearchString, serviceId))
                ));
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java
@ -16,12 +16,11 @@ import androidx.viewbinding.ViewBinding;

 import org.schabi.newpipe.R;
 import org.schabi.newpipe.databinding.RelatedStreamsHeaderBinding;
+import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.extractor.ListExtractor;
-import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
 import org.schabi.newpipe.ktx.ViewUtils;
-import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.util.RelatedStreamInfo;

 import java.io.Serializable;
@ -160,11 +159,9 @@ public class RelatedVideosFragment extends BaseListInfoFragment<RelatedStreamInf
    @Override
    protected void onRestoreInstanceState(@NonNull final Bundle savedState) {
        super.onRestoreInstanceState(savedState);
-        if (savedState != null) {
-            final Serializable serializable = savedState.getSerializable(INFO_KEY);
-            if (serializable instanceof RelatedStreamInfo) {
-                this.relatedStreamInfo = (RelatedStreamInfo) serializable;
-            }
+        final Serializable serializable = savedState.getSerializable(INFO_KEY);
+        if (serializable instanceof RelatedStreamInfo) {
+            this.relatedStreamInfo = (RelatedStreamInfo) serializable;
        }
    }

--- a/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
@ -24,10 +24,10 @@ 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.ErrorInfo;
+import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.local.BaseLocalListFragment;
 import org.schabi.newpipe.local.playlist.LocalPlaylistManager;
 import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
-import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.OnClickGesture;

--- a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
@ -722,7 +722,7 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt

            @Override
            public void onSwiped(@NonNull final RecyclerView.ViewHolder viewHolder,
-                                 final int swipeDir) {}
+                                 final int swipeDir) { }
        };
    }

--- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionsImportFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionsImportFragment.java
@ -22,13 +22,13 @@ import com.nononsenseapps.filepicker.Utils;

 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.UserAction;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
 import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService;
-import org.schabi.newpipe.error.ErrorActivity;
-import org.schabi.newpipe.error.ErrorInfo;
-import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.FilePickerActivityHelper;
 import org.schabi.newpipe.util.ServiceHelper;
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt
@ -42,7 +42,6 @@ import org.schabi.newpipe.local.subscription.item.PickerSubscriptionItem
 import org.schabi.newpipe.util.DeviceUtils
 import org.schabi.newpipe.util.ThemeHelper
 import java.io.Serializable
-import kotlin.collections.contains

 class FeedGroupDialog : DialogFragment(), BackPressable {
    private var _feedGroupCreateBinding: DialogFeedGroupCreateBinding? = null
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt
@ -24,6 +24,10 @@ import org.schabi.newpipe.local.subscription.dialog.FeedGroupReorderDialogViewMo
 import org.schabi.newpipe.local.subscription.item.FeedGroupReorderItem
 import org.schabi.newpipe.util.ThemeHelper
 import java.util.Collections
+import kotlin.collections.ArrayList
+import kotlin.collections.List
+import kotlin.collections.map
+import kotlin.collections.sortedBy

 class FeedGroupReorderDialog : DialogFragment() {
    private var _binding: DialogFeedGroupReorderBinding? = null
--- a/app/src/main/java/org/schabi/newpipe/settings/HistorySettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/HistorySettingsFragment.java
@ -10,10 +10,10 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.preference.Preference;

 import org.schabi.newpipe.R;
-import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.error.ErrorActivity;
 import org.schabi.newpipe.error.ErrorInfo;
 import org.schabi.newpipe.error.UserAction;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.util.InfoCache;

 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
@ -91,7 +91,7 @@ public class HistorySettingsFragment extends BasePreferenceFragment {
        return recordManager.removeOrphanedRecords()
                .observeOn(AndroidSchedulers.mainThread())
                .subscribe(
-                        howManyDeleted -> {},
+                        howManyDeleted -> { },
                        throwable -> ErrorActivity.reportError(context, SettingsActivity.class,
                                null, new ErrorInfo(throwable, UserAction.DELETE_FROM_HISTORY,
                                        "Clear orphaned records")));
--- a/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java
@ -162,7 +162,8 @@ public class SelectChannelFragment extends DialogFragment {

            @Override
            public void onError(@NonNull final Throwable exception) {
-                ErrorActivity.reportUiError(requireContext(), null, "Loading subscription", exception);
+                ErrorActivity.reportUiError(requireContext(), null,
+                        "Loading subscription", exception);
            }

            @Override
--- a/app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java
@ -15,9 +15,9 @@ 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.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.error.ErrorActivity;
 import org.schabi.newpipe.util.KioskTranslator;
 import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.util.ThemeHelper;
--- a/app/src/main/java/org/schabi/newpipe/settings/SelectPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SelectPlaylistFragment.java
@ -24,11 +24,11 @@ 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.local.playlist.LocalPlaylistManager;
-import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
 import org.schabi.newpipe.error.ErrorActivity;
 import org.schabi.newpipe.error.ErrorInfo;
 import org.schabi.newpipe.error.UserAction;
+import org.schabi.newpipe.local.playlist.LocalPlaylistManager;
+import org.schabi.newpipe.local.playlist.RemotePlaylistManager;

 import java.util.List;
 import java.util.Vector;
--- a/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java
@ -27,10 +27,10 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;

 import org.schabi.newpipe.R;
-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.extractor.NewPipe;
 import org.schabi.newpipe.settings.SelectChannelFragment;
 import org.schabi.newpipe.settings.SelectKioskFragment;
 import org.schabi.newpipe.settings.SelectPlaylistFragment;
--- a/app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java
@ -12,6 +12,9 @@ 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.UserAction;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
@ -25,9 +28,6 @@ import org.schabi.newpipe.local.feed.FeedFragment;
 import org.schabi.newpipe.local.history.StatisticsPlaylistFragment;
 import org.schabi.newpipe.local.playlist.LocalPlaylistFragment;
 import org.schabi.newpipe.local.subscription.SubscriptionFragment;
-import org.schabi.newpipe.error.ErrorActivity;
-import org.schabi.newpipe.error.ErrorInfo;
-import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.util.KioskTranslator;
 import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.util.ThemeHelper;