diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt index ea3ac4b3..080858a7 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt @@ -165,8 +165,8 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList importBatchConfig(data?.getStringExtra("SCAN_RESULT")) } REQUEST_FILE_CHOOSER -> { - if (resultCode == RESULT_OK) { - val uri = data!!.data + val uri = data?.data + if (resultCode == RESULT_OK && uri != null) { readContentFromUri(uri) } } @@ -460,9 +460,10 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList .subscribe { if (it) { try { - val inputStream = contentResolver.openInputStream(uri) - val configText = inputStream.bufferedReader().readText() - importCustomizeConfig(configText) + contentResolver.openInputStream(uri).use { + val configText = it?.bufferedReader()?.readText() + importCustomizeConfig(configText) + } } catch (e: Exception) { e.printStackTrace() } diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt index 5e019309..eff431da 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt @@ -119,10 +119,10 @@ class ScannerActivity : BaseActivity(), ZXingScannerView.ResultHandler { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { super.onActivityResult(requestCode, resultCode, data) when (requestCode) { - REQUEST_FILE_CHOOSER -> - if (resultCode == RESULT_OK) { + REQUEST_FILE_CHOOSER -> { + val uri = data?.data + if (resultCode == RESULT_OK && uri != null) { try { - val uri = data!!.data val bitmap = BitmapFactory.decodeStream(contentResolver.openInputStream(uri)) val text = QRCodeDecoder.syncDecodeQRCode(bitmap) finished(text) @@ -131,6 +131,7 @@ class ScannerActivity : BaseActivity(), ZXingScannerView.ResultHandler { toast(e.message.toString()) } } + } } } } diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt index 1a403778..a4960039 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt @@ -95,7 +95,7 @@ object Utils { try { val cmb = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager val clipData = ClipData.newPlainText(null, content) - cmb.primaryClip = clipData + cmb.setPrimaryClip(clipData) } catch (e: Exception) { e.printStackTrace() }