Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
253286c482 | ||
|
|
f25406b86c | ||
|
|
2c8718163a |
+2
-2
@@ -4,8 +4,8 @@ enablePlugins(AndroidGms)
|
||||
android.useSupportVectors
|
||||
|
||||
name := "shadowsocks"
|
||||
version := "4.2.2"
|
||||
versionCode := Some(192)
|
||||
version := "4.2.3"
|
||||
versionCode := Some(193)
|
||||
|
||||
proguardOptions ++=
|
||||
"-dontwarn com.google.android.gms.internal.**" ::
|
||||
|
||||
@@ -94,15 +94,14 @@ class Acl {
|
||||
val result = new StringBuilder()
|
||||
if (urls.nonEmpty) {
|
||||
result.append(urls.mkString("\n"))
|
||||
result.append("\n")
|
||||
if (network) {
|
||||
result.append("#NETWORK_ACL_BEGIN\n")
|
||||
result.append("\n#NETWORK_ACL_BEGIN\n")
|
||||
try {
|
||||
urls.foreach((url: String) => result.append(Source.fromURL(url).mkString))
|
||||
} catch {
|
||||
case e: IOException => // ignore
|
||||
}
|
||||
result.append("#NETWORK_ACL_END\n")
|
||||
result.append("\n#NETWORK_ACL_END\n")
|
||||
}
|
||||
}
|
||||
if (result.isEmpty) {
|
||||
|
||||
@@ -141,7 +141,9 @@ class DBHelper(val context: Context)
|
||||
}
|
||||
|
||||
if (oldVersion < 23) {
|
||||
profileDao.executeRawNoArgs("BEGIN TRANSACTION;")
|
||||
TableUtils.createTable(connectionSource, classOf[KeyValuePair])
|
||||
profileDao.executeRawNoArgs("COMMIT;")
|
||||
import KeyValuePair._
|
||||
val old = PreferenceManager.getDefaultSharedPreferences(app)
|
||||
kvPairDao.createOrUpdate(new KeyValuePair(Key.id, TYPE_INT,
|
||||
|
||||
Reference in New Issue
Block a user