ktlint: Fix blank-line-between-when-conditions violations

theimpulson · theimpulson · commit 9b7874ff51e9 · 2026-01-24T00:31:44.000+08:00
Signed-off-by: Aayush Gupta &lt;aayushgupta219@gmail.com&gt;
diff --git a/.editorconfig b/.editorconfig
@@ -12,8 +12,6 @@ ktlint_function_naming_ignore_when_annotated_with = Composable
 
 ktlint_standard_argument-list-wrapping = disabled
 ktlint_standard_backing-property-naming = disabled
-ktlint_standard_blank-line-before-declaration = disabled
-ktlint_standard_blank-line-between-when-conditions = disabled
 ktlint_standard_chain-method-continuation = disabled
 ktlint_standard_class-signature = disabled
 ktlint_standard_function-expression-body = disabled
diff --git a/app/src/main/java/org/schabi/newpipe/error/ErrorInfo.kt b/app/src/main/java/org/schabi/newpipe/error/ErrorInfo.kt
@@ -193,18 +193,24 @@ class ErrorInfo private constructor(
                                 ErrorMessage(R.string.player_http_invalid_status, cause.responseCode.toString())
                             }
                         }
+
                         cause is Loader.UnexpectedLoaderException && cause.cause is ExtractionException ->
                             getMessage(throwable, action, serviceId)
+
                         throwable.type == ExoPlaybackException.TYPE_SOURCE ->
                             ErrorMessage(R.string.player_stream_failure)
+
                         throwable.type == ExoPlaybackException.TYPE_UNEXPECTED ->
                             ErrorMessage(R.string.player_recoverable_failure)
+
                         else ->
                             ErrorMessage(R.string.player_unrecoverable_failure)
                     }
                 }
+
                 throwable is FailedMediaSource.FailedMediaSourceException ->
                     getMessage(throwable.cause, action, serviceId)
+
                 throwable is PlaybackResolver.ResolverException ->
                     ErrorMessage(R.string.player_stream_failure)
 
@@ -220,34 +226,46 @@ class ErrorInfo private constructor(
                             )
                         }
                         ?: ErrorMessage(R.string.account_terminated)
+
                 throwable is AgeRestrictedContentException ->
                     ErrorMessage(R.string.restricted_video_no_stream)
+
                 throwable is GeographicRestrictionException ->
                     ErrorMessage(R.string.georestricted_content)
+
                 throwable is PaidContentException ->
                     ErrorMessage(R.string.paid_content)
+
                 throwable is PrivateContentException ->
                     ErrorMessage(R.string.private_content)
+
                 throwable is SoundCloudGoPlusContentException ->
                     ErrorMessage(R.string.soundcloud_go_plus_content)
+
                 throwable is UnsupportedContentInCountryException ->
                     ErrorMessage(R.string.unsupported_content_in_country)
+
                 throwable is YoutubeMusicPremiumContentException ->
                     ErrorMessage(R.string.youtube_music_premium_content)
+
                 throwable is SignInConfirmNotBotException ->
                     ErrorMessage(R.string.sign_in_confirm_not_bot_error, getServiceName(serviceId))
+
                 throwable is ContentNotAvailableException ->
                     ErrorMessage(R.string.content_not_available)
 
                 // other extractor exceptions
                 throwable is ContentNotSupportedException ->
                     ErrorMessage(R.string.content_not_supported)
+
                 // ReCaptchas will be handled in a special way anyway
                 throwable is ReCaptchaException ->
                     ErrorMessage(R.string.recaptcha_request_toast)
+
                 // test this at the end as many exceptions could be a subclass of IOException
                 throwable != null && throwable.isNetworkRelated ->
                     ErrorMessage(R.string.network_error)
+
                 // an extraction exception unrelated to the network
                 // is likely an issue with parsing the website
                 throwable is ExtractionException ->
