diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/AngConfigManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/AngConfigManager.kt index d7ee241e..32b19f00 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/AngConfigManager.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/AngConfigManager.kt @@ -138,11 +138,11 @@ object AngConfigManager { if (sb.count() > 0) { Utils.setClipboard(context, sb.toString()) } + return sb.lines().count() } catch (e: Exception) { e.printStackTrace() return -1 } - return 0 } /** 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 20dabaf0..f85567f1 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 @@ -346,8 +346,8 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList lifecycleScope.launch(Dispatchers.IO) { val ret = mainViewModel.exportAllServer() launch(Dispatchers.Main) { - if (ret == 0) - toast(R.string.toast_success) + if (ret > 0) + toast(getString(R.string.title_export_config_count, ret)) else toast(R.string.toast_failure) binding.pbWaiting.hide() @@ -519,7 +519,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList withContext(Dispatchers.Main) { when { count > 0 -> { - toast(R.string.toast_success) + toast(getString(R.string.title_import_config_count, count)) mainViewModel.reloadServerList() } @@ -625,7 +625,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList delay(500L) launch(Dispatchers.Main) { if (count > 0) { - toast(R.string.toast_success) + toast(getString(R.string.title_update_config_count, count)) mainViewModel.reloadServerList() } else { toast(R.string.toast_failure) diff --git a/V2rayNG/app/src/main/res/values-ar/strings.xml b/V2rayNG/app/src/main/res/values-ar/strings.xml index 635c6caf..6773d3a9 100644 --- a/V2rayNG/app/src/main/res/values-ar/strings.xml +++ b/V2rayNG/app/src/main/res/values-ar/strings.xml @@ -258,6 +258,9 @@ حذف %d من الإعدادات المكررة Delete %d configurations + Import %d configurations + Export %d configurations + Update %d configurations بدء الخدمة تأكيد diff --git a/V2rayNG/app/src/main/res/values-bn/strings.xml b/V2rayNG/app/src/main/res/values-bn/strings.xml index e53f5173..471775e6 100644 --- a/V2rayNG/app/src/main/res/values-bn/strings.xml +++ b/V2rayNG/app/src/main/res/values-bn/strings.xml @@ -257,6 +257,9 @@ সব সাবস্ক্রিপশন গ্রুপ %d ডুপ্লিকেট কনফিগারেশন মুছে ফেলুন Delete %d configurations + Import %d configurations + Export %d configurations + Update %d configurations সার্ভিস শুরু করুন নিশ্চিত করুন 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 f55197fa..dd2cb4a6 100644 --- a/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml +++ b/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml @@ -259,6 +259,9 @@ پاک کردن %d کانفیگ تکراری Delete %d configurations + Import %d configurations + Export %d configurations + Update %d configurations ره وندن خدمات قوۊل diff --git a/V2rayNG/app/src/main/res/values-fa/strings.xml b/V2rayNG/app/src/main/res/values-fa/strings.xml index efd8fb07..a13d5f43 100644 --- a/V2rayNG/app/src/main/res/values-fa/strings.xml +++ b/V2rayNG/app/src/main/res/values-fa/strings.xml @@ -257,6 +257,9 @@ حذف %d کانفیگ تکراری Delete %d configurations + Import %d configurations + Export %d configurations + Update %d configurations شروع خدمات تایید diff --git a/V2rayNG/app/src/main/res/values-ru/strings.xml b/V2rayNG/app/src/main/res/values-ru/strings.xml index e0f21c88..f921a104 100644 --- a/V2rayNG/app/src/main/res/values-ru/strings.xml +++ b/V2rayNG/app/src/main/res/values-ru/strings.xml @@ -259,6 +259,9 @@ Удалено дубликатов профилей: %d Delete %d configurations + Import %d configurations + Export %d configurations + Update %d configurations Запуск службы Подтвердить diff --git a/V2rayNG/app/src/main/res/values-vi/strings.xml b/V2rayNG/app/src/main/res/values-vi/strings.xml index 1ba91234..dd8555b3 100644 --- a/V2rayNG/app/src/main/res/values-vi/strings.xml +++ b/V2rayNG/app/src/main/res/values-vi/strings.xml @@ -257,6 +257,9 @@ Xoá %d cấu hình trùng lặp Delete %d configurations + Import %d configurations + Export %d configurations + Update %d configurations Khởi động v2rayNG Xác nhận 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 8e64e882..b7d35982 100644 --- a/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml +++ b/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml @@ -254,6 +254,9 @@ 删除 %d 个重复配置 删除 %d 个配置 + 导入 %d 个配置 + 导出 %d 个配置 + 更新 %d 个配置 启动服务 确定 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 b9335d6e..15595834 100644 --- a/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml +++ b/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml @@ -253,9 +253,12 @@ 依偵測結果排序 過濾設定 所有分組 - Delete %d duplicate configurations + 删除 %d 个重复配置 - Delete %d configurations + 删除 %d 个配置 + 导入 %d 个配置 + 导出 %d 个配置 + 更新 %d 个配置 啟動服務 確定 diff --git a/V2rayNG/app/src/main/res/values/strings.xml b/V2rayNG/app/src/main/res/values/strings.xml index 69d5d83b..4c4c6575 100644 --- a/V2rayNG/app/src/main/res/values/strings.xml +++ b/V2rayNG/app/src/main/res/values/strings.xml @@ -261,6 +261,9 @@ All groups Delete %d duplicate configurations Delete %d configurations + Import %d configurations + Export %d configurations + Update %d configurations Start Service Confirm