优化

app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditViewModel.kt

@@ -1,8 +1,6 @@
 package io.legado.app.ui.book.source.edit
 
 import android.app.Application
-import android.content.ClipboardManager
-import android.content.Context
 import android.content.Intent
 import io.legado.app.App
 import io.legado.app.base.BaseViewModel
@@ -10,6 +8,7 @@ import io.legado.app.data.entities.BookSource
 import io.legado.app.help.storage.OldRule
 import io.legado.app.utils.GSON
 import io.legado.app.utils.fromJsonObject
+import io.legado.app.utils.getClipText
 import kotlinx.coroutines.Dispatchers
 
 class BookSourceEditViewModel(application: Application) : BaseViewModel(application) {
@@ -54,13 +53,9 @@ class BookSourceEditViewModel(application: Application) : BaseViewModel(applicat
     fun pasteSource(onSuccess: (source: BookSource) -> Unit) {
         execute(context = Dispatchers.Main) {
             var source: BookSource? = null
-            val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager?
-            clipboard?.primaryClip?.let {
-                if (it.itemCount > 0) {
-                    val json = it.getItemAt(0).text.toString()
+            context.getClipText()?.let { json ->
                 source = OldRule.jsonToBookSource(json)
             }
-            }
             source
         }.onError {
             toast(it.localizedMessage)

app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditViewModel.kt

@@ -1,14 +1,13 @@
 package io.legado.app.ui.rss.source.edit
 
 import android.app.Application
-import android.content.ClipboardManager
-import android.content.Context
 import android.content.Intent
 import io.legado.app.App
 import io.legado.app.base.BaseViewModel
 import io.legado.app.data.entities.RssSource
 import io.legado.app.utils.GSON
 import io.legado.app.utils.fromJsonObject
+import io.legado.app.utils.getClipText
 import kotlinx.coroutines.Dispatchers
 
 class RssSourceEditViewModel(application: Application) : BaseViewModel(application) {
@@ -53,13 +52,9 @@ class RssSourceEditViewModel(application: Application) : BaseViewModel(applicati
     fun pasteSource(onSuccess: (source: RssSource) -> Unit) {
         execute(context = Dispatchers.Main) {
             var source: RssSource? = null
-            val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager?
-            clipboard?.primaryClip?.let {
-                if (it.itemCount > 0) {
-                    val json = it.getItemAt(0).text.toString().trim()
+            context.getClipText()?.let { json ->
                 source = GSON.fromJsonObject<RssSource>(json)
             }
-            }
             source
         }.onError {
             toast(it.localizedMessage)