ktlint: Drop unused trailing commas

theimpulson · theimpulson · commit c76d14dfd480 · 2026-01-24T00:31:14.000+08:00
Signed-off-by: Aayush Gupta &lt;aayushgupta219@gmail.com&gt;
diff --git a/.editorconfig b/.editorconfig
@@ -38,5 +38,3 @@ ktlint_standard_spacing-between-declarations-with-annotations = disabled
 ktlint_standard_spacing-between-declarations-with-comments = disabled
 ktlint_standard_statement-wrapping = disabled
 ktlint_standard_string-template-indent = disabled
-ktlint_standard_trailing-comma-on-call-site = disabled
-ktlint_standard_trailing-comma-on-declaration-site = disabled
diff --git a/app/src/androidTest/java/org/schabi/newpipe/database/FeedDAOTest.kt b/app/src/androidTest/java/org/schabi/newpipe/database/FeedDAOTest.kt
@@ -111,7 +111,7 @@ class FeedDAOTest {
                 SubscriptionEntity.from(ChannelInfo(serviceId, "1", "https://youtube.com/channel/1", "https://youtube.com/channel/1", "channel-1")),
                 SubscriptionEntity.from(ChannelInfo(serviceId, "2", "https://youtube.com/channel/2", "https://youtube.com/channel/2", "channel-2")),
                 SubscriptionEntity.from(ChannelInfo(serviceId, "3", "https://youtube.com/channel/3", "https://youtube.com/channel/3", "channel-3")),
-                SubscriptionEntity.from(ChannelInfo(serviceId, "4", "https://youtube.com/channel/4", "https://youtube.com/channel/4", "channel-4")),
+                SubscriptionEntity.from(ChannelInfo(serviceId, "4", "https://youtube.com/channel/4", "https://youtube.com/channel/4", "channel-4"))
             )
         )
         feedDAO.insertAll(
@@ -122,7 +122,7 @@ class FeedDAOTest {
                 FeedEntity(4, 2),
                 FeedEntity(5, 2),
                 FeedEntity(6, 3),
-                FeedEntity(7, 4),
+                FeedEntity(7, 4)
             )
         )
     }
diff --git a/app/src/androidTest/java/org/schabi/newpipe/local/history/HistoryRecordManagerTest.kt b/app/src/androidTest/java/org/schabi/newpipe/local/history/HistoryRecordManagerTest.kt
@@ -54,7 +54,7 @@ class HistoryRecordManagerTest {
             SearchHistoryEntry(creationDate = time.minusSeconds(1), serviceId = 0, search = "A"),
             SearchHistoryEntry(creationDate = time.minusSeconds(2), serviceId = 2, search = "A"),
             SearchHistoryEntry(creationDate = time.minusSeconds(3), serviceId = 1, search = "B"),
-            SearchHistoryEntry(creationDate = time.minusSeconds(4), serviceId = 0, search = "B"),
+            SearchHistoryEntry(creationDate = time.minusSeconds(4), serviceId = 0, search = "B")
         )
 
         // make sure all 4 were inserted
@@ -85,7 +85,7 @@ class HistoryRecordManagerTest {
         val entries = listOf(
             SearchHistoryEntry(creationDate = time.minusSeconds(1), serviceId = 1, search = "A"),
             SearchHistoryEntry(creationDate = time.minusSeconds(2), serviceId = 2, search = "B"),
-            SearchHistoryEntry(creationDate = time.minusSeconds(3), serviceId = 0, search = "C"),
+            SearchHistoryEntry(creationDate = time.minusSeconds(3), serviceId = 0, search = "C")
         )
 
         // make sure all 3 were inserted
@@ -121,7 +121,7 @@ class HistoryRecordManagerTest {
             RELATED_SEARCHES_ENTRIES[6].search, // A (even if in two places)
             RELATED_SEARCHES_ENTRIES[4].search, // B
             RELATED_SEARCHES_ENTRIES[5].search, // AA
-            RELATED_SEARCHES_ENTRIES[2].search, // BA
+            RELATED_SEARCHES_ENTRIES[2].search // BA
         )
     }
 
