From 1c53181c9c264260be7317d84d827c5eb8a195bc Mon Sep 17 00:00:00 2001 From: Mygod Date: Tue, 10 Jan 2017 11:17:56 +0800 Subject: [PATCH] Remove hash tag if profile name is empty --- src/main/scala/com/github/shadowsocks/database/Profile.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/scala/com/github/shadowsocks/database/Profile.scala b/src/main/scala/com/github/shadowsocks/database/Profile.scala index d233d567..dac6e203 100644 --- a/src/main/scala/com/github/shadowsocks/database/Profile.scala +++ b/src/main/scala/com/github/shadowsocks/database/Profile.scala @@ -25,6 +25,7 @@ import java.util.Locale import android.content.SharedPreferences import android.os.Binder +import android.text.TextUtils import android.util.Base64 import com.github.shadowsocks.utils.Key import com.j256.ormlite.field.{DataType, DatabaseField} @@ -103,7 +104,7 @@ class Profile { override def toString: String = "ss://" + Base64.encodeToString("%s%s:%s@%s:%d".formatLocal(Locale.ENGLISH, method, if (auth) "-auth" else "", password, host, remotePort).getBytes, Base64.NO_PADDING | Base64.NO_WRAP) + - '#' + URLEncoder.encode(name, "utf-8") + (if (TextUtils.isEmpty(name)) "" else '#' + URLEncoder.encode(name, "utf-8")) def isMethodUnsafe: Boolean = "table".equalsIgnoreCase(method) || "rc4".equalsIgnoreCase(method)