Alawn/shadowsocks-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change default DNS port to 5450 to avoid conflicts with Orbot

Browse Source
This commit is contained in:
Mygod
2017-11-12 14:22:11 -08:00
parent 725fb04f3f
commit 13ef297a03
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala
+4 -6
View File
@@ -160,12 +160,10 @@ class ShadowsocksApplication extends Application {
if (dataStore.getLong(Key.assetUpdateTime, -1) != info.lastUpdateTime) copyAssets()
// hopefully hashCode = mHandle doesn't change, currently this is true from KitKat to Nougat
if (!(1025 to 65535 contains dataStore.portProxy))
dataStore.putInt(Key.portProxy, 1080 + Binder.getCallingUserHandle.hashCode)
if (!(1025 to 65535 contains dataStore.portLocalDns))
dataStore.putInt(Key.portLocalDns, 5400 + Binder.getCallingUserHandle.hashCode)
if (!(1025 to 65535 contains dataStore.portTransproxy))
dataStore.putInt(Key.portTransproxy, 8200 + Binder.getCallingUserHandle.hashCode)
lazy val userIndex = Binder.getCallingUserHandle.hashCode
if (!(1025 to 65535 contains dataStore.portProxy)) dataStore.putInt(Key.portProxy, 1080 + userIndex)
if (!(1025 to 65535 contains dataStore.portLocalDns)) dataStore.putInt(Key.portLocalDns, 5450 + userIndex)
if (!(1025 to 65535 contains dataStore.portTransproxy)) dataStore.putInt(Key.portTransproxy, 8200 + userIndex)
if (Build.VERSION.SDK_INT >= 26) {
val nm = getSystemService(classOf[NotificationManager])
mobile/src/main/scala/com/github/shadowsocks/database/Profile.scala
-1
View File
@@ -23,7 +23,6 @@ package com.github.shadowsocks.database
import java.util.Locale
import android.net.Uri
import android.os.Binder
import android.util.Base64
import com.github.shadowsocks.plugin.PluginConfiguration
import com.github.shadowsocks.preference.OrmLitePreferenceDataStore