Merge pull request #287 from yuhan6665/multidex

Fix multidex for Android devices below L

.gitignore

@@ -4,7 +4,6 @@ V2rayNG/app/src/main/assets/geosite.dat
 V2rayNG/app/src/main/java/com/v2ray/ang/InappBuyActivity.java
 V2rayNG/gradle/wrapper/gradle-wrapper.properties
 V2rayNG/gradle/wrapper/gradle-wrapper.properties
-*.aar
 *.dat
 *.jks
 V2rayNG/gradle/wrapper/gradle-wrapper.properties

README.md

@@ -3,4 +3,3 @@
 <a href="https://play.google.com/store/apps/details?id=com.v2ray.ang">
 <img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" width="165" height="64" />
 </a>
-

V2rayNG/app/build.gradle

@@ -91,6 +91,7 @@ dependencies {
     implementation "com.android.support:cardview-v7:$supportLibVersion"
     implementation "com.android.support:preference-v7:$supportLibVersion"
     implementation "com.android.support:recyclerview-v7:$supportLibVersion"
+    implementation "com.android.support:multidex:1.0.3"
     // DSL
     implementation "org.jetbrains.anko:anko-sdk15:$ankoVersion"
     implementation "org.jetbrains.anko:anko-support-v4:$ankoVersion"

V2rayNG/app/libs/Readme.md

@@ -0,0 +1 @@
+https://github.com/2dust/v2rayNG/tree/master/AndroidLibV2rayLite

V2rayNG/app/src/main/AndroidManifest.xml

@@ -57,7 +57,7 @@
         <activity android:name=".ui.SettingsActivity" />
         <activity android:name=".ui.PerAppProxyActivity" />
         <activity android:name=".ui.ScannerActivity" />
-        <activity android:name=".InappBuyActivity" />
+<!--        <activity android:name=".InappBuyActivity" />-->
         <activity android:name=".ui.LogcatActivity" />
         <activity
             android:name=".ui.RoutingSettingsActivity"

V2rayNG/app/src/main/kotlin/com/v2ray/ang/AngApplication.kt

@@ -1,16 +1,17 @@
 package com.v2ray.ang
 
-import android.app.Application
 //import com.squareup.leakcanary.LeakCanary
+import android.support.multidex.MultiDexApplication
 import com.v2ray.ang.util.AngConfigManager
 import me.dozen.dpreference.DPreference
 import org.jetbrains.anko.defaultSharedPreferences
 
-class AngApplication : Application() {
+class AngApplication : MultiDexApplication() {
     companion object {
         const val PREF_LAST_VERSION = "pref_last_version"
     }
 
+    var curIndex = -1 //Current proxy that is opened. (Used to implement restart feature)
     var firstRun = false
         private set
 

V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayVpnService.kt

@@ -28,15 +28,11 @@ import libv2ray.Libv2ray
 import libv2ray.V2RayVPNServiceSupportsSet
 import rx.Observable
 import rx.Subscription
-import java.net.InetAddress
-import java.io.IOException
 import java.io.File
-import java.io.FileDescriptor
-import java.io.FileInputStream
 import java.lang.ref.SoftReference
 import android.os.Build
-import android.annotation.TargetApi
 import android.util.Log
+import go.Seq
 import org.jetbrains.anko.doAsync
 
 class V2RayVpnService : VpnService() {
@@ -64,7 +60,6 @@ class V2RayVpnService : VpnService() {
     private var mNotificationManager: NotificationManager? = null
 
 
-
     /**
         * Unfortunately registerDefaultNetworkCallback is going to return our VPN interface: https://android.googlesource.com/platform/frameworks/base/+/dda156ab0c5d66ad82bdcf76cda07cbc0a9c8a2e
         *
@@ -74,25 +69,36 @@ class V2RayVpnService : VpnService() {
         *
         * Source: https://android.googlesource.com/platform/frameworks/base/+/2df4c7d/services/core/java/com/android/server/ConnectivityService.java#887
         */
-    @TargetApi(28)
-    private val defaultNetworkRequest = NetworkRequest.Builder()
-            .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-            .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED)
-            .build()
+    private val defaultNetworkRequest by lazy {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            NetworkRequest.Builder()
+                .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+                .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED)
+                .build()
+        } else {
+            null
+        }
+    }
 
 
     private val connectivity by lazy { getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager }
-    @TargetApi(28)
-    private val defaultNetworkCallback = object : ConnectivityManager.NetworkCallback() {
-        override fun onAvailable(network: Network) {
-            setUnderlyingNetworks(arrayOf(network))
-        }
-        override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities?) {
-            // it's a good idea to refresh capabilities
-            setUnderlyingNetworks(arrayOf(network))
-        }
-        override fun onLost(network: Network) {
-            setUnderlyingNetworks(null)
+
+    private val defaultNetworkCallback by lazy {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            object : ConnectivityManager.NetworkCallback() {
+                override fun onAvailable(network: Network) {
+                    setUnderlyingNetworks(arrayOf(network))
+                }
+                override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities?) {
+                    // it's a good idea to refresh capabilities
+                    setUnderlyingNetworks(arrayOf(network))
+                }
+                override fun onLost(network: Network) {
+                    setUnderlyingNetworks(null)
+                }
+            }
+        } else {
+            null
         }
     }
     private var listeningForDefaultNetwork = false
@@ -103,6 +109,7 @@ class V2RayVpnService : VpnService() {
         val policy = StrictMode.ThreadPolicy.Builder().permitAll().build()
         StrictMode.setThreadPolicy(policy)
         v2rayPoint.packageName = Utils.packagePath(applicationContext)
+        Seq.setContext(applicationContext)
     }
 
     override fun onRevoke() {
@@ -175,7 +182,7 @@ class V2RayVpnService : VpnService() {
         }
 
 
-        if (Build.VERSION.SDK_INT >= 28) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             connectivity.requestNetwork(defaultNetworkRequest, defaultNetworkCallback)
             listeningForDefaultNetwork = true
         }
@@ -259,7 +266,7 @@ class V2RayVpnService : VpnService() {
 //        val emptyInfo = VpnNetworkInfo()
 //        val info = loadVpnNetworkInfo(configName, emptyInfo)!! + (lastNetworkInfo ?: emptyInfo)
 //        saveVpnNetworkInfo(configName, info)
-        if (Build.VERSION.SDK_INT >= 28) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             if (listeningForDefaultNetwork) {
                 connectivity.unregisterNetworkCallback(defaultNetworkCallback)
                 listeningForDefaultNetwork = false
@@ -281,12 +288,19 @@ class V2RayVpnService : VpnService() {
                 unregisterReceiver(mMsgReceive)
             } catch (e: Exception) {
             }
+
+            //stopSelf has to be called ahead of mInterface.close(). otherwise v2ray core cannot be stooped
+            //It's strage but true.
+            //This can be verified by putting stopself() behind and call stopLoop and startLoop
+            //in a row for several times. You will find that later created v2ray core report port in use
+            //which means the first v2ray core somehow failed to stop and release the port.
+            stopSelf()
+
             try {
                 mInterface.close()
             } catch (ignored: Exception) {
             }
 
-            stopSelf()
         }
     }
 

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/BaseDrawerActivity.kt

@@ -13,7 +13,7 @@ import android.support.v7.widget.Toolbar
 import android.util.Log
 import android.view.MenuItem
 import android.view.View
-import com.v2ray.ang.InappBuyActivity
+//import com.v2ray.ang.InappBuyActivity
 
 import com.v2ray.ang.R
 import org.jetbrains.anko.startActivity
@@ -63,7 +63,7 @@ abstract class BaseDrawerActivity : BaseActivity() {
                         return
                     }
                     R.id.donate -> {
-                        startActivity<InappBuyActivity>()
+//                        startActivity<InappBuyActivity>()
                         return
                     }
                 }

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/LogcatActivity.kt

