From ba03118a43ececf0ed315922f1363f4886a930e1 Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Sun, 6 Apr 2025 14:22:30 +0800 Subject: [PATCH] Code clean --- .../java/com/v2ray/ang/ui/MainActivity.kt | 137 +----------------- V2rayNG/app/src/main/res/menu/menu_main.xml | 23 --- .../app/src/main/res/values-ar/strings.xml | 5 - .../app/src/main/res/values-bn/strings.xml | 5 - .../src/main/res/values-bqi-rIR/strings.xml | 5 - .../app/src/main/res/values-fa/strings.xml | 5 - .../app/src/main/res/values-ru/strings.xml | 5 - .../app/src/main/res/values-vi/strings.xml | 5 - .../src/main/res/values-zh-rCN/strings.xml | 5 - .../src/main/res/values-zh-rTW/strings.xml | 5 - V2rayNG/app/src/main/res/values/strings.xml | 5 - 11 files changed, 4 insertions(+), 201 deletions(-) diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt index e6abbba3..b4e8ac44 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt @@ -87,9 +87,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList Action.IMPORT_QR_CODE_CONFIG -> scanQRCodeForConfig.launch(Intent(this, ScannerActivity::class.java)) -// Action.IMPORT_QR_CODE_URL -> -// scanQRCodeForUrlToCustomConfig.launch(Intent(this, ScannerActivity::class.java)) - Action.READ_CONTENT_FROM_URI -> chooseFileForCustomConfig.launch(Intent.createChooser(Intent(Intent.ACTION_GET_CONTENT).apply { type = "*/*" @@ -110,8 +107,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList enum class Action { NONE, IMPORT_QR_CODE_CONFIG, - - //IMPORT_QR_CODE_URL, READ_CONTENT_FROM_URI, POST_NOTIFICATIONS } @@ -129,12 +124,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList } } -// private val scanQRCodeForUrlToCustomConfig = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { -// if (it.resultCode == RESULT_OK) { -// importConfigCustomUrl(it.data?.getStringExtra("SCAN_RESULT")) -// } -// } - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(binding.root) @@ -325,7 +314,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) { R.id.import_qrcode -> { - importQRcode(true) + importQRcode() true } @@ -379,26 +368,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList true } -// R.id.import_config_custom_clipboard -> { -// importConfigCustomClipboard() -// true -// } -// -// R.id.import_config_custom_local -> { -// importConfigCustomLocal() -// true -// } -// -// R.id.import_config_custom_url -> { -// importConfigCustomUrlClipboard() -// true -// } -// -// R.id.import_config_custom_url_scan -> { -// importQRcode(false) -// true -// } - R.id.export_all -> { exportAll() true @@ -462,16 +431,12 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList /** * import config from qrcode */ - private fun importQRcode(forConfig: Boolean): Boolean { + private fun importQRcode(): Boolean { val permission = Manifest.permission.CAMERA if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) { - if (forConfig) { - scanQRCodeForConfig.launch(Intent(this, ScannerActivity::class.java)) - } else { - //scanQRCodeForUrlToCustomConfig.launch(Intent(this, ScannerActivity::class.java)) - } + scanQRCodeForConfig.launch(Intent(this, ScannerActivity::class.java)) } else { - pendingAction = Action.IMPORT_QR_CODE_CONFIG//if (forConfig) Action.IMPORT_QR_CODE_CONFIG else Action.IMPORT_QR_CODE_URL + pendingAction = Action.IMPORT_QR_CODE_CONFIG requestPermissionLauncher.launch(permission) } return true @@ -535,77 +500,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList } -// private fun importConfigCustomClipboard() -// : Boolean { -// try { -// val configText = Utils.getClipboard(this) -// if (TextUtils.isEmpty(configText)) { -// toast(R.string.toast_none_data_clipboard) -// return false -// } -// importCustomizeConfig(configText) -// return true -// } catch (e: Exception) { -// e.printStackTrace() -// return false -// } -// } - - /** - * import config from local config file - */ -// private fun importConfigCustomLocal(): Boolean { -// try { -// showFileChooser() -// } catch (e: Exception) { -// e.printStackTrace() -// return false -// } -// return true -// } -// -// private fun importConfigCustomUrlClipboard() -// : Boolean { -// try { -// val url = Utils.getClipboard(this) -// if (TextUtils.isEmpty(url)) { -// toast(R.string.toast_none_data_clipboard) -// return false -// } -// return importConfigCustomUrl(url) -// } catch (e: Exception) { -// e.printStackTrace() -// return false -// } -// } - - /** - * import config from url - */ -// private fun importConfigCustomUrl(url: String?): Boolean { -// try { -// if (!Utils.isValidUrl(url)) { -// toast(R.string.toast_invalid_url) -// return false -// } -// lifecycleScope.launch(Dispatchers.IO) { -// val configText = try { -// HttpUtil.getUrlContentWithUserAgent(url) -// } catch (e: Exception) { -// e.printStackTrace() -// "" -// } -// launch(Dispatchers.Main) { -// importCustomizeConfig(configText) -// } -// } -// } catch (e: Exception) { -// e.printStackTrace() -// return false -// } -// return true -// } - /** * import config from sub */ @@ -755,29 +649,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList } } -// /** -// * import customize config -// */ -// private fun importCustomizeConfig(server: String?) { -// try { -// if (server == null || TextUtils.isEmpty(server)) { -// toast(R.string.toast_none_data) -// return -// } -// if (mainViewModel.appendCustomConfigServer(server)) { -// mainViewModel.reloadServerList() -// toastSuccess(R.string.toast_success) -// } else { -// toastError(R.string.toast_failure) -// } -// //adapter.notifyItemInserted(mainViewModel.serverList.lastIndex) -// } catch (e: Exception) { -// ToastCompat.makeText(this, "${getString(R.string.toast_malformed_josn)} ${e.cause?.message}", Toast.LENGTH_LONG).show() -// e.printStackTrace() -// return -// } -// } - private fun setTestState(content: String?) { binding.tvTestState.text = content } diff --git a/V2rayNG/app/src/main/res/menu/menu_main.xml b/V2rayNG/app/src/main/res/menu/menu_main.xml index 1559333f..ce231ae7 100644 --- a/V2rayNG/app/src/main/res/menu/menu_main.xml +++ b/V2rayNG/app/src/main/res/menu/menu_main.xml @@ -56,29 +56,6 @@ android:id="@+id/import_manually_hysteria2" android:title="@string/menu_item_import_config_manually_hysteria2" app:showAsAction="never" /> - - - - - - - - - - - - - - - - - - - - - - - الكتابة يدويًا [Trojan] الكتابة يدويًا [Wireguard] Type manually[Hysteria2] - تكوين مخصص - استيراد تكوين مخصص من الحافظة - استيراد تكوين مخصص من الجهاز - استيراد تكوين مخصص من عنوان URL - استيراد تكوين مخصص مسح عنوان URL تأكيد الحذف؟ Please test before deleting! Confirm delete ? ملاحظات diff --git a/V2rayNG/app/src/main/res/values-bn/strings.xml b/V2rayNG/app/src/main/res/values-bn/strings.xml index 7de4de1d..9c6e7d7c 100644 --- a/V2rayNG/app/src/main/res/values-bn/strings.xml +++ b/V2rayNG/app/src/main/res/values-bn/strings.xml @@ -35,11 +35,6 @@ ম্যানুয়ালি টাইপ করুন [Trojan] ম্যানুয়ালি টাইপ করুন [Wireguard] Type manually[Hysteria2] - কাস্টম কনফিগারেশন - ক্লিপবোর্ড থেকে কাস্টম কনফিগারেশন আমদানি করুন - স্থানীয়ভাবে কাস্টম কনফিগারেশন আমদানি করুন - URL থেকে কাস্টম কনফিগারেশন আমদানি করুন - কাস্টম কনফিগারেশন স্ক্যান URL আমদানি করুন মুছে ফেলুন নিশ্চিত করুন？ Please test before deleting! Confirm delete ? মন্তব্য diff --git a/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml b/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml index b3b82540..0257338c 100644 --- a/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml +++ b/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml @@ -35,11 +35,6 @@ هؽل دستی[Trojan] هؽل دستی[Wireguard] هؽل دستی[Hysteria2] - کانفیگ سفارشی - کانفیگ سفارشین ز کلیپ بورد و من بیار - کانفیگ سفارشین ز مهلی و من بیار - کانفیگ سفارشین ز نشۊوی اینترنتی و من بیار - نشۊوی اینترنتی اسکن کانفیگ سفارشین بزݩ پاک بۊ؟ پؽش ز پاک کردن کانفیگ نا موئتبر واجۊری کوݩ! پاک کردن کانفیگن قوۊل اکۊنی؟ نیشتنا diff --git a/V2rayNG/app/src/main/res/values-fa/strings.xml b/V2rayNG/app/src/main/res/values-fa/strings.xml index 5862efef..3c0598f0 100644 --- a/V2rayNG/app/src/main/res/values-fa/strings.xml +++ b/V2rayNG/app/src/main/res/values-fa/strings.xml @@ -35,11 +35,6 @@ تایپ دستی[TROJAN] ‌تایپ دستی[WIREGUARD] تایپ دستی[HYSTERIA2] - کانفیگ سفارشی - کانفیگ سفارشی را از کلیپ ‌بورد وارد کنید - کانفیگ سفارشی را به صورت محلی وارد کنید - کانفیگ سفارشی را از طریق نشانی اینترنتی وارد کنید - نشانی اینترنتی اسکن کانفیگ سفارشی را وارد کنید حذف شود؟ لطفا قبل از حذف کانفیگ نامعتبر بررسی کنید! حذف کانفیگ را تایید می کنید؟ ملاحظات diff --git a/V2rayNG/app/src/main/res/values-ru/strings.xml b/V2rayNG/app/src/main/res/values-ru/strings.xml index 0b98c275..2950d1a5 100644 --- a/V2rayNG/app/src/main/res/values-ru/strings.xml +++ b/V2rayNG/app/src/main/res/values-ru/strings.xml @@ -35,11 +35,6 @@ Ручной ввод Trojan Ручной ввод WireGuard Ручной ввод Hysteria2 - Другой профиль - Импорт из буфера обмена - Импорт из файла - Импорт из URL - Импорт сканированием URL Подтверждаете удаление? Выполните проверку перед удалением! Подтверждаете удаление? Название diff --git a/V2rayNG/app/src/main/res/values-vi/strings.xml b/V2rayNG/app/src/main/res/values-vi/strings.xml index c71d0393..8e3d7c2a 100644 --- a/V2rayNG/app/src/main/res/values-vi/strings.xml +++ b/V2rayNG/app/src/main/res/values-vi/strings.xml @@ -35,11 +35,6 @@ Nhập thủ công [Trojan] Nhập thủ công [WireGuard] Type manually[Hysteria2] - Nâng cao / Cấu hình tùy chỉnh - Nhập cấu hình tùy chỉnh từ Clipboard - Nhập cấu hình tùy chỉnh từ Tệp - Nhập cấu hình tùy chỉnh từ URL - Nhập cấu hình tùy chỉnh quét URL Xác nhận xóa? Please test before deleting! Confirm delete ? Tên cấu hình diff --git a/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml b/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml index 7da94eef..44ec4fa8 100644 --- a/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml +++ b/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml @@ -35,11 +35,6 @@ 手动输入 [Trojan] 手动输入 [Wireguard] 手动输入 [Hysteria2] - 自定义配置 - 从剪贴板导入自定义配置 - 从本地导入自定义配置 - 剪贴板 URL 导入自定义配置 - 扫描 URL 导入自定义配置 确认删除？ 删除前请先测试！确认删除？ 别名 (remarks) diff --git a/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml b/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml index 013117b9..f6abbdcf 100644 --- a/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml +++ b/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml @@ -35,11 +35,6 @@ 手動鍵入 [Trojan] 手動鍵入 [Wireguard] 手動鍵入 [Hysteria2] - 自訂設定 - 從剪貼簿匯入自訂設定 - 從本地匯入自訂設定 - 從 URL 匯入自訂設定 - 掃描 URL 匯入自訂設定 確定刪除？ 刪除前請先測試！確認刪除？ 備註 diff --git a/V2rayNG/app/src/main/res/values/strings.xml b/V2rayNG/app/src/main/res/values/strings.xml index cd2cfdf4..a9570d42 100644 --- a/V2rayNG/app/src/main/res/values/strings.xml +++ b/V2rayNG/app/src/main/res/values/strings.xml @@ -36,11 +36,6 @@ Type manually[Trojan] Type manually[Wireguard] Type manually[Hysteria2] - Custom config - Import custom config from Clipboard - Import custom config from locally - Import custom config from URL - Import custom config scan URL Confirm delete ? Please test before deleting! Confirm delete ? remarks