@@ -136,7 +136,7 @@ class HistoryRecordManagerTest {
             SearchHistoryEntry(creationDate = time.minusSeconds(4), serviceId = 3, search = "A"),
             SearchHistoryEntry(creationDate = time.minusSeconds(3), serviceId = 3, search = "A"),
             SearchHistoryEntry(creationDate = time.minusSeconds(2), serviceId = 0, search = "A"),
-            SearchHistoryEntry(creationDate = time.minusSeconds(1), serviceId = 2, search = "AA"),
+            SearchHistoryEntry(creationDate = time.minusSeconds(1), serviceId = 2, search = "AA")
         )
         insertShuffledRelatedSearches(relatedSearches)
 
@@ -153,7 +153,7 @@ class HistoryRecordManagerTest {
         assertThat(searches).containsExactly(
             RELATED_SEARCHES_ENTRIES[6].search, // A (even if in two places)
             RELATED_SEARCHES_ENTRIES[5].search, // AA
-            RELATED_SEARCHES_ENTRIES[1].search, // BA
+            RELATED_SEARCHES_ENTRIES[1].search // BA
         )
 
         // also make sure that the string comparison is case insensitive
@@ -171,7 +171,7 @@ class HistoryRecordManagerTest {
             SearchHistoryEntry(creationDate = time.minusSeconds(4), serviceId = 3, search = "A"),
             SearchHistoryEntry(creationDate = time.minusSeconds(2), serviceId = 0, search = "B"),
             SearchHistoryEntry(creationDate = time.minusSeconds(3), serviceId = 2, search = "AA"),
-            SearchHistoryEntry(creationDate = time.minusSeconds(1), serviceId = 1, search = "A"),
+            SearchHistoryEntry(creationDate = time.minusSeconds(1), serviceId = 1, search = "A")
         )
     }
 }