@@ -1,6 +1,8 @@
 package com.v2ray.ang.ui
 
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 import android.text.method.ScrollingMovementMethod
 import android.view.Menu
 import android.view.MenuItem
@@ -24,15 +26,22 @@ class LogcatActivity : BaseActivity() {
         title = getString(R.string.title_logcat)
 
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        logcat()
+        logcat(false)
     }
 
-    private fun logcat() {
+    private fun logcat(shouldFlushLog: Boolean) {
 
         try {
             pb_waiting.visibility = View.VISIBLE
 
             doAsync {
+                if (shouldFlushLog) {
+                    val lst = LinkedHashSet<String>()
+                    lst.add("logcat")
+                    lst.add("-c")
+                    val process = Runtime.getRuntime().exec(lst.toTypedArray())
+                    process.waitFor()
+                }
                 val lst = LinkedHashSet<String>()
                 lst.add("logcat")
                 lst.add("-d")
@@ -49,9 +58,11 @@ class LogcatActivity : BaseActivity() {
                     tv_logcat.text = allText
                     tv_logcat.movementMethod = ScrollingMovementMethod()
                     pb_waiting.visibility = View.GONE
+                    Handler(Looper.getMainLooper()).post { sv_logcat.fullScroll(View.FOCUS_DOWN) }
                 }
             }
         } catch (e: IOException) {
+            e.printStackTrace()
         }
     }
 
@@ -66,7 +77,10 @@ class LogcatActivity : BaseActivity() {
             toast(R.string.toast_success)
             true
         }
-
+        R.id.delete -> {
+            logcat(true)
+            true
+        }
         else -> super.onOptionsItemSelected(item)
     }
 }

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt

