From eb6d63956d088d91790539737a421cc5e590d835 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Fri, 11 Nov 2022 15:35:10 -0500
Subject: [PATCH] Remove duplicate pinned sources setting

I guess it's simpler to just have 1 entry in the list (other than the last used duplicate).
This helps ensure that the list is as short as it can be.

(cherry picked from commit a8eebd824a50d4676cc31aec51ede94009b82851)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/source/interactor/GetEnabledSources.kt
#	app/src/main/java/eu/kanade/domain/source/model/Source.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt
---
 .../kanade/domain/source/interactor/GetEnabledSources.kt   | 5 -----
 app/src/main/java/eu/kanade/domain/source/model/Source.kt  | 4 +---
 .../more/settings/screen/SettingsBrowseScreen.kt           | 7 -------
 i18n/src/main/res/values/strings.xml                       | 2 --
 4 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/GetEnabledSources.kt b/app/src/main/java/eu/kanade/domain/source/interactor/GetEnabledSources.kt
index c163a7d73..4863d1ed1 100644
--- a/app/src/main/java/eu/kanade/domain/source/interactor/GetEnabledSources.kt
+++ b/app/src/main/java/eu/kanade/domain/source/interactor/GetEnabledSources.kt
@@ -33,7 +33,6 @@ class GetEnabledSources(
             // SY <--
             repository.getSources(),
         ) { pinnedSourceIds, (enabledLanguages, disabledSources, lastUsedSource), (excludedFromDataSaver, sourcesInCategories, sourceCategoriesFilter), sources ->
-            val duplicatePins = preferences.duplicatePinnedSources().get()
             val sourcesAndCategories = sourcesInCategories.map {
                 it.split('|').let { (source, test) -> source.toLong() to test }
             }
@@ -58,10 +57,6 @@ class GetEnabledSources(
                     if (source.id == lastUsedSource) {
                         toFlatten.add(source.copy(isUsedLast = true, pin = source.pin - Pin.Actual))
                     }
-                    if (duplicatePins && Pin.Pinned in source.pin) {
-                        toFlatten[0] = toFlatten[0].copy(pin = source.pin + Pin.Forced)
-                        toFlatten.add(source.copy(pin = source.pin - Pin.Actual))
-                    }
                     // SY -->
                     categories.forEach { category ->
                         toFlatten.add(source.copy(category = category, pin = source.pin - Pin.Actual))
diff --git a/app/src/main/java/eu/kanade/domain/source/model/Source.kt b/app/src/main/java/eu/kanade/domain/source/model/Source.kt
index 47f3c83fc..b9b80b4a0 100644
--- a/app/src/main/java/eu/kanade/domain/source/model/Source.kt
+++ b/app/src/main/java/eu/kanade/domain/source/model/Source.kt
@@ -19,7 +19,7 @@ data class Source(
     val category: String? = null,
     val isExcludedFromDataSaver: Boolean = false,
     val categories: Set<String> = emptySet(),
-// SY <--
+    // SY <--
 ) {
 
     val visualName: String
@@ -38,7 +38,6 @@ data class Source(
     val key: () -> String = {
         when {
             isUsedLast -> "$id-lastused"
-            Pin.Forced in pin -> "$id-forced"
             category != null -> "$id-$category"
             else -> "$id"
         }
@@ -49,7 +48,6 @@ sealed class Pin(val code: Int) {
     object Unpinned : Pin(0b00)
     object Pinned : Pin(0b01)
     object Actual : Pin(0b10)
-    object Forced : Pin(0b100)
 }
 
 inline fun Pins(builder: Pins.PinsBuilder.() -> Unit = {}): Pins {
diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt
index bf2e808b1..4c2316ff7 100644
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt
@@ -58,13 +58,6 @@ class SettingsBrowseScreen : SearchableSettings {
                             },
                         )
                     },
-                    // SY <--
-                    Preference.PreferenceItem.SwitchPreference(
-                        pref = sourcePreferences.duplicatePinnedSources(),
-                        title = stringResource(R.string.pref_duplicate_pinned_sources),
-                        subtitle = stringResource(R.string.pref_duplicate_pinned_sources_summary),
-                    ),
-                    // SY -->
                     Preference.PreferenceItem.SwitchPreference(
                         pref = sourcePreferences.sourcesTabCategoriesFilter(),
                         title = stringResource(R.string.pref_source_source_filtering),
diff --git a/i18n/src/main/res/values/strings.xml b/i18n/src/main/res/values/strings.xml
index acaeb47d3..4eb83ec5a 100755
--- a/i18n/src/main/res/values/strings.xml
+++ b/i18n/src/main/res/values/strings.xml
@@ -450,8 +450,6 @@
     <string name="action_track">Track</string>
 
       <!-- Browse section -->
-    <string name="pref_duplicate_pinned_sources">Show duplicated pinned sources</string>
-    <string name="pref_duplicate_pinned_sources_summary">Repeat pinned sources in their respective language groups</string>
     <string name="pref_enable_automatic_extension_updates">Check for extension updates</string>
     <string name="pref_search_pinned_sources_only">Only include pinned sources</string>