From 4ef3a20929be3139f9f3a9e603d4f72bf2f1966a Mon Sep 17 00:00:00 2001
From: Kr328 <39107975+Kr328@users.noreply.github.com>
Date: Fri, 28 Feb 2020 00:32:49 +0800
Subject: [PATCH] add vpn component detect

---
 .../main/java/com/github/kr328/clash/MainActivity.kt  | 11 +++++++++--
 app/src/main/res/values-zh/strings.xml                |  1 +
 app/src/main/res/values/strings.xml                   |  1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/github/kr328/clash/MainActivity.kt b/app/src/main/java/com/github/kr328/clash/MainActivity.kt
index fa916f9..9541ceb 100644
--- a/app/src/main/java/com/github/kr328/clash/MainActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/MainActivity.kt
@@ -35,8 +35,15 @@ class MainActivity : BaseActivity() {
                 stopClashService()
             } else {
                 val vpnRequest = startClashService()
-                if (vpnRequest != null)
-                    startActivityForResult(vpnRequest, REQUEST_CODE)
+                if (vpnRequest != null) {
+                    val resolved = packageManager.resolveActivity(vpnRequest, 0)
+                    if ( resolved != null ) {
+                        startActivityForResult(vpnRequest, REQUEST_CODE)
+                    }
+                    else {
+                        makeSnackbarException(getString(R.string.missing_vpn_component), null)
+                    }
+                }
             }
         }
 
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 5336ff9..0b8d6de 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -130,4 +130,5 @@
     <string name="learn_more_about_split_apks">了解更多关于分包机制</string>
     <string name="reinstall_from_google_play">重新从 Google Play 安装</string>
     <string name="download_from_github_releases">从 Github Release 下载</string>
+    <string name="missing_vpn_component">系统 VPN 组件缺失</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0d35d0e..72d7f04 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -172,4 +172,5 @@
     <string name="github_releases_url" translatable="false">https://github.com/Kr328/ClashForAndroid/releases</string>
 
     <string name="format_proxy_group_title" translatable="false">%s - %s</string>
+    <string name="missing_vpn_component">Missing VPN Components</string>
 </resources>