Compare commits

...
3 Commits
Author SHA1 Message Date
Max Lv 253286c482 Bump version 2017-08-15 12:02:03 +08:00
Max Lv f25406b86c Protect table creation with transaction 2017-08-10 08:39:49 +08:00
Max Lv 2c8718163a Add new lines for remote ACL 2017-08-08 07:45:56 +08:00
3 changed files with 6 additions and 5 deletions
+2 -2
View File
@@ -4,8 +4,8 @@ enablePlugins(AndroidGms)
android.useSupportVectors android.useSupportVectors
name := "shadowsocks" name := "shadowsocks"
version := "4.2.2" version := "4.2.3"
versionCode := Some(192) versionCode := Some(193)
proguardOptions ++= proguardOptions ++=
"-dontwarn com.google.android.gms.internal.**" :: "-dontwarn com.google.android.gms.internal.**" ::
@@ -94,15 +94,14 @@ class Acl {
val result = new StringBuilder() val result = new StringBuilder()
if (urls.nonEmpty) { if (urls.nonEmpty) {
result.append(urls.mkString("\n")) result.append(urls.mkString("\n"))
result.append("\n")
if (network) { if (network) {
result.append("#NETWORK_ACL_BEGIN\n") result.append("\n#NETWORK_ACL_BEGIN\n")
try { try {
urls.foreach((url: String) => result.append(Source.fromURL(url).mkString)) urls.foreach((url: String) => result.append(Source.fromURL(url).mkString))
} catch { } catch {
case e: IOException => // ignore case e: IOException => // ignore
} }
result.append("#NETWORK_ACL_END\n") result.append("\n#NETWORK_ACL_END\n")
} }
} }
if (result.isEmpty) { if (result.isEmpty) {
@@ -141,7 +141,9 @@ class DBHelper(val context: Context)
} }
if (oldVersion < 23) { if (oldVersion < 23) {
profileDao.executeRawNoArgs("BEGIN TRANSACTION;")
TableUtils.createTable(connectionSource, classOf[KeyValuePair]) TableUtils.createTable(connectionSource, classOf[KeyValuePair])
profileDao.executeRawNoArgs("COMMIT;")
import KeyValuePair._ import KeyValuePair._
val old = PreferenceManager.getDefaultSharedPreferences(app) val old = PreferenceManager.getDefaultSharedPreferences(app)
kvPairDao.createOrUpdate(new KeyValuePair(Key.id, TYPE_INT, kvPairDao.createOrUpdate(new KeyValuePair(Key.id, TYPE_INT,