Fix lint (fourth batch)

ShareASmile · Nov 5, 2023 · 72da350 · 72da350
1 parent 1fc0d67
commit 72da350
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 39 deletions.
diff --git a/app/src/main/java/org/schabi/newpipelegacy/database/subscription/SubscriptionDAO.kt b/app/src/main/java/org/schabi/newpipelegacy/database/subscription/SubscriptionDAO.kt
@@ -21,18 +21,18 @@ abstract class SubscriptionDAO : BasicDAO<SubscriptionEntity> {
     abstract override fun getAll(): Flowable<List<SubscriptionEntity>>
 
     @Query(
-	    """
+    """
         SELECT * FROM subscriptions
 
         WHERE name LIKE '%' || :filter || '%'
 
         ORDER BY name COLLATE NOCASE ASC
         """
-	)
+    )
     abstract fun getSubscriptionsFiltered(filter: String): Flowable<List<SubscriptionEntity>>
 
     @Query(
-	    """
+    """
         SELECT * FROM subscriptions s
 
         LEFT JOIN feed_group_subscription_join fgs
@@ -42,13 +42,13 @@ abstract class SubscriptionDAO : BasicDAO<SubscriptionEntity> {
 
         ORDER BY name COLLATE NOCASE ASC
         """
-	)
+    )
     abstract fun getSubscriptionsOnlyUngrouped(
         currentGroupId: Long
     ): Flowable<List<SubscriptionEntity>>
 
     @Query(
-	    """
+    """
         SELECT * FROM subscriptions s
 
         LEFT JOIN feed_group_subscription_join fgs
@@ -59,7 +59,7 @@ abstract class SubscriptionDAO : BasicDAO<SubscriptionEntity> {
 
         ORDER BY name COLLATE NOCASE ASC
         """
-	)
+    )
     abstract fun getSubscriptionsOnlyUngroupedFiltered(
         currentGroupId: Long,
         filter: String

diff --git a/app/src/main/java/org/schabi/newpipelegacy/local/feed/FeedFragment.kt b/app/src/main/java/org/schabi/newpipelegacy/local/feed/FeedFragment.kt
@@ -262,9 +262,9 @@ class FeedFragment : BaseListFragment<FeedState, Unit>() {
 
         if (loadedState.itemsErrors.isNotEmpty()) {
             showSnackBarError(
-			    loadedState.itemsErrors, UserAction.REQUESTED_FEED,
+                loadedState.itemsErrors, UserAction.REQUESTED_FEED,
                 "none", "Loading feed", R.string.general_error
-			)
+            )
         }
 
         if (loadedState.items.isEmpty()) {
@@ -308,10 +308,10 @@ class FeedFragment : BaseListFragment<FeedState, Unit>() {
 
     private fun triggerUpdate() {
         getActivity()?.startService(
-		    Intent(requireContext(), FeedLoadService::class.java).apply {
+            Intent(requireContext(), FeedLoadService::class.java).apply {
                 putExtra(FeedLoadService.EXTRA_GROUP_ID, groupId)
             }
-	    )
+        )
         listState = null
     }
 

diff --git a/app/src/main/java/org/schabi/newpipelegacy/local/feed/FeedViewModel.kt b/app/src/main/java/org/schabi/newpipelegacy/local/feed/FeedViewModel.kt
@@ -55,13 +55,13 @@ class FeedViewModel(applicationContext: Context, val groupId: Long = FeedGroupEn
                 oldestUpdate?.let { Calendar.getInstance().apply { time = it } }
 
             mutableStateLiveData.postValue(
-			    when (event) {
+                when (event) {
                     is IdleEvent -> FeedState.LoadedState(listFromDB, oldestUpdateCalendar, notLoadedCount)
                     is ProgressEvent -> FeedState.ProgressState(event.currentProgress, event.maxProgress, event.progressMessage)
                     is SuccessResultEvent -> FeedState.LoadedState(listFromDB, oldestUpdateCalendar, notLoadedCount, event.itemsErrors)
                     is ErrorResultEvent -> FeedState.ErrorState(event.error)
                 }
-			)
+            )
 
             if (event is ErrorResultEvent || event is SuccessResultEvent) {
                 FeedEventManager.reset()

diff --git a/app/src/main/java/org/schabi/newpipelegacy/local/feed/service/FeedLoadService.kt b/app/src/main/java/org/schabi/newpipelegacy/local/feed/service/FeedLoadService.kt
@@ -42,13 +42,13 @@ import io.reactivex.processors.PublishProcessor
 import io.reactivex.schedulers.Schedulers
 import org.reactivestreams.Subscriber
 import org.reactivestreams.Subscription
+import org.schabi.newpipe.extractor.ListInfo
+import org.schabi.newpipe.extractor.exceptions.ReCaptchaException
+import org.schabi.newpipe.extractor.stream.StreamInfoItem
 import org.schabi.newpipelegacy.App
 import org.schabi.newpipelegacy.MainActivity.DEBUG
 import org.schabi.newpipelegacy.R
 import org.schabi.newpipelegacy.database.feed.model.FeedGroupEntity
-import org.schabi.newpipe.extractor.ListInfo
-import org.schabi.newpipe.extractor.exceptions.ReCaptchaException
-import org.schabi.newpipe.extractor.stream.StreamInfoItem
 import org.schabi.newpipelegacy.local.feed.FeedDatabaseManager
 import org.schabi.newpipelegacy.local.feed.service.FeedEventManager.Event.ErrorResultEvent
 import org.schabi.newpipelegacy.local.feed.service.FeedEventManager.Event.IdleEvent
@@ -110,10 +110,10 @@ class FeedLoadService : Service() {
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         if (DEBUG) {
             Log.d(
-			    TAG,
-				"onStartCommand() called with: intent = [" + intent + "]," +
+                TAG,
+                "onStartCommand() called with: intent = [" + intent + "]," +
                     " flags = [" + flags + "], startId = [" + startId + "]"
-			)
+            )
         }
 
         if (intent == null || loadingSubscription != null) {
@@ -219,7 +219,7 @@ class FeedLoadService : Service() {
                         ExtractorHelper
                             .getChannelInfo(subscriptionEntity.serviceId, subscriptionEntity.url, true)
                             .blockingGet()
-                } as ListInfo<StreamInfoItem>
+                    } as ListInfo<StreamInfoItem>
 
                     return@map Notification.createOnNext(Pair(subscriptionEntity.uid, listInfo))
                 } catch (e: Throwable) {
@@ -280,7 +280,7 @@ class FeedLoadService : Service() {
                 postEvent(ProgressEvent(R.string.feed_processing_message))
 
                 disposables.add(
-				    Single
+                    Single
                         .fromCallable {
                             feedResultsHolder.ready()
 
@@ -300,7 +300,7 @@ class FeedLoadService : Service() {
                             }
                             stopService()
                         }
-				)
+                    )
             }
         }
 
@@ -372,9 +372,9 @@ class FeedLoadService : Service() {
 
     private fun createNotification(): NotificationCompat.Builder {
         val cancelActionIntent = PendingIntent.getBroadcast(
-		    this,
+            this,
             NOTIFICATION_ID, Intent(ACTION_CANCEL), 0
-		)
+        )
 
         return NotificationCompat.Builder(this, getString(R.string.notification_channel_id))
             .setOngoing(true)
@@ -394,11 +394,11 @@ class FeedLoadService : Service() {
         }
 
         disposables.add(
-		    notificationUpdater
+            notificationUpdater
                 .publish(throttleAfterFirstEmission)
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(this::updateNotificationProgress)
-		)
+        )
     }
 
     private fun updateNotificationProgress(updateDescription: String?) {

diff --git a/app/src/main/java/org/schabi/newpipelegacy/local/subscription/SubscriptionFragment.kt b/app/src/main/java/org/schabi/newpipelegacy/local/subscription/SubscriptionFragment.kt
@@ -209,18 +209,18 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
                     Toast.makeText(activity, R.string.invalid_directory, Toast.LENGTH_SHORT).show()
                 } else {
                     activity.startService(
-					    Intent(activity, SubscriptionsExportService::class.java)
+                        Intent(activity, SubscriptionsExportService::class.java)
                             .putExtra(KEY_FILE_PATH, exportFile.absolutePath)
-					)
+                    )
                 }
             } else if (requestCode == REQUEST_IMPORT_CODE) {
                 val path = Utils.getFileForUri(data.data!!).absolutePath
                 ImportConfirmationDialog.show(
-				    this,
-				    Intent(activity, SubscriptionsImportService::class.java)
+                    this,
+                    Intent(activity, SubscriptionsImportService::class.java)
                         .putExtra(KEY_MODE, PREVIOUS_EXPORT_MODE)
                         .putExtra(KEY_VALUE, path)
-				)
+                )
             }
         }
     }
@@ -269,7 +269,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
             { onImportFromServiceSelected(it) },
             { onExportSelected() },
             importExportItemExpandedState ?: false
-		)
+        )
         groupAdapter.add(Section(importExportItem, listOf(subscriptionsSection)))
     }
 
@@ -315,10 +315,10 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
 
     private fun deleteChannel(selectedItem: ChannelInfoItem) {
         disposables.add(
-		    subscriptionManager.deleteSubscription(selectedItem.serviceId, selectedItem.url).subscribe {
+        subscriptionManager.deleteSubscription(selectedItem.serviceId, selectedItem.url).subscribe {
                 Toast.makeText(requireContext(), getString(R.string.channel_unsubscribed), Toast.LENGTH_SHORT).show()
             }
-	    )
+        )
     }
 
     override fun doInitialLoadLogic() = Unit
@@ -341,9 +341,9 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
 
     private val listenerChannelItem = object : OnClickGesture<ChannelInfoItem>() {
         override fun selected(selectedItem: ChannelInfoItem) = NavigationHelper.openChannelFragment(
-		    fm,
+            fm,
             selectedItem.serviceId, selectedItem.url, selectedItem.name
-		)
+        )
 
         override fun held(selectedItem: ChannelInfoItem) = showLongTapDialog(selectedItem)
     }
@@ -437,9 +437,9 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
                 val configuration = resources.configuration
 
                 (
-				    configuration.orientation == Configuration.ORIENTATION_LANDSCAPE &&
+                    configuration.orientation == Configuration.ORIENTATION_LANDSCAPE &&
                         configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE)
-					)
+                    )
             }
             getString(R.string.list_view_mode_grid_key) -> true
             else -> false

diff --git a/app/src/main/java/org/schabi/newpipelegacy/local/subscription/SubscriptionManager.kt b/app/src/main/java/org/schabi/newpipelegacy/local/subscription/SubscriptionManager.kt
@@ -33,7 +33,7 @@ class SubscriptionManager(context: Context) {
                 return if (showOnlyUngrouped) {
                     subscriptionTable.getSubscriptionsOnlyUngroupedFiltered(
                         currentGroupId, filterQuery
-					)
+                    )
                 } else {
                     subscriptionTable.getSubscriptionsFiltered(filterQuery)
                 }
@@ -46,7 +46,7 @@ class SubscriptionManager(context: Context) {
     fun upsertAll(infoList: List<ChannelInfo>): List<SubscriptionEntity> {
         val listEntities = subscriptionTable.upsertAll(
             infoList.map { SubscriptionEntity.from(it) }
-		)
+        )
 
         database.runInTransaction {
             infoList.forEachIndexed { index, info ->