diff --git a/mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt b/mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt index 1e84b041..1bfb3970 100644 --- a/mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt +++ b/mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt @@ -368,14 +368,14 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener { } R.id.action_import -> { try { - val profiles = Profile.findAll(clipboard.primaryClip.getItemAt(0).text).toList() + val profiles = Profile.findAll(clipboard.primaryClip!!.getItemAt(0).text).toList() if (profiles.isNotEmpty()) { profiles.forEach { ProfileManager.createProfile(it) } Snackbar.make(requireActivity().findViewById(R.id.snackbar), R.string.action_import_msg, Snackbar.LENGTH_LONG).show() return true } - } catch (_: IndexOutOfBoundsException) { } + } catch (_: Exception) { } Snackbar.make(requireActivity().findViewById(R.id.snackbar), R.string.action_import_err, Snackbar.LENGTH_LONG).show() true diff --git a/mobile/src/main/java/com/github/shadowsocks/acl/CustomRulesFragment.kt b/mobile/src/main/java/com/github/shadowsocks/acl/CustomRulesFragment.kt index f244acaf..969245f9 100644 --- a/mobile/src/main/java/com/github/shadowsocks/acl/CustomRulesFragment.kt +++ b/mobile/src/main/java/com/github/shadowsocks/acl/CustomRulesFragment.kt @@ -438,7 +438,7 @@ class CustomRulesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener, } R.id.action_import -> { try { - adapter.addToProxy(clipboard.primaryClip.getItemAt(0).text.toString()) != null + check(adapter.addToProxy(clipboard.primaryClip!!.getItemAt(0).text.toString()) != null) } catch (exc: Exception) { Snackbar.make(requireActivity().findViewById(R.id.snackbar), R.string.action_import_err, Snackbar.LENGTH_LONG).show()