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

Fix issues with keeping compatibility with old databases

Browse Source
This commit is contained in:
Mygod
2017-12-06 17:32:39 -08:00
parent 94fad23715
commit 334cd5ea1e
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt
+1 -1
View File
@@ -148,7 +148,7 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
}
text1.text = item.formattedName
val t2 = ArrayList<String>()
if (item.name.isNotEmpty()) t2 += item.formattedAddress
if (!item.name.isNullOrEmpty()) t2 += item.formattedAddress
val id = PluginConfiguration(item.plugin ?: "").selected
if (id.isNotEmpty()) t2 += app.getString(R.string.profile_plugin, id)
if (t2.isEmpty()) text2.visibility = View.GONE else {
mobile/src/main/java/com/github/shadowsocks/bg/ProxyService.kt
+1 -1
View File
@@ -34,7 +34,7 @@ class ProxyService : Service(), BaseService.Interface {
override val tag: String get() = "ShadowsocksProxyService"
override fun createNotification(): ServiceNotification =
ServiceNotification(this, data.profile!!.name, "service-proxy", true)
ServiceNotification(this, data.profile!!.formattedName, "service-proxy", true)
override fun onBind(intent: Intent): IBinder? = super.onBind(intent)
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int =
mobile/src/main/java/com/github/shadowsocks/bg/TransproxyService.kt
+1 -1
View File
@@ -33,7 +33,7 @@ class TransproxyService : Service(), LocalDnsService.Interface {
override val tag: String get() = "ShadowsocksTransproxyService"
override fun createNotification(): ServiceNotification =
ServiceNotification(this, data.profile!!.name, "service-transproxy", true)
ServiceNotification(this, data.profile!!.formattedName, "service-transproxy", true)
override fun onBind(intent: Intent): IBinder? = super.onBind(intent)
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int =
mobile/src/main/java/com/github/shadowsocks/bg/VpnService.kt
+1 -1
View File
@@ -77,7 +77,7 @@ class VpnService : BaseVpnService(), LocalDnsService.Interface {
override val tag: String get() = "ShadowsocksVpnService"
override fun createNotification(): ServiceNotification =
ServiceNotification(this, data.profile!!.name, "service-vpn")
ServiceNotification(this, data.profile!!.formattedName, "service-vpn")
private var conn: ParcelFileDescriptor? = null
private var worker: ProtectWorker? = null
mobile/src/main/java/com/github/shadowsocks/database/Profile.kt
+3 -3
View File
@@ -84,7 +84,7 @@ class Profile {
var id: Int = 0
@DatabaseField
var name: String = ""
var name: String? = ""
@DatabaseField
var host: String = "198.199.101.152"
@@ -135,7 +135,7 @@ class Profile {
var plugin: String? = null
val formattedAddress get() = (if (host.contains(":")) "[%s]:%d" else "%s:%d").format(host, remotePort)
val formattedName get() = if (name.isEmpty()) formattedAddress else name
val formattedName get() = if (name.isNullOrEmpty()) formattedAddress else name!!
fun toUri(): Uri {
val builder = Uri.Builder()
@@ -147,7 +147,7 @@ class Profile {
val configuration = PluginConfiguration(plugin ?: "")
if (configuration.selected.isNotEmpty())
builder.appendQueryParameter(Key.plugin, configuration.selectedOptions.toString(false))
if (name.isNotEmpty()) builder.fragment(name)
if (!name.isNullOrEmpty()) builder.fragment(name)
return builder.build()
}
override fun toString() = toUri().toString()