@@ -27,7 +27,7 @@ import android.support.v4.view.GravityCompat
 import android.support.v7.app.ActionBarDrawerToggle
 import android.support.v7.widget.helper.ItemTouchHelper
 import android.util.Log
-import com.v2ray.ang.InappBuyActivity
+//import com.v2ray.ang.InappBuyActivity
 import rx.Observable
 import rx.android.schedulers.AndroidSchedulers
 import java.util.concurrent.TimeUnit
@@ -232,7 +232,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
 
         R.id.export_all -> {
             if (AngConfigManager.shareAll2Clipboard() == 0) {
-                toast(R.string.toast_success)
+                //remove toast, otherwise it will block previous warning message
             } else {
                 toast(R.string.toast_failure)
             }
@@ -561,7 +561,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
                 Utils.openUri(this, AppConfig.promotionUrl)
             }
             R.id.donate -> {
-                startActivity<InappBuyActivity>()
+//                startActivity<InappBuyActivity>()
             }
             R.id.logcat -> {
                 startActivity<LogcatActivity>()

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/Server2Activity.kt

@@ -1,9 +1,11 @@
 package com.v2ray.ang.ui
 
 import android.os.Bundle
+import android.text.Editable
 import android.text.TextUtils
 import android.view.Menu
 import android.view.MenuItem
+import com.google.gson.Gson
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.extension.defaultDPreference
@@ -12,6 +14,7 @@ import com.v2ray.ang.util.AngConfigManager
 import com.v2ray.ang.util.Utils
 import kotlinx.android.synthetic.main.activity_server2.*
 import org.jetbrains.anko.*
+import java.lang.Exception
 
 
 class Server2Activity : BaseActivity() {
@@ -50,7 +53,7 @@ class Server2Activity : BaseActivity() {
      */
     fun bindingServer(vmess: AngConfig.VmessBean): Boolean {
         et_remarks.text = Utils.getEditable(vmess.remarks)
-        tv_content.text = defaultDPreference.getPrefString(AppConfig.ANG_CONFIG + edit_guid, "")
+        tv_content.text = Editable.Factory.getInstance().newEditable(defaultDPreference.getPrefString(AppConfig.ANG_CONFIG + edit_guid, ""))
         return true
     }
 
@@ -66,21 +69,40 @@ class Server2Activity : BaseActivity() {
      * save server config
      */
     fun saveServer(): Boolean {
+        var saveSuccess: Boolean
         val vmess = configs.vmess[edit_index]
 
         vmess.remarks = et_remarks.text.toString()
 
         if (TextUtils.isEmpty(vmess.remarks)) {
             toast(R.string.server_lab_remarks)
-            return false
+            saveSuccess = false
         }
 
+
         if (AngConfigManager.addCustomServer(vmess, edit_index) == 0) {
             toast(R.string.toast_success)
+            saveSuccess = true
+        } else {
+            toast(R.string.toast_failure)
+            saveSuccess = false
+        }
+
+
+        try {
+            Gson().fromJson<Object>(tv_content.text.toString(), Object::class.java)
+        } catch (e: Exception) {
+            e.printStackTrace()
+            toast(R.string.toast_malformed_josn)
+            saveSuccess = false
+        }
+
+        if (saveSuccess) {
+            //update config
+            defaultDPreference.setPrefString(AppConfig.ANG_CONFIG + edit_guid, tv_content.text.toString())
             finish()
             return true
         } else {
-            toast(R.string.toast_failure)
             return false
         }
     }

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SettingsActivity.kt

@@ -4,12 +4,10 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.net.Uri
 import android.os.Bundle
-import android.preference.CheckBoxPreference
-import android.preference.EditTextPreference
-import android.preference.Preference
-import android.preference.PreferenceFragment
+import android.preference.*
+import com.v2ray.ang.AngApplication
 import com.v2ray.ang.BuildConfig
-import com.v2ray.ang.InappBuyActivity
+//import com.v2ray.ang.InappBuyActivity
 import com.v2ray.ang.R
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.extension.defaultDPreference
@@ -29,6 +27,7 @@ class SettingsActivity : BaseActivity() {
 //        const val PREF_MUX_ENAimport libv2ray.Libv2rayBLED = "pref_mux_enabled"
         const val PREF_SPEED_ENABLED = "pref_speed_enabled"
         const val PREF_SNIFFING_ENABLED = "pref_sniffing_enabled"
+        const val PREF_PROXY_SHARING = "pref_proxy_sharing_enabled"
         const val PREF_LOCAL_DNS_ENABLED = "pref_local_dns_enabled"
         const val PREF_REMOTE_DNS = "pref_remote_dns"
         const val PREF_DOMESTIC_DNS = "pref_domestic_dns"
@@ -59,12 +58,19 @@ class SettingsActivity : BaseActivity() {
 
     class SettingsFragment : PreferenceFragment(), SharedPreferences.OnSharedPreferenceChangeListener {
         val perAppProxy by lazy { findPreference(PREF_PER_APP_PROXY) as CheckBoxPreference }
-        //        val autoRestart by lazy { findPreference(PREF_AUTO_RESTART) as CheckBoxPreference }
-        val remoteDns by lazy { findPreference(PREF_REMOTE_DNS) as EditTextPreference }
-        val domesticDns by lazy { findPreference(PREF_DOMESTIC_DNS) as EditTextPreference }
+        val sppedEnabled by lazy { findPreference(PREF_SPEED_ENABLED) as CheckBoxPreference }
+        val sniffingEnabled by lazy { findPreference(PREF_SNIFFING_ENABLED) as CheckBoxPreference }
+        val proxySharing by lazy { findPreference(PREF_PROXY_SHARING) as CheckBoxPreference }
+        val domainStrategy by lazy { findPreference(PREF_ROUTING_DOMAIN_STRATEGY) as ListPreference }
+        val routingMode by lazy { findPreference(PREF_ROUTING_MODE) as ListPreference }
 
-        val enableLocalDns by lazy { findPreference(PREF_LOCAL_DNS_ENABLED) as CheckBoxPreference }
         val forwardIpv6 by lazy { findPreference(PREF_FORWARD_IPV6) as CheckBoxPreference }
+        val enableLocalDns by lazy { findPreference(PREF_LOCAL_DNS_ENABLED) as CheckBoxPreference }
+        val domesticDns by lazy { findPreference(PREF_DOMESTIC_DNS) as EditTextPreference }
+        val remoteDns by lazy { findPreference(PREF_REMOTE_DNS) as EditTextPreference }
+
+        //        val autoRestart by lazy { findPreference(PREF_AUTO_RESTART) as CheckBoxPreference }
+
 
 //        val socksPort by lazy { findPreference(PREF_SOCKS_PORT) as EditTextPreference }
 //        val httpPort by lazy { findPreference(PREF_HTTP_PORT) as EditTextPreference }
@@ -76,14 +82,95 @@ class SettingsActivity : BaseActivity() {
 //        val tgGroup: Preference by lazy { findPreference(PREF_TG_GROUP) }
         val version: Preference by lazy { findPreference(PREF_VERSION) }
 
+        private fun restartProxy() {
+            Utils.stopVService(activity)
+            Utils.startVService(activity)
+        }
+
+        private fun isRunning(): Boolean {
+            return Utils.isServiceRun(activity, "com.v2ray.ang.service.V2RayVpnService")
+        }
+
         override fun onCreate(savedInstanceState: Bundle?) {
             super.onCreate(savedInstanceState)
             addPreferencesFromResource(R.xml.pref_settings)
+            var app = activity.application as AngApplication
+
+            perAppProxy.setOnPreferenceClickListener {
+                if (isRunning()) {
+                    Utils.stopVService(activity)
+                }
+                startActivity<PerAppProxyActivity>()
+                perAppProxy.isChecked = true
+                true
+            }
+            sppedEnabled.setOnPreferenceClickListener {
+                if (isRunning())
+                    restartProxy()
+                true
+            }
+            sniffingEnabled.setOnPreferenceClickListener {
+                if (isRunning())
+                    restartProxy()
+                true
+            }
+
+            proxySharing.setOnPreferenceClickListener {
+                if (proxySharing.isChecked)
+                    toast(R.string.toast_warning_pref_proxysharing)
+                if (isRunning())
+                    restartProxy()
+                true
+            }
+
+            domainStrategy.setOnPreferenceChangeListener { _, _ ->
+                if (isRunning())
+                    restartProxy()
+                true
+            }
+            routingMode.setOnPreferenceChangeListener { _, _ ->
+                if (isRunning())
+                    restartProxy()
+                true
+            }
 
             routingCustom.onClick {
+                if (isRunning())
+                    Utils.stopVService(activity)
                 startActivity<RoutingSettingsActivity>()
             }
 
+            forwardIpv6.setOnPreferenceClickListener {
+                if (isRunning())
+                    restartProxy()
+                true
+            }
+
+            enableLocalDns.setOnPreferenceClickListener {
+                if (isRunning())
+                    restartProxy()
+                true
+            }
+
+
+            domesticDns.setOnPreferenceChangeListener { preference, any ->
+                // domesticDns.summary = any as String
+                val nval = any as String
+                domesticDns.summary = if (nval == "") AppConfig.DNS_DIRECT else nval
+                if (isRunning())
+                    restartProxy()
+                true
+            }
+
+            remoteDns.setOnPreferenceChangeListener { preference, any ->
+                // remoteDns.summary = any as String
+                val nval = any as String
+                remoteDns.summary = if (nval == "") AppConfig.DNS_AGENT else nval
+                if (isRunning())
+                    restartProxy()
+                true
+            }
+
 //            donate.onClick {
 //                startActivity<InappBuyActivity>()
 //            }
@@ -110,24 +197,7 @@ class SettingsActivity : BaseActivity() {
 //                }
 //            }
 
-            perAppProxy.setOnPreferenceClickListener {
-                startActivity<PerAppProxyActivity>()
-                perAppProxy.isChecked = true
-                false
-            }
 
-            remoteDns.setOnPreferenceChangeListener { preference, any ->
-                // remoteDns.summary = any as String
-                val nval = any as String
-                remoteDns.summary = if (nval == "") AppConfig.DNS_AGENT else nval
-                true
-            }
-            domesticDns.setOnPreferenceChangeListener { preference, any ->
-                // domesticDns.summary = any as String
-                val nval = any as String
-                domesticDns.summary = if (nval == "") AppConfig.DNS_DIRECT else nval
-                true
-            }
 //            socksPort.setOnPreferenceChangeListener { preference, any ->
 //                socksPort.summary = any as String
 //                true

V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt

@@ -147,13 +147,15 @@ object AngConfigManager {
     fun setActiveServer(index: Int): Int {
         try {
             if (index < 0 || index > angConfig.vmess.count() - 1) {
+                app.curIndex = -1
                 return -1
             }
             angConfig.index = index
-
+            app.curIndex = index
             storeConfigFile()
         } catch (e: Exception) {
             e.printStackTrace()
+            app.curIndex = -1
             return -1
         }
         return 0

V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt

@@ -27,6 +27,7 @@ import com.v2ray.ang.AngApplication
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.extension.responseLength
+import com.v2ray.ang.extension.v2RayApplication
 import com.v2ray.ang.service.V2RayVpnService
 import com.v2ray.ang.ui.SettingsActivity
 import kotlinx.android.synthetic.main.activity_logcat.*
@@ -311,7 +312,11 @@ object Utils {
      * startVService
      */
     fun startVService(context: Context): Boolean {
-        context.toast(R.string.toast_services_start)
+        if (context.v2RayApplication.defaultDPreference.getPrefBoolean(SettingsActivity.PREF_PROXY_SHARING, false)) {
+            context.toast(R.string.toast_warning_pref_proxysharing_short)
+        }else{
+            context.toast(R.string.toast_services_start)
+        }
         if (AngConfigManager.genStoreV2rayConfig(-1)) {
             val configContent = AngConfigManager.currGeneratedV2rayConfig()
             val configType = AngConfigManager.currConfigType()
@@ -335,6 +340,7 @@ object Utils {
      */
     fun startVService(context: Context, guid: String): Boolean {
         val index = AngConfigManager.getIndexViaGuid(guid)
+        context.v2RayApplication.curIndex=index
         return startVService(context, index)
     }
 

V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt

@@ -129,6 +129,12 @@ object V2rayConfigUtil {
      */
     private fun inbounds(vmess: VmessBean, v2rayConfig: V2rayConfig, app: AngApplication): Boolean {
         try {
+            v2rayConfig.inbounds.forEach { curInbound ->
+                if (!app.defaultDPreference.getPrefBoolean(SettingsActivity.PREF_PROXY_SHARING, false)) {
+                    //bind all inbounds to localhost if the user requests
+                    curInbound.listen = "127.0.0.1"
+                }
+            }
             v2rayConfig.inbounds[0].port = 10808
 //            val socksPort = Utils.parseInt(app.defaultDPreference.getPrefString(SettingsActivity.PREF_SOCKS_PORT, "10808"))
 //            val lanconnPort = Utils.parseInt(app.defaultDPreference.getPrefString(SettingsActivity.PREF_HTTP_PORT, ""))
@@ -547,7 +553,7 @@ object V2rayConfigUtil {
                             mux = null))
             }
 
-            // DNS routing 
+            // DNS routing
             v2rayConfig.routing.rules.add(0, V2rayConfig.RoutingBean.RulesBean(
                     type = "field",
                     outboundTag = AppConfig.TAG_DIRECT,

V2rayNG/app/src/main/res/layout/activity_server2.xml

@@ -68,20 +68,15 @@
                 android:text="@string/server_lab_content"
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
 
-            <TextView
+            <EditText
                 android:id="@+id/tv_content"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:layout_marginTop="@dimen/layout_margin_top_height"
                 android:text="" />
         </LinearLayout>
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
-            android:layout_marginBottom="@dimen/layout_margin_top_height"
-            android:orientation="vertical" />
+
 
     </LinearLayout>
 </ScrollView>

V2rayNG/app/src/main/res/menu/menu_logcat.xml

@@ -6,4 +6,9 @@
         android:icon="@drawable/ic_copy_white"
         android:title="@string/logcat_copy"
         app:showAsAction="always" />
+    <item
+        android:id="@+id/delete"
+        android:icon="@drawable/ic_delete_white_24dp"
+        android:title="@string/logcat_delete"
+        app:showAsAction="ifRoom" />
 </menu>

V2rayNG/app/src/main/res/values-zh-rCN/strings.xml

@@ -135,6 +135,7 @@
 
     <string name="title_logcat">Logcat</string>
     <string name="logcat_copy">复制</string>
+    <string name="logcat_delete">删除</string>
     <string name="title_export_all">导出全部配置至剪贴板</string>
     <string name="title_sub_setting">订阅设置</string>
     <string name="sub_setting_remarks">备注</string>
@@ -180,5 +181,10 @@
         <item>绕过大陆地址</item>
         <item>绕过局域网及大陆地址</item>
     </string-array>
+    <string name="title_pref_proxy_sharing_enabled">代理共享</string>
+    <string name="summary_pref_proxy_sharing_enabled">绑定代理入口ip到0.0.0.0</string>
+    <string name="toast_warning_pref_proxysharing">其他设备可以使用socks/http协议通过您的IP地址连接到代理\nHttp  代理: http://您的ip:10809\nSocks 代理: socks(4/5)://您的ip:10808\n仅在受信任的网络中启用以避免未经授权的连接</string>
+    <string name="toast_warning_pref_proxysharing_short">代理共享已启用，请确保处于受信网络</string>
+    <string name="toast_malformed_josn">配置格式错误</string>
 
 </resources>

V2rayNG/app/src/main/res/values-zh-rTW/strings.xml

@@ -137,6 +137,7 @@
 
     <string name="title_logcat">Logcat</string>
     <string name="logcat_copy">複製</string>
+    <string name="logcat_delete">刪除</string>
     <string name="title_export_all">匯出全部配置至剪貼簿</string>
     <string name="title_sub_setting">訂閱設定</string>
     <string name="sub_setting_remarks">備註</string>
@@ -182,4 +183,9 @@
         <item>略過中國大陸</item>
         <item>略過局域網及中國大陸</item>
     </string-array>
+    <string name="title_pref_proxy_sharing_enabled">代理共享</string>
+    <string name="summary_pref_proxy_sharing_enabled">綁定代理入口ip到0.0.0.0</string>
+    <string name="toast_warning_pref_proxysharing">其他設備可以使用socks/http協議通過您的IP地址連接到代理\nHttp 代理: http://您的ip:10809\nSocks 代理: socks(4/5)://您的ip:10808\n僅在受信任的網絡中啟用以避免未經授權的連接</string>
+    <string name="toast_warning_pref_proxysharing_short">代理共享已啟用，請確保處於受信網絡</string>
+    <string name="toast_malformed_josn">配置格式錯誤</string>
 </resources>

V2rayNG/app/src/main/res/values/strings.xml

@@ -136,6 +136,7 @@
 
     <string name="title_logcat">Logcat</string>
     <string name="logcat_copy">Copy</string>
+    <string name="logcat_delete">Delete</string>
     <string name="title_export_all">Export all config to clipboard</string>
     <string name="title_sub_setting">Subscription setting</string>
     <string name="sub_setting_remarks">remarks</string>
@@ -181,5 +182,10 @@
         <item>Bypass mainland address</item>
         <item>Bypassing LAN and mainland address</item>
     </string-array>
+    <string name="title_pref_proxy_sharing_enabled">Proxy sharing</string>
+    <string name="summary_pref_proxy_sharing_enabled">Bind inbound to 0.0.0.0</string>
+    <string name="toast_warning_pref_proxysharing">Other devices can connect to proxy by your ip address through socks/http protocol\nHttp  Proxy: http://yourIP:10809\nSocks Proxy: socks(4/5)://yourIP:10808\nOnly enable in trusted network to avoid unauthorized connection</string>
+    <string name="toast_warning_pref_proxysharing_short">Proxy sharing enabled\nMake sure you are in a trusted network</string>
+    <string name="toast_malformed_josn">Config malformed</string>
 
 </resources>

V2rayNG/app/src/main/res/xml/pref_settings.xml

@@ -22,6 +22,13 @@
             android:summary="@string/summary_pref_sniffing_enabled"
             android:title="@string/title_pref_sniffing_enabled" />
 
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="pref_proxy_sharing_enabled"
+            android:onClick="proxySharingOnClick"
+            android:summary="@string/summary_pref_proxy_sharing_enabled"
+            android:title="@string/title_pref_proxy_sharing_enabled" />
+
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/title_pref_routing">

V2rayNG/gradle.properties

@@ -6,7 +6,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx1024m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 #
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit