feat: update existing subscription on duplicate URL

Author: whalechoi

app/src/main/kotlin/app/MainActivity.kt

@@ -29,8 +29,8 @@ import features.settings.locale.localizedAppContext
 import features.subscription.SubscriptionInstallConfigUseCase
 import features.subscription.isSubscriptionInstallConfigUri
 import features.subscription.runtime.AndroidSubscriptionFetcher
+import features.subscription.subscriptionInstallMessage
 import features.subscription.toSubscriptionInstallConfigOrNull
-import features.subscription.usecase.subscriptionUpdateMessage
 import kotlinx.coroutines.launch
 import ui.feedback.AndroidToastTipNotifier
 
@@ -189,8 +189,9 @@ class MainActivity : ComponentActivity() {
                 subscriptionInstallConfigUseCase.install(config)
             }.onSuccess { result ->
                 tipNotifier.show(
-                    subscriptionUpdateMessage(
+                    subscriptionInstallMessage(
                         result = result,
+                        existingUrlTemplate = getString(R.string.subscription_install_existing_url),
                         successTemplate = getString(R.string.proxy_server_list_subscription_update_result),
                         failedTemplate = getString(R.string.proxy_server_list_subscription_update_result_with_failed),
                     ),

app/src/main/kotlin/features/proxy/server/list/ProxyServerListMessages.kt

@@ -15,6 +15,7 @@ internal data class ProxyServerListMessages(
     val noTestableServers: String,
     val latencyDoneTemplate: String,
     val realConnectionDoneTemplate: String,
+    val subscriptionInstallExistingUrlTemplate: String,
     val sortDone: String,
     val subscriptionUpdateResultTemplate: String,
     val subscriptionUpdateResultWithFailedTemplate: String,
@@ -42,6 +43,7 @@ internal fun proxyServerListMessages(): ProxyServerListMessages {
         noTestableServers = stringResource(R.string.proxy_server_list_no_testable),
         latencyDoneTemplate = stringResource(R.string.proxy_server_list_latency_done),
         realConnectionDoneTemplate = stringResource(R.string.proxy_server_list_real_connection_done),
+        subscriptionInstallExistingUrlTemplate = stringResource(R.string.subscription_install_existing_url),
         sortDone = stringResource(R.string.common_complete),
         subscriptionUpdateResultTemplate = stringResource(R.string.proxy_server_list_subscription_update_result),
         subscriptionUpdateResultWithFailedTemplate =

app/src/main/kotlin/features/proxy/server/list/ProxyServerListTopBar.kt

@@ -33,6 +33,7 @@ import features.subscription.DefaultSubscriptionGroupId
 import features.subscription.SubscriptionInstallConfigUseCase
 import features.subscription.runtime.AndroidSubscriptionFetchOptions
 import features.subscription.runtime.AndroidSubscriptionFetcher
+import features.subscription.subscriptionInstallMessage
 import features.subscription.usecase.subscriptionUpdateMessage
 import features.subscription.usecase.toSubscriptionFetchOptions
 import features.subscription.usecase.updateSubscriptions
@@ -274,8 +275,9 @@ private suspend fun installSubscriptionFromText(
         ).install(config)
     }.onSuccess { result ->
         tipNotifier.show(
-            subscriptionUpdateMessage(
+            subscriptionInstallMessage(
                 result = result,
+                existingUrlTemplate = messages.subscriptionInstallExistingUrlTemplate,
                 successTemplate = messages.subscriptionUpdateResultTemplate,
                 failedTemplate = messages.subscriptionUpdateResultWithFailedTemplate,
             ),

app/src/main/kotlin/features/subscription/SubscriptionInstallConfigUseCase.kt

@@ -13,7 +13,9 @@ import features.proxy.server.usecase.withUpdatedSubscriptionServers
 import features.subscription.runtime.AndroidSubscriptionFetcher
 import features.subscription.usecase.toSubscriptionFetchOptions
 import features.subscription.usecase.updateSubscriptions
+import features.subscription.usecase.subscriptionUpdateMessage
 import io.ktor.http.Url
+import ui.text.formatTemplate
 import utils.decodeUrlComponentPreservingPlus
 
 internal data class SubscriptionInstallConfig(
@@ -22,14 +24,19 @@ internal data class SubscriptionInstallConfig(
     val userAgent: String,
 )
 
+internal data class SubscriptionInstallResult(
+    val updateResult: ProxyServerListSubscriptionUpdateResult,
+    val existingGroupName: String?,
+)
+
 internal class SubscriptionInstallConfigUseCase(
     private val stateStore: AndroidAppStateStore,
     private val subscriptionFetcher: AndroidSubscriptionFetcher,
 ) {
-    suspend fun install(config: SubscriptionInstallConfig): ProxyServerListSubscriptionUpdateResult {
-        val group = stateStore.prepareSubscriptionInstallGroup(config)
+    suspend fun install(config: SubscriptionInstallConfig): SubscriptionInstallResult {
+        val preparedGroup = stateStore.prepareSubscriptionInstallGroup(config)
         val result = updateSubscriptions(
-            groups = listOf(group),
+            groups = listOf(preparedGroup.group),
             subscriptionFetcher = subscriptionFetcher,
             fetchOptions = { stateStore.state.value.toSubscriptionFetchOptions(it) },
         )
@@ -41,10 +48,31 @@ internal class SubscriptionInstallConfigUseCase(
                 )
             }
         }
-        return result
+        return SubscriptionInstallResult(
+            updateResult = result,
+            existingGroupName = preparedGroup.existingGroupName,
+        )
     }
 }
 
+internal fun subscriptionInstallMessage(
+    result: SubscriptionInstallResult,
+    existingUrlTemplate: String,
+    successTemplate: String,
+    failedTemplate: String,
+): String {
+    val updateMessage = subscriptionUpdateMessage(
+        result = result.updateResult,
+        successTemplate = successTemplate,
+        failedTemplate = failedTemplate,
+    )
+    val existingGroupName = result.existingGroupName ?: return updateMessage
+    return listOf(
+        existingUrlTemplate.formatTemplate("name" to existingGroupName),
+        updateMessage,
+    ).joinToString(separator = "\n")
+}
+
 internal fun Intent.toSubscriptionInstallConfigOrNull(): SubscriptionInstallConfig? {
     if (action != Intent.ACTION_VIEW) return null
     return data?.toString()?.toSubscriptionInstallConfigOrNull()
@@ -103,15 +131,26 @@ private fun Url.toRawHttpsSubscriptionInstallConfigOrNull(rawValue: String): Sub
 
 private fun AndroidAppStateStore.prepareSubscriptionInstallGroup(
     config: SubscriptionInstallConfig,
-): SubscriptionGroupState {
-    var savedGroup: SubscriptionGroupState? = null
+): PreparedSubscriptionInstallGroup {
+    var preparedGroup: PreparedSubscriptionInstallGroup? = null
     update { state ->
+        val existingGroup = state.existingSubscriptionGroupByUrl(config.url)
+        if (existingGroup != null) {
+            preparedGroup = PreparedSubscriptionInstallGroup(
+                group = existingGroup,
+                existingGroupName = existingGroup.name,
+            )
+            return@update state
+        }
         val reusableGroup = state.reusableDefaultSubscriptionGroup()
         val group = reusableGroup?.copy(
             url = config.url,
             userAgent = config.userAgent,
         ) ?: state.newSubscriptionGroup(config)
-        savedGroup = group
+        preparedGroup = PreparedSubscriptionInstallGroup(
+            group = group,
+            existingGroupName = null,
+        )
         if (reusableGroup == null) {
             state.copy(
                 subscriptionGroups = state.subscriptionGroups + group,
@@ -125,7 +164,16 @@ private fun AndroidAppStateStore.prepareSubscriptionInstallGroup(
             )
         }
     }
-    return checkNotNull(savedGroup)
+    return checkNotNull(preparedGroup)
+}
+
+private data class PreparedSubscriptionInstallGroup(
+    val group: SubscriptionGroupState,
+    val existingGroupName: String?,
+)
+
+private fun AppState.existingSubscriptionGroupByUrl(url: String): SubscriptionGroupState? {
+    return subscriptionGroups.firstOrNull { group -> group.url == url }
 }
 
 private fun AppState.reusableDefaultSubscriptionGroup(): SubscriptionGroupState? {

app/src/main/res/values-zh-rCN/strings.xml

@@ -511,6 +511,7 @@
     <string name="subscription_auto_update_interval">自动更新间隔（小时）</string>
     <string name="subscription_update_via_proxy">使用代理更新</string>
     <string name="subscription_update_via_proxy_summary">通过本地代理请求订阅地址</string>
+    <string name="subscription_install_existing_url">订阅地址已存在于“{name}”，正在更新该分组</string>
     <string name="subscription_install_config_invalid">无效的订阅链接</string>
     <string name="subscription_install_config_failed">导入订阅失败</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -511,6 +511,7 @@
     <string name="subscription_auto_update_interval">Auto update interval (hours)</string>
     <string name="subscription_update_via_proxy">Update via proxy</string>
     <string name="subscription_update_via_proxy_summary">Use the local proxy for subscription requests</string>
+    <string name="subscription_install_existing_url">A matching subscription URL already exists in {name}; updating that group</string>
     <string name="subscription_install_config_invalid">Invalid subscription link</string>
     <string name="subscription_install_config_failed">Failed to import subscription</string>
 </resources>