From e6d7a0855dbaaa26fa01f07cbf18e842e19122fb Mon Sep 17 00:00:00 2001 From: Mygod Date: Thu, 22 Sep 2016 20:38:33 +0800 Subject: [PATCH] Suggest different local ports automatically in MU mode Refine #885 --- src/main/scala/com/github/shadowsocks/Shadowsocks.scala | 2 +- src/main/scala/com/github/shadowsocks/database/Profile.scala | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala index 5f3a3fbc..c05e84fc 100644 --- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala +++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala @@ -59,11 +59,11 @@ import android.util.Log import android.view.{View, ViewGroup} import android.widget._ import com.github.jorgecastilloprz.FABProgressCircle +import com.github.shadowsocks.ShadowsocksApplication.app import com.github.shadowsocks.aidl.IShadowsocksServiceCallback import com.github.shadowsocks.database._ import com.github.shadowsocks.utils.CloseUtils._ import com.github.shadowsocks.utils._ -import com.github.shadowsocks.ShadowsocksApplication.app import com.google.android.gms.ads.{AdRequest, AdSize, AdView} import eu.chainfire.libsuperuser.Shell diff --git a/src/main/scala/com/github/shadowsocks/database/Profile.scala b/src/main/scala/com/github/shadowsocks/database/Profile.scala index 6699dda0..3ed59ed7 100644 --- a/src/main/scala/com/github/shadowsocks/database/Profile.scala +++ b/src/main/scala/com/github/shadowsocks/database/Profile.scala @@ -41,6 +41,7 @@ package com.github.shadowsocks.database import java.util.Locale +import android.os.Binder import android.util.Base64 import com.j256.ormlite.field.{DataType, DatabaseField} @@ -54,8 +55,9 @@ class Profile { @DatabaseField var host: String = "" + // hopefully hashCode = mHandle doesn't change, currently this is true from KitKat to Nougat @DatabaseField - var localPort: Int = 1080 + var localPort: Int = 1080 + Binder.getCallingUserHandle.hashCode @DatabaseField var remotePort: Int = 8388