add back sniffing

skt041959 · Feb 23, 2019 · 540466d · 540466d
1 parent 25439fb
commit 540466d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -36,6 +36,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.1.0-alpha02'
     implementation "androidx.paging:paging-runtime:2.1.0-rc01"
     implementation 'com.beust:klaxon:3.0.1'
+
     implementation(name: 'tun2socks', ext: 'aar')
 
     implementation 'androidx.room:room-runtime:2.1.0-alpha03'

diff --git a/app/src/main/java/fun/kitsunebi/kitsunebi4android/service/SimpleVpnService.kt b/app/src/main/java/fun/kitsunebi/kitsunebi4android/service/SimpleVpnService.kt
@@ -258,10 +258,17 @@ open class SimpleVpnService : VpnService() {
 
             ProxyLogDatabase.getInstance(applicationContext).proxyLogDao().getAllCount()
 
-
+            var sniffing = Preferences.getString(applicationContext, getString(R.string.sniffing), "http,tls")
+            // Just ensure no whitespaces in the the string.
+            val sniffingList = sniffing.split(",")
+            var sniffings = ArrayList<String>()
+            for (s in sniffingList) {
+                sniffings.add(s.trim())
+            }
+            sniffing = sniffings.joinToString(",")
 
             Tun2socks.setLocalDNS("$localDns:53")
-            val ret = Tun2socks.startV2Ray(flow, service, dbService, configString.toByteArray(), filesDir.absolutePath, "127.0.0.1", 1086)
+            val ret = Tun2socks.startV2Ray(flow, service, dbService, configString.toByteArray(), "tun2socks", sniffing, filesDir.absolutePath)
             if (ret.toInt() != 0) {
                 sendBroadcast(Intent("vpn_start_err"))
                 return@thread