@@ -256,16 +274,22 @@ class ErrorInfo private constructor(
                 // user actions (in case the exception is null or unrecognizable)
                 action == UserAction.UI_ERROR ->
                     ErrorMessage(R.string.app_ui_crash)
+
                 action == UserAction.REQUESTED_COMMENTS ->
                     ErrorMessage(R.string.error_unable_to_load_comments)
+
                 action == UserAction.SUBSCRIPTION_CHANGE ->
                     ErrorMessage(R.string.subscription_change_failed)
+
                 action == UserAction.SUBSCRIPTION_UPDATE ->
                     ErrorMessage(R.string.subscription_update_failed)
+
                 action == UserAction.LOAD_IMAGE ->
                     ErrorMessage(R.string.could_not_load_thumbnails)
+
                 action == UserAction.DOWNLOAD_OPEN_DIALOG ->
                     ErrorMessage(R.string.could_not_setup_download_menu)
+
                 else ->
                     ErrorMessage(R.string.error_snackbar_message)
             }
@@ -276,15 +300,19 @@ class ErrorInfo private constructor(
                 // we don't have an exception, so this is a manually built error, which likely
                 // indicates that it's important and is thus reportable
                 null -> true
+
                 // the service explicitly said that content is not available (e.g. age restrictions,
                 // video deleted, etc.), there is no use in letting users report it
                 is ContentNotAvailableException -> false
+
                 // we know the content is not supported, no need to let the user report it
                 is ContentNotSupportedException -> false
+
                 // happens often when there is no internet connection; we don't use
                 // `throwable.isNetworkRelated` since any `IOException` would make that function
                 // return true, but not all `IOException`s are network related
                 is UnknownHostException -> false
+
                 // by default, this is an unexpected exception, which the user could report
                 else -> true
             }
@@ -294,8 +322,10 @@ class ErrorInfo private constructor(
             return when (throwable) {
                 // we know the content is not available, retrying won't help
                 is ContentNotAvailableException -> false
+
                 // we know the content is not supported, retrying won't help
                 is ContentNotSupportedException -> false
+
                 // by default (including if throwable is null), enable retrying (though the retry
                 // button will be shown only if a way to perform the retry is implemented)
                 else -> true
diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/item/StreamItem.kt b/app/src/main/java/org/schabi/newpipe/local/feed/item/StreamItem.kt
@@ -132,6 +132,7 @@ data class StreamItem(
                 viewsAndDate.isEmpty() -> uploadDate!!
                 else -> Localization.concatenateStrings(viewsAndDate, uploadDate)
             }
+
             else -> viewsAndDate
         }
     }
diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadManager.kt b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadManager.kt
@@ -85,9 +85,11 @@ class FeedLoadManager(private val context: Context) {
             FeedGroupEntity.GROUP_ALL_ID -> feedDatabaseManager.outdatedSubscriptions(
                 outdatedThreshold
             )
+
             GROUP_NOTIFICATION_ENABLED -> feedDatabaseManager.outdatedSubscriptionsWithNotificationMode(
                 outdatedThreshold, NotificationMode.ENABLED
             )
+
             else -> feedDatabaseManager.outdatedSubscriptionsForGroup(groupId, outdatedThreshold)
         }
 
@@ -305,6 +307,7 @@ class FeedLoadManager(private val context: Context) {
                                 feedDatabaseManager.markAsOutdated(info.uid)
                             }
                         }
+
                         notification.isOnError -> {
                             val error = notification.error
                             feedResultsHolder.addError(error!!)
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
@@ -276,10 +276,13 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
                 when (item) {
                     is FeedGroupCardItem ->
                         NavigationHelper.openFeedFragment(fm, item.groupId, item.name)
+
                     is FeedGroupCardGridItem ->
                         NavigationHelper.openFeedFragment(fm, item.groupId, item.name)
+
                     is FeedGroupAddNewItem ->
                         FeedGroupDialog.newInstance().show(fm, null)
+
                     is FeedGroupAddNewGridItem ->
                         FeedGroupDialog.newInstance().show(fm, null)
                 }
@@ -294,6 +297,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
                 when (item) {
                     is FeedGroupCardItem ->
                         FeedGroupDialog.newInstance(item.groupId).show(fm, null)
+
                     is FeedGroupCardGridItem ->
                         FeedGroupDialog.newInstance(item.groupId).show(fm, null)
                 }
@@ -344,7 +348,9 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
                 0 -> ShareUtils.shareText(
                     requireContext(), selectedItem.name, selectedItem.url, selectedItem.thumbnails
                 )
+
                 1 -> ShareUtils.openUrlInBrowser(requireContext(), selectedItem.url)
+
                 2 -> deleteChannel(selectedItem)
             }
         }
