up

app/src/main/java/io/legado/app/ui/book/read/config/BgTextConfigDialog.kt

@@ -195,7 +195,6 @@ class BgTextConfigDialog : DialogFragment() {
                                         ReadBookConfig.upBg()
                                         postEvent(Bus.UP_CONFIG, false)
                                     }
-                                    Unit
                                 }
                                 .request()
                         }

app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt

@@ -21,6 +21,8 @@ import io.legado.app.R
 import io.legado.app.base.VMBaseActivity
 import io.legado.app.data.entities.BookSource
 import io.legado.app.help.ItemTouchCallback
+import io.legado.app.help.permission.Permissions
+import io.legado.app.help.permission.PermissionsCompat
 import io.legado.app.lib.dialogs.alert
 import io.legado.app.lib.dialogs.cancelButton
 import io.legado.app.lib.dialogs.customView
@@ -40,6 +42,7 @@ import org.jetbrains.anko.startActivity
 import org.jetbrains.anko.startActivityForResult
 import org.jetbrains.anko.startService
 import org.jetbrains.anko.toast
+import java.io.FileNotFoundException
 
 class BookSourceActivity : VMBaseActivity<BookSourceViewModel>(R.layout.activity_book_source),
     BookSourceAdapter.CallBack,
@@ -295,11 +298,22 @@ class BookSourceActivity : VMBaseActivity<BookSourceViewModel>(R.layout.activity
                             Snackbar.make(title_bar, R.string.importing, Snackbar.LENGTH_INDEFINITE)
                                 .show()
                             viewModel.importSource(it) { msg ->
-                                toast(msg)
+                                title_bar.snackbar(msg)
+                            }
                         }
+                    } catch (e: FileNotFoundException) {
+                        PermissionsCompat.Builder(this)
+                            .addPermissions(
+                                Permissions.READ_EXTERNAL_STORAGE,
+                                Permissions.WRITE_EXTERNAL_STORAGE
+                            )
+                            .rationale(R.string.bg_image_per)
+                            .onGranted {
+                                selectFileSys()
                             }
+                            .request()
                     } catch (e: Exception) {
-                        e.localizedMessage?.let { toast(it) }
+                        toast(e.localizedMessage ?: "ERROR")
                     }
                 }
             }

app/src/main/java/io/legado/app/ui/replacerule/ReplaceRuleActivity.kt

@@ -21,6 +21,8 @@ import io.legado.app.R
 import io.legado.app.base.VMBaseActivity
 import io.legado.app.data.entities.ReplaceRule
 import io.legado.app.help.ItemTouchCallback
+import io.legado.app.help.permission.Permissions
+import io.legado.app.help.permission.PermissionsCompat
 import io.legado.app.lib.dialogs.alert
 import io.legado.app.lib.dialogs.cancelButton
 import io.legado.app.lib.dialogs.customView
@@ -34,6 +36,7 @@ import kotlinx.android.synthetic.main.activity_replace_rule.*
 import kotlinx.android.synthetic.main.dialog_edit_text.view.*
 import kotlinx.android.synthetic.main.view_search.*
 import org.jetbrains.anko.toast
+import java.io.FileNotFoundException
 
 
 class ReplaceRuleActivity : VMBaseActivity<ReplaceRuleViewModel>(R.layout.activity_replace_rule),
@@ -214,8 +217,19 @@ class ReplaceRuleActivity : VMBaseActivity<ReplaceRuleViewModel>(R.layout.activi
                                 title_bar.snackbar(msg)
                             }
                         }
+                    } catch (e: FileNotFoundException) {
+                        PermissionsCompat.Builder(this)
+                            .addPermissions(
+                                Permissions.READ_EXTERNAL_STORAGE,
+                                Permissions.WRITE_EXTERNAL_STORAGE
+                            )
+                            .rationale(R.string.bg_image_per)
+                            .onGranted {
+                                selectFileSys()
+                            }
+                            .request()
                     } catch (e: Exception) {
-                        e.localizedMessage?.let { toast(it) }
+                        toast(e.localizedMessage ?: "ERROR")
                     }
                 }
             }

app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt

@@ -21,6 +21,8 @@ import io.legado.app.R
 import io.legado.app.base.VMBaseActivity
 import io.legado.app.data.entities.RssSource
 import io.legado.app.help.ItemTouchCallback
+import io.legado.app.help.permission.Permissions
+import io.legado.app.help.permission.PermissionsCompat
 import io.legado.app.lib.dialogs.alert
 import io.legado.app.lib.dialogs.cancelButton
 import io.legado.app.lib.dialogs.customView
@@ -37,6 +39,8 @@ import kotlinx.android.synthetic.main.dialog_edit_text.view.*
 import kotlinx.android.synthetic.main.view_search.*
 import org.jetbrains.anko.startActivity
 import org.jetbrains.anko.startActivityForResult
+import org.jetbrains.anko.toast
+import java.io.FileNotFoundException
 
 
 class RssSourceActivity : VMBaseActivity<RssSourceViewModel>(R.layout.activity_rss_source),
@@ -234,6 +238,7 @@ class RssSourceActivity : VMBaseActivity<RssSourceViewModel>(R.layout.activity_r
         when (requestCode) {
             importSource -> if (resultCode == Activity.RESULT_OK) {
                 data?.data?.let { uri ->
+                    try {
                         uri.readText(this)?.let {
                             Snackbar.make(title_bar, R.string.importing, Snackbar.LENGTH_INDEFINITE)
                                 .show()
@@ -241,6 +246,20 @@ class RssSourceActivity : VMBaseActivity<RssSourceViewModel>(R.layout.activity_r
                                 title_bar.snackbar(msg)
                             }
                         }
+                    } catch (e: FileNotFoundException) {
+                        PermissionsCompat.Builder(this)
+                            .addPermissions(
+                                Permissions.READ_EXTERNAL_STORAGE,
+                                Permissions.WRITE_EXTERNAL_STORAGE
+                            )
+                            .rationale(R.string.bg_image_per)
+                            .onGranted {
+                                selectFileSys()
+                            }
+                            .request()
+                    } catch (e: Exception) {
+                        toast(e.localizedMessage ?: "ERROR")
+                    }
                 }
             }
             qrRequestCode -> if (resultCode == RESULT_OK) {