diff --git a/app/src/androidTest/java/org/schabi/newpipe/util/StreamItemAdapterTest.kt b/app/src/androidTest/java/org/schabi/newpipe/util/StreamItemAdapterTest.kt
@@ -292,7 +292,7 @@ class StreamItemAdapterTest {
             Assert.assertEquals(
                 "normal visibility (pos=[$position]) is not correct",
                 findViewById<View>(R.id.wo_sound_icon).visibility,
-                normalVisibility,
+                normalVisibility
             )
         }
         spinner.adapter.getDropDownView(position, null, spinner).run {
diff --git a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt
@@ -195,7 +195,7 @@ class AboutActivity : AppCompatActivity() {
             SoftwareComponent(
                 "SearchPreference", "2018", "ByteHamster",
                 "https://github.com/ByteHamster/SearchPreference", StandardLicenses.MIT
-            ),
+            )
         )
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/database/LocalItem.kt b/app/src/main/java/org/schabi/newpipe/database/LocalItem.kt
@@ -14,6 +14,6 @@ interface LocalItem {
         PLAYLIST_REMOTE_ITEM,
 
         PLAYLIST_STREAM_ITEM,
-        STATISTIC_STREAM_ITEM,
+        STATISTIC_STREAM_ITEM
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/database/history/model/SearchHistoryEntry.kt b/app/src/main/java/org/schabi/newpipe/database/history/model/SearchHistoryEntry.kt
@@ -29,7 +29,7 @@ data class SearchHistoryEntry @JvmOverloads constructor(
 
     @ColumnInfo(name = ID)
     @PrimaryKey(autoGenerate = true)
-    val id: Long = 0,
+    val id: Long = 0
 ) {
 
     @Ignore
diff --git a/app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntry.kt b/app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntry.kt
@@ -35,7 +35,7 @@ data class StreamHistoryEntry(
             streamEntity.serviceId,
             streamEntity.url,
             streamEntity.title,
-            streamEntity.streamType,
+            streamEntity.streamType
         ).apply {
             duration = streamEntity.duration
             uploaderName = streamEntity.uploader
diff --git a/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistEntity.kt b/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistEntity.kt
@@ -37,7 +37,7 @@ data class PlaylistEntity @JvmOverloads constructor(
         name = item.orderingName,
         isThumbnailPermanent = item.isThumbnailPermanent!!,
         thumbnailStreamId = item.thumbnailStreamId!!,
-        displayIndex = item.displayIndex!!,
+        displayIndex = item.displayIndex!!
     )
 
     companion object {
diff --git a/app/src/main/java/org/schabi/newpipe/error/ErrorInfo.kt b/app/src/main/java/org/schabi/newpipe/error/ErrorInfo.kt
@@ -59,7 +59,7 @@ class ErrorInfo private constructor(
      * If present, this resource can alternatively be opened in browser (useful if NewPipe is
      * badly broken).
      */
-    val openInBrowserUrl: String?,
+    val openInBrowserUrl: String?
 ) : Parcelable {
 
     @JvmOverloads
@@ -68,7 +68,7 @@ class ErrorInfo private constructor(
         userAction: UserAction,
         request: String,
         serviceId: Int? = null,
-        openInBrowserUrl: String? = null,
+        openInBrowserUrl: String? = null
     ) : this(
         throwableToStringList(throwable),
         userAction,
@@ -78,7 +78,7 @@ class ErrorInfo private constructor(
         isReportable(throwable),
         isRetryable(throwable),
         (throwable as? ReCaptchaException)?.url,
-        openInBrowserUrl,
+        openInBrowserUrl
     )
 
     @JvmOverloads
@@ -87,7 +87,7 @@ class ErrorInfo private constructor(
         userAction: UserAction,
         request: String,
         serviceId: Int? = null,
-        openInBrowserUrl: String? = null,
+        openInBrowserUrl: String? = null
     ) : this(
         throwableListToStringList(throwables),
         userAction,
@@ -97,7 +97,7 @@ class ErrorInfo private constructor(
         throwables.any(::isReportable),
         throwables.isEmpty() || throwables.any(::isRetryable),
         throwables.firstNotNullOfOrNull { it as? ReCaptchaException }?.url,
-        openInBrowserUrl,
+        openInBrowserUrl
     )
 
     // constructor to manually build ErrorInfo when no throwable is available
@@ -118,7 +118,7 @@ class ErrorInfo private constructor(
         throwable: Throwable,
         userAction: UserAction,
         request: String,
-        info: Info?,
+        info: Info?
     ) :
         this(throwable, userAction, request, info?.serviceId, info?.url)
 
@@ -127,7 +127,7 @@ class ErrorInfo private constructor(
         throwables: List<Throwable>,
         userAction: UserAction,
         request: String,
-        info: Info?,
+        info: Info?
     ) :
         this(throwables, userAction, request, info?.serviceId, info?.url)
 
@@ -144,7 +144,7 @@ class ErrorInfo private constructor(
         class ErrorMessage(
             @StringRes
             private val stringRes: Int,
-            private vararg val formatArgs: String,
+            private vararg val formatArgs: String
         ) : Parcelable {
             fun getString(context: Context): String {
                 return if (formatArgs.isEmpty()) {
@@ -174,7 +174,7 @@ class ErrorInfo private constructor(
         fun getMessage(
             throwable: Throwable?,
             action: UserAction?,
-            serviceId: Int?,
+            serviceId: Int?
         ): ErrorMessage {
             return when {
                 // player exceptions
diff --git a/app/src/main/java/org/schabi/newpipe/error/ErrorPanelHelper.kt b/app/src/main/java/org/schabi/newpipe/error/ErrorPanelHelper.kt
@@ -20,7 +20,7 @@ import org.schabi.newpipe.util.external_communication.ShareUtils
 class ErrorPanelHelper(
     private val fragment: Fragment,
     rootView: View,
-    onRetry: Runnable?,
+    onRetry: Runnable?
 ) {
     private val context: Context = rootView.context!!
 
diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationWorker.kt b/app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationWorker.kt
@@ -31,7 +31,7 @@ import org.schabi.newpipe.local.feed.service.FeedLoadService
  */
 class NotificationWorker(
     appContext: Context,
-    workerParams: WorkerParameters,
+    workerParams: WorkerParameters
 ) : RxWorker(appContext, workerParams) {
 
     private val notificationHelper by lazy {
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
@@ -60,7 +60,7 @@ class FeedLoadManager(private val context: Context) {
      */
     fun startLoading(
         groupId: Long = FeedGroupEntity.GROUP_ALL_ID,
-        ignoreOutdatedThreshold: Boolean = false,
+        ignoreOutdatedThreshold: Boolean = false
     ): Single<List<Notification<FeedUpdateInfo>>> {
         val defaultSharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
         val useFeedExtractor = defaultSharedPreferences.getBoolean(
@@ -234,7 +234,7 @@ class FeedLoadManager(private val context: Context) {
                     subscriptionEntity,
                     originalInfo!!,
                     streams!!,
-                    errors,
+                    errors
                 )
             )
         } catch (e: Throwable) {
diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadState.kt b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadState.kt
@@ -3,5 +3,5 @@ package org.schabi.newpipe.local.feed.service
 data class FeedLoadState(
     val updateDescription: String,
     val maxProgress: Int,
-    val currentProgress: Int,
+    val currentProgress: Int
 )
diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedUpdateInfo.kt b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedUpdateInfo.kt
@@ -25,13 +25,13 @@ data class FeedUpdateInfo(
     val description: String?,
     val subscriberCount: Long?,
     val streams: List<StreamInfoItem>,
-    val errors: List<Throwable>,
+    val errors: List<Throwable>
 ) {
     constructor(
         subscription: SubscriptionEntity,
         info: Info,
         streams: List<StreamInfoItem>,
-        errors: List<Throwable>,
+        errors: List<Throwable>
     ) : this(
         uid = subscription.uid,
         notificationMode = subscription.notificationMode,
@@ -46,7 +46,7 @@ data class FeedUpdateInfo(
         description = (info as? ChannelInfo)?.description,
         subscriberCount = (info as? ChannelInfo)?.subscriberCount,
         streams = streams,
-        errors = errors,
+        errors = errors
     )
 
     /**
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
@@ -309,7 +309,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
                 title = getString(R.string.feed_groups_header_title),
                 onSortClicked = ::openReorderDialog,
                 onToggleListViewModeClicked = ::toggleListViewMode,
-                listViewMode = viewModel.getListViewMode(),
+                listViewMode = viewModel.getListViewMode()
             )
 
             add(Section(feedGroupsSortMenuItem, listOf(feedGroupsCarousel)))
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupCardGridItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupCardGridItem.kt
@@ -10,7 +10,7 @@ import org.schabi.newpipe.local.subscription.FeedGroupIcon
 data class FeedGroupCardGridItem(
     val groupId: Long = FeedGroupEntity.GROUP_ALL_ID,
     val name: String,
-    val icon: FeedGroupIcon,
+    val icon: FeedGroupIcon
 ) : BindableItem<FeedGroupCardGridItemBinding>() {
     constructor (feedGroupEntity: FeedGroupEntity) : this(feedGroupEntity.uid, feedGroupEntity.name, feedGroupEntity.icon)
 
diff --git a/app/src/main/java/org/schabi/newpipe/player/gesture/BasePlayerGestureListener.kt b/app/src/main/java/org/schabi/newpipe/player/gesture/BasePlayerGestureListener.kt
@@ -18,7 +18,7 @@ import org.schabi.newpipe.player.ui.VideoPlayerUi
  * and provides some abstract methods to make it easier separating the logic from the UI.
  */
 abstract class BasePlayerGestureListener(
-    private val playerUi: VideoPlayerUi,
+    private val playerUi: VideoPlayerUi
 ) : GestureDetector.SimpleOnGestureListener(), View.OnTouchListener {
 
     protected val player: Player = playerUi.player
diff --git a/app/src/main/java/org/schabi/newpipe/player/gesture/PopupPlayerGestureListener.kt b/app/src/main/java/org/schabi/newpipe/player/gesture/PopupPlayerGestureListener.kt
@@ -15,7 +15,7 @@ import org.schabi.newpipe.ktx.animate
 import org.schabi.newpipe.player.ui.PopupPlayerUi
 
 class PopupPlayerGestureListener(
-    private val playerUi: PopupPlayerUi,
+    private val playerUi: PopupPlayerUi
 ) : BasePlayerGestureListener(playerUi) {
 
     private var isMoving = false
diff --git a/app/src/main/java/org/schabi/newpipe/player/mediabrowser/MediaBrowserImpl.kt b/app/src/main/java/org/schabi/newpipe/player/mediabrowser/MediaBrowserImpl.kt
@@ -47,7 +47,7 @@ import org.schabi.newpipe.util.image.ImageStrategy
  */
 class MediaBrowserImpl(
     private val context: Context,
-    notifyChildrenChanged: Consumer<String>, // parentId
+    notifyChildrenChanged: Consumer<String> // parentId
 ) {
     private val packageValidator = PackageValidator(context)
     private val database = NewPipeDatabase.getInstance(context)
@@ -204,12 +204,12 @@ class MediaBrowserImpl(
         val extras = Bundle()
         extras.putString(
             MediaConstants.DESCRIPTION_EXTRAS_KEY_CONTENT_STYLE_GROUP_TITLE,
-            context.resources.getString(R.string.tab_bookmarks),
+            context.resources.getString(R.string.tab_bookmarks)
         )
         builder.setExtras(extras)
         return MediaBrowserCompat.MediaItem(
             builder.build(),
-            MediaBrowserCompat.MediaItem.FLAG_BROWSABLE,
+            MediaBrowserCompat.MediaItem.FLAG_BROWSABLE
         )
     }
 
@@ -266,7 +266,7 @@ class MediaBrowserImpl(
     private fun createLocalPlaylistStreamMediaItem(
         playlistId: Long,
         item: PlaylistStreamEntry,
-        index: Int,
+        index: Int
     ): MediaBrowserCompat.MediaItem {
         val builder = MediaDescriptionCompat.Builder()
         builder.setMediaId(createMediaIdForPlaylistIndex(false, playlistId, index))
@@ -283,7 +283,7 @@ class MediaBrowserImpl(
     private fun createRemotePlaylistStreamMediaItem(
         playlistId: Long,
         item: StreamInfoItem,
-        index: Int,
+        index: Int
     ): MediaBrowserCompat.MediaItem {
         val builder = MediaDescriptionCompat.Builder()
         builder.setMediaId(createMediaIdForPlaylistIndex(true, playlistId, index))
@@ -303,7 +303,7 @@ class MediaBrowserImpl(
     private fun createMediaIdForPlaylistIndex(
         isRemote: Boolean,
         playlistId: Long,
-        index: Int,
+        index: Int
     ): String {
         return buildLocalPlaylistItemMediaId(isRemote, playlistId)
             .appendPath(index.toString())
diff --git a/app/src/main/java/org/schabi/newpipe/player/mediabrowser/MediaBrowserPlaybackPreparer.kt b/app/src/main/java/org/schabi/newpipe/player/mediabrowser/MediaBrowserPlaybackPreparer.kt
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
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
diff --git a/app/src/main/java/org/schabi/newpipe/util/potoken/PoTokenWebView.kt b/app/src/main/java/org/schabi/newpipe/util/potoken/PoTokenWebView.kt
diff --git a/app/src/test/java/org/schabi/newpipe/settings/ImportAllCombinationsTest.kt b/app/src/test/java/org/schabi/newpipe/settings/ImportAllCombinationsTest.kt

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ class FeedDAOTest {`
`111`	`111`	`SubscriptionEntity.from(ChannelInfo(serviceId, "1", "https://youtube.com/channel/1", "https://youtube.com/channel/1", "channel-1")),`
`112`	`112`	`SubscriptionEntity.from(ChannelInfo(serviceId, "2", "https://youtube.com/channel/2", "https://youtube.com/channel/2", "channel-2")),`
`113`	`113`	`SubscriptionEntity.from(ChannelInfo(serviceId, "3", "https://youtube.com/channel/3", "https://youtube.com/channel/3", "channel-3")),`
`114`		`- SubscriptionEntity.from(ChannelInfo(serviceId, "4", "https://youtube.com/channel/4", "https://youtube.com/channel/4", "channel-4")),`
	`114`	`+ SubscriptionEntity.from(ChannelInfo(serviceId, "4", "https://youtube.com/channel/4", "https://youtube.com/channel/4", "channel-4"))`
`115`	`115`	`)`
`116`	`116`	`)`
`117`	`117`	`feedDAO.insertAll(`
`@@ -122,7 +122,7 @@ class FeedDAOTest {`
`122`	`122`	`FeedEntity(4, 2),`
`123`	`123`	`FeedEntity(5, 2),`
`124`	`124`	`FeedEntity(6, 3),`
`125`		`- FeedEntity(7, 4),`
	`125`	`+ FeedEntity(7, 4)`
`126`	`126`	`)`
`127`	`127`	`)`
`128`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ class HistoryRecordManagerTest {`
`54`	`54`	`SearchHistoryEntry(creationDate = time.minusSeconds(1), serviceId = 0, search = "A"),`
`55`	`55`	`SearchHistoryEntry(creationDate = time.minusSeconds(2), serviceId = 2, search = "A"),`
`56`	`56`	`SearchHistoryEntry(creationDate = time.minusSeconds(3), serviceId = 1, search = "B"),`
`57`		`- SearchHistoryEntry(creationDate = time.minusSeconds(4), serviceId = 0, search = "B"),`
	`57`	`+ SearchHistoryEntry(creationDate = time.minusSeconds(4), serviceId = 0, search = "B")`
`58`	`58`	`)`
`59`	`59`
`60`	`60`	`// make sure all 4 were inserted`
`@@ -85,7 +85,7 @@ class HistoryRecordManagerTest {`
`85`	`85`	`val entries = listOf(`
`86`	`86`	`SearchHistoryEntry(creationDate = time.minusSeconds(1), serviceId = 1, search = "A"),`
`87`	`87`	`SearchHistoryEntry(creationDate = time.minusSeconds(2), serviceId = 2, search = "B"),`
`88`		`- SearchHistoryEntry(creationDate = time.minusSeconds(3), serviceId = 0, search = "C"),`
	`88`	`+ SearchHistoryEntry(creationDate = time.minusSeconds(3), serviceId = 0, search = "C")`
`89`	`89`	`)`
`90`	`90`
`91`	`91`	`// make sure all 3 were inserted`
`@@ -121,7 +121,7 @@ class HistoryRecordManagerTest {`
`121`	`121`	`RELATED_SEARCHES_ENTRIES[6].search, // A (even if in two places)`
`122`	`122`	`RELATED_SEARCHES_ENTRIES[4].search, // B`
`123`	`123`	`RELATED_SEARCHES_ENTRIES[5].search, // AA`
`124`		`- RELATED_SEARCHES_ENTRIES[2].search, // BA`
	`124`	`+ RELATED_SEARCHES_ENTRIES[2].search // BA`
`125`	`125`	`)`
`126`	`126`	`}`
`127`	`127`
`@@ -136,7 +136,7 @@ class HistoryRecordManagerTest {`
`136`	`136`	`SearchHistoryEntry(creationDate = time.minusSeconds(4), serviceId = 3, search = "A"),`
`137`	`137`	`SearchHistoryEntry(creationDate = time.minusSeconds(3), serviceId = 3, search = "A"),`
`138`	`138`	`SearchHistoryEntry(creationDate = time.minusSeconds(2), serviceId = 0, search = "A"),`
`139`		`- SearchHistoryEntry(creationDate = time.minusSeconds(1), serviceId = 2, search = "AA"),`
	`139`	`+ SearchHistoryEntry(creationDate = time.minusSeconds(1), serviceId = 2, search = "AA")`
`140`	`140`	`)`
`141`	`141`	`insertShuffledRelatedSearches(relatedSearches)`
`142`	`142`
`@@ -153,7 +153,7 @@ class HistoryRecordManagerTest {`
`153`	`153`	`assertThat(searches).containsExactly(`
`154`	`154`	`RELATED_SEARCHES_ENTRIES[6].search, // A (even if in two places)`
`155`	`155`	`RELATED_SEARCHES_ENTRIES[5].search, // AA`
`156`		`- RELATED_SEARCHES_ENTRIES[1].search, // BA`
	`156`	`+ RELATED_SEARCHES_ENTRIES[1].search // BA`
`157`	`157`	`)`
`158`	`158`
`159`	`159`	`// also make sure that the string comparison is case insensitive`
`@@ -171,7 +171,7 @@ class HistoryRecordManagerTest {`
`171`	`171`	`SearchHistoryEntry(creationDate = time.minusSeconds(4), serviceId = 3, search = "A"),`
`172`	`172`	`SearchHistoryEntry(creationDate = time.minusSeconds(2), serviceId = 0, search = "B"),`
`173`	`173`	`SearchHistoryEntry(creationDate = time.minusSeconds(3), serviceId = 2, search = "AA"),`
`174`		`- SearchHistoryEntry(creationDate = time.minusSeconds(1), serviceId = 1, search = "A"),`
	`174`	`+ SearchHistoryEntry(creationDate = time.minusSeconds(1), serviceId = 1, search = "A")`
`175`	`175`	`)`
`176`	`176`	`}`
`177`	`177`	`}`
Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ class StreamItemAdapterTest {`
`292`	`292`	`Assert.assertEquals(`
`293`	`293`	`"normal visibility (pos=[$position]) is not correct",`
`294`	`294`	`findViewById<View>(R.id.wo_sound_icon).visibility,`
`295`		`- normalVisibility,`
	`295`	`+ normalVisibility`
`296`	`296`	`)`
`297`	`297`	`}`
`298`	`298`	`spinner.adapter.getDropDownView(position, null, spinner).run {`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ class AboutActivity : AppCompatActivity() {`
`195`	`195`	`SoftwareComponent(`
`196`	`196`	`"SearchPreference", "2018", "ByteHamster",`
`197`	`197`	`"https://github.com/ByteHamster/SearchPreference", StandardLicenses.MIT`
`198`		`- ),`
	`198`	`+ )`
`199`	`199`	`)`
`200`	`200`	`}`
`201`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@ interface LocalItem {`
`14`	`14`	`PLAYLIST_REMOTE_ITEM,`
`15`	`15`
`16`	`16`	`PLAYLIST_STREAM_ITEM,`
`17`		`- STATISTIC_STREAM_ITEM,`
	`17`	`+ STATISTIC_STREAM_ITEM`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ data class PlaylistEntity @JvmOverloads constructor(`
`37`	`37`	`name = item.orderingName,`
`38`	`38`	`isThumbnailPermanent = item.isThumbnailPermanent!!,`
`39`	`39`	`thumbnailStreamId = item.thumbnailStreamId!!,`
`40`		`- displayIndex = item.displayIndex!!,`
	`40`	`+ displayIndex = item.displayIndex!!`
`41`	`41`	`)`
`42`	`42`
`43`	`43`	`companion object {`