@@ -404,6 +410,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
                     itemsListState = null
                 }
             }
+
             is SubscriptionState.ErrorState -> {
                 result.error?.let {
                     showError(ErrorInfo(result.error, UserAction.SOMETHING_ELSE, "Subscriptions"))
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionManager.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionManager.kt
@@ -43,7 +43,9 @@ class SubscriptionManager(context: Context) {
                     subscriptionTable.getSubscriptionsFiltered(filterQuery)
                 }
             }
+
             showOnlyUngrouped -> subscriptionTable.getSubscriptionsOnlyUngrouped(currentGroupId)
+
             else -> subscriptionTable.getAll()
         }
     }
diff --git a/app/src/main/java/org/schabi/newpipe/player/gesture/MainPlayerGestureListener.kt b/app/src/main/java/org/schabi/newpipe/player/gesture/MainPlayerGestureListener.kt
@@ -42,10 +42,12 @@ class MainPlayerGestureListener(
                 v.parent?.requestDisallowInterceptTouchEvent(playerUi.isFullscreen)
                 true
             }
+
             MotionEvent.ACTION_UP -> {
                 v.parent?.requestDisallowInterceptTouchEvent(false)
                 false
             }
+
             else -> true
         }
     }
@@ -198,13 +200,15 @@ class MainPlayerGestureListener(
             when (PlayerHelper.getActionForRightGestureSide(player.context)) {
                 player.context.getString(R.string.volume_control_key) ->
                     onScrollVolume(distanceY)
+
                 player.context.getString(R.string.brightness_control_key) ->
                     onScrollBrightness(distanceY)
             }
         } else {
             when (PlayerHelper.getActionForLeftGestureSide(player.context)) {
                 player.context.getString(R.string.volume_control_key) ->
                     onScrollVolume(distanceY)
+
                 player.context.getString(R.string.brightness_control_key) ->
                     onScrollBrightness(distanceY)
             }
diff --git a/app/src/main/java/org/schabi/newpipe/player/mediabrowser/PackageValidator.kt b/app/src/main/java/org/schabi/newpipe/player/mediabrowser/PackageValidator.kt
@@ -94,17 +94,21 @@ internal class PackageValidator(context: Context) {
         val isCallerKnown = when {
             // If it's our own app making the call, allow it.
             callingUid == Process.myUid() -> true
+
             // If the system is making the call, allow it.
             callingUid == Process.SYSTEM_UID -> true
+
             // If the app was signed by the same certificate as the platform itself, also allow it.
             callerSignature == platformSignature -> true
+
             /*
              * [MEDIA_CONTENT_CONTROL] permission is only available to system applications, and
              * while it isn't required to allow these apps to connect to a
              * [MediaBrowserServiceCompat], allowing this ensures optimal compatability with apps
              * such as Android TV and the Google Assistant.
              */
             callerPackageInfo.permissions.contains(MEDIA_CONTENT_CONTROL) -> true
+
             /*
              * If the calling app has a notification listener it is able to retrieve notifications
              * and can connect to an active [MediaSessionCompat].
diff --git a/app/src/main/java/org/schabi/newpipe/settings/export/ImportExportManager.kt b/app/src/main/java/org/schabi/newpipe/settings/export/ImportExportManager.kt
@@ -122,10 +122,15 @@ class ImportExportManager(private val fileLocator: BackupFileLocator) {
                 for ((key, value) in entries) {
                     when (value) {
                         is Boolean -> editor.putBoolean(key, value)
+
                         is Float -> editor.putFloat(key, value)
+
                         is Int -> editor.putInt(key, value)
+
                         is Long -> editor.putLong(key, value)
+
                         is String -> editor.putString(key, value)
+
                         is Set<*> -> {
                             // There are currently only Sets with type String possible
                             @Suppress("UNCHECKED_CAST")
@@ -159,10 +164,15 @@ class ImportExportManager(private val fileLocator: BackupFileLocator) {
             for ((key, value) in jsonObject) {
                 when (value) {
                     is Boolean -> editor.putBoolean(key, value)
+
                     is Float -> editor.putFloat(key, value)
+
                     is Int -> editor.putInt(key, value)
+
                     is Long -> editor.putLong(key, value)
+
                     is String -> editor.putString(key, value)
+
                     is JsonArray -> {
                         editor.putStringSet(key, value.mapNotNull { e -> e as? String }.toSet())
                     }
diff --git a/app/src/main/java/org/schabi/newpipe/settings/notifications/NotificationModeConfigFragment.kt b/app/src/main/java/org/schabi/newpipe/settings/notifications/NotificationModeConfigFragment.kt
@@ -88,6 +88,7 @@ class NotificationModeConfigFragment : Fragment() {
                 toggleAll()
                 true
             }
+
             else -> super.onOptionsItemSelected(item)
         }
     }
diff --git a/app/src/main/java/org/schabi/newpipe/util/image/ImageStrategy.kt b/app/src/main/java/org/schabi/newpipe/util/image/ImageStrategy.kt
@@ -92,6 +92,7 @@ object ImageStrategy {
         // the same number for those.
         val finalComparator = when (nonNoneQuality) {
             PreferredImageQuality.NONE -> initialComparator
+
             PreferredImageQuality.LOW -> initialComparator.thenComparingDouble { image ->
                 val pixelCount = estimatePixelCount(image, widthOverHeight)
                 abs(pixelCount - BEST_LOW_H * BEST_LOW_H * widthOverHeight)
diff --git a/app/src/main/java/org/schabi/newpipe/util/potoken/PoTokenProviderImpl.kt b/app/src/main/java/org/schabi/newpipe/util/potoken/PoTokenProviderImpl.kt
@@ -37,7 +37,9 @@ object PoTokenProviderImpl : PoTokenProvider {
                     webViewBadImpl = true
                     return null
                 }
+
                 null -> throw e
+
                 else -> throw cause // includes PoTokenException
             }
         }
diff --git a/app/src/main/java/org/schabi/newpipe/util/text/TimestampLongPressClickableSpan.kt b/app/src/main/java/org/schabi/newpipe/util/text/TimestampLongPressClickableSpan.kt
@@ -53,8 +53,10 @@ class TimestampLongPressClickableSpan(
             when (relatedInfoService) {
                 ServiceList.YouTube ->
                     return relatedStreamUrl + "&t=" + timestampMatchDTO.seconds()
+
                 ServiceList.SoundCloud, ServiceList.MediaCCC ->
                     return relatedStreamUrl + "#t=" + timestampMatchDTO.seconds()
+
                 ServiceList.PeerTube ->
                     return relatedStreamUrl + "?start=" + timestampMatchDTO.seconds()
             }
diff --git a/app/src/main/java/us/shandian/giga/get/MissionRecoveryInfo.kt b/app/src/main/java/us/shandian/giga/get/MissionRecoveryInfo.kt
@@ -25,16 +25,19 @@ class MissionRecoveryInfo(
                 isDesired2 = false
                 kind = 'a'
             }
+
             is VideoStream -> {
                 desired = stream.getResolution()
                 isDesired2 = stream.isVideoOnly()
                 kind = 'v'
             }
+
             is SubtitlesStream -> {
                 desired = stream.languageTag
                 isDesired2 = stream.isAutoGenerated
                 kind = 's'
             }
+
             else -> throw RuntimeException("Unknown stream kind")
         }
     }
@@ -48,14 +51,17 @@ class MissionRecoveryInfo(
                 str.append("audio")
                 info = "bitrate=$desiredBitrate"
             }
+
             'v' -> {
                 str.append("video")
                 info = "quality=$desired videoOnly=$isDesired2"
             }
+
             's' -> {
                 str.append("subtitles")
                 info = "language=$desired autoGenerated=$isDesired2"
             }
+
             else -> {
                 info = ""
                 str.append("other")
diff --git a/app/src/test/java/org/schabi/newpipe/settings/ImportAllCombinationsTest.kt b/app/src/test/java/org/schabi/newpipe/settings/ImportAllCombinationsTest.kt
@@ -93,6 +93,7 @@ class ImportAllCombinationsTest {
                 Mockito.verify(editor, Mockito.atLeastOnce())
                     .putInt(Mockito.anyString(), Mockito.anyInt())
             }
+
             Ser.VULNERABLE -> runTest {
                 Assert.assertTrue(ImportExportManager(fileLocator).exportHasSerializedPrefs(zip))
                 Assert.assertThrows(ClassNotFoundException::class.java) {
@@ -102,6 +103,7 @@ class ImportAllCombinationsTest {
                 Mockito.verify(editor, Mockito.never()).clear()
                 Mockito.verify(editor, Mockito.never()).commit()
             }
+
             Ser.NO -> runTest {
                 Assert.assertFalse(ImportExportManager(fileLocator).exportHasSerializedPrefs(zip))
                 Assert.assertThrows(IOException::class.java) {

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,7 @@ data class StreamItem(`
`132`	`132`	`viewsAndDate.isEmpty() -> uploadDate!!`
`133`	`133`	`else -> Localization.concatenateStrings(viewsAndDate, uploadDate)`
`134`	`134`	`}`
	`135`	`+`
`135`	`136`	`else -> viewsAndDate`
`136`	`137`	`}`
`137`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,9 +85,11 @@ class FeedLoadManager(private val context: Context) {`
`85`	`85`	`FeedGroupEntity.GROUP_ALL_ID -> feedDatabaseManager.outdatedSubscriptions(`
`86`	`86`	`outdatedThreshold`
`87`	`87`	`)`
	`88`	`+`
`88`	`89`	`GROUP_NOTIFICATION_ENABLED -> feedDatabaseManager.outdatedSubscriptionsWithNotificationMode(`
`89`	`90`	`outdatedThreshold, NotificationMode.ENABLED`
`90`	`91`	`)`
	`92`	`+`
`91`	`93`	`else -> feedDatabaseManager.outdatedSubscriptionsForGroup(groupId, outdatedThreshold)`
`92`	`94`	`}`
`93`	`95`
`@@ -305,6 +307,7 @@ class FeedLoadManager(private val context: Context) {`
`305`	`307`	`feedDatabaseManager.markAsOutdated(info.uid)`
`306`	`308`	`}`
`307`	`309`	`}`
	`310`	`+`
`308`	`311`	`notification.isOnError -> {`
`309`	`312`	`val error = notification.error`
`310`	`313`	`feedResultsHolder.addError(error!!)`
Original file line number	Diff line number	Diff line change
`@@ -276,10 +276,13 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {`
`276`	`276`	`when (item) {`
`277`	`277`	`is FeedGroupCardItem ->`
`278`	`278`	`NavigationHelper.openFeedFragment(fm, item.groupId, item.name)`
	`279`	`+`
`279`	`280`	`is FeedGroupCardGridItem ->`
`280`	`281`	`NavigationHelper.openFeedFragment(fm, item.groupId, item.name)`
	`282`	`+`
`281`	`283`	`is FeedGroupAddNewItem ->`
`282`	`284`	`FeedGroupDialog.newInstance().show(fm, null)`
	`285`	`+`
`283`	`286`	`is FeedGroupAddNewGridItem ->`
`284`	`287`	`FeedGroupDialog.newInstance().show(fm, null)`
`285`	`288`	`}`
`@@ -294,6 +297,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {`
`294`	`297`	`when (item) {`
`295`	`298`	`is FeedGroupCardItem ->`
`296`	`299`	`FeedGroupDialog.newInstance(item.groupId).show(fm, null)`
	`300`	`+`
`297`	`301`	`is FeedGroupCardGridItem ->`
`298`	`302`	`FeedGroupDialog.newInstance(item.groupId).show(fm, null)`
`299`	`303`	`}`
`@@ -344,7 +348,9 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {`
`344`	`348`	`0 -> ShareUtils.shareText(`
`345`	`349`	`requireContext(), selectedItem.name, selectedItem.url, selectedItem.thumbnails`
`346`	`350`	`)`
	`351`	`+`
`347`	`352`	`1 -> ShareUtils.openUrlInBrowser(requireContext(), selectedItem.url)`
	`353`	`+`
`348`	`354`	`2 -> deleteChannel(selectedItem)`
`349`	`355`	`}`
`350`	`356`	`}`
`@@ -404,6 +410,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {`
`404`	`410`	`itemsListState = null`
`405`	`411`	`}`
`406`	`412`	`}`
	`413`	`+`
`407`	`414`	`is SubscriptionState.ErrorState -> {`
`408`	`415`	`result.error?.let {`
`409`	`416`	`showError(ErrorInfo(result.error, UserAction.SOMETHING_ELSE, "Subscriptions"))`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,9 @@ class SubscriptionManager(context: Context) {`
`43`	`43`	`subscriptionTable.getSubscriptionsFiltered(filterQuery)`
`44`	`44`	`}`
`45`	`45`	`}`
	`46`	`+`
`46`	`47`	`showOnlyUngrouped -> subscriptionTable.getSubscriptionsOnlyUngrouped(currentGroupId)`
	`48`	`+`
`47`	`49`	`else -> subscriptionTable.getAll()`
`48`	`50`	`}`
`49`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,10 +42,12 @@ class MainPlayerGestureListener(`
`42`	`42`	`v.parent?.requestDisallowInterceptTouchEvent(playerUi.isFullscreen)`
`43`	`43`	`true`
`44`	`44`	`}`
	`45`	`+`
`45`	`46`	`MotionEvent.ACTION_UP -> {`
`46`	`47`	`v.parent?.requestDisallowInterceptTouchEvent(false)`
`47`	`48`	`false`
`48`	`49`	`}`
	`50`	`+`
`49`	`51`	`else -> true`
`50`	`52`	`}`
`51`	`53`	`}`
`@@ -198,13 +200,15 @@ class MainPlayerGestureListener(`
`198`	`200`	`when (PlayerHelper.getActionForRightGestureSide(player.context)) {`
`199`	`201`	`player.context.getString(R.string.volume_control_key) ->`
`200`	`202`	`onScrollVolume(distanceY)`
	`203`	`+`
`201`	`204`	`player.context.getString(R.string.brightness_control_key) ->`
`202`	`205`	`onScrollBrightness(distanceY)`
`203`	`206`	`}`
`204`	`207`	`} else {`
`205`	`208`	`when (PlayerHelper.getActionForLeftGestureSide(player.context)) {`
`206`	`209`	`player.context.getString(R.string.volume_control_key) ->`
`207`	`210`	`onScrollVolume(distanceY)`
	`211`	`+`
`208`	`212`	`player.context.getString(R.string.brightness_control_key) ->`
`209`	`213`	`onScrollBrightness(distanceY)`
`210`	`214`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@ class NotificationModeConfigFragment : Fragment() {`
`88`	`88`	`toggleAll()`
`89`	`89`	`true`
`90`	`90`	`}`
	`91`	`+`
`91`	`92`	`else -> super.onOptionsItemSelected(item)`
`92`	`93`	`}`
`93`	`94`	`}`