导入书源时重命名分组和保留名称不冲突

app/src/main/java/io/legado/app/ui/association/ImportBookSourceViewModel.kt

@@ -53,9 +53,6 @@ class ImportBookSourceViewModel(app: Application) : BaseViewModel(app) {
             selectStatus.forEachIndexed { index, b ->
                 if (b) {
                     val source = allSources[index]
-                    if (groupName != null) {
-                        source.bookSourceGroup = groupName
-                    }
                     if (keepName) {
                         checkSources[index]?.let {
                             source.bookSourceName = it.bookSourceName
@@ -63,6 +60,9 @@ class ImportBookSourceViewModel(app: Application) : BaseViewModel(app) {
                             source.customOrder = it.customOrder
                         }
                     }
+                    if (groupName != null) {
+                        source.bookSourceGroup = groupName
+                    }
                     selectSource.add(source)
                 }
             }

app/src/main/java/io/legado/app/ui/association/ImportRssSourceViewModel.kt

@@ -50,15 +50,16 @@ class ImportRssSourceViewModel(app: Application) : BaseViewModel(app) {
             selectStatus.forEachIndexed { index, b ->
                 if (b) {
                     val source = allSources[index]
-                    if (groupName != null) {
-                        source.sourceGroup = groupName
-                    }
                     if (keepName) {
                         checkSources[index]?.let {
                             source.sourceName = it.sourceName
                             source.sourceGroup = it.sourceGroup
+                            source.customOrder = it.customOrder
                         }
                     }
+                    if (groupName != null) {
+                        source.sourceGroup = groupName
+                    }
                     selectSource.add(source)
                 }
             }