Bump version

This reverts commit 24116b53bc.

.github/faq.md

@@ -34,6 +34,7 @@ The exclamation mark in the Wi-Fi/cellular icon appears because the system fails
 * Fixes for Huawei: [#1091 (comment)](https://github.com/shadowsocks/shadowsocks-android/issues/1091#issuecomment-276949836)
 * Related to Xposed: [#1414](https://github.com/shadowsocks/shadowsocks-android/issues/1414)
 * Samsung and/or Brevent: [#1410](https://github.com/shadowsocks/shadowsocks-android/issues/1410)
+* Another Samsung: [#1712](https://github.com/shadowsocks/shadowsocks-android/issues/1712)
 * Don't install this app on SD card because of permission issues: [#1124 (comment)](https://github.com/shadowsocks/shadowsocks-android/issues/1124#issuecomment-307556453)
 
 ### How to pause Shadowsocks service?

build.gradle

@@ -4,13 +4,13 @@ apply plugin: 'com.github.ben-manes.versions'
 
 buildscript {
     ext {
-        kotlinVersion = '1.2.30'
+        kotlinVersion = '1.2.31'
         minSdkVersion = 21
         sdkVersion = 27
         buildToolsVersion = '27.0.3'
         supportLibraryVersion = '27.1.0'
         takisoftFixVersion = '27.1.0.0'
-        playServicesVersion = '11.8.0'
+        playServicesVersion = '12.0.1'
         junitVersion = '4.12'
         androidTestVersion = '1.0.1'
         androidEspressoVersion = '3.0.1'
@@ -22,9 +22,9 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.0'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
-        classpath 'com.google.gms:google-services:3.2.0'
+        classpath 'com.google.gms:google-services:3.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
 }

core/build.gradle

@@ -38,7 +38,7 @@ android {
 task goBuild(type: Exec) {
     if (Os.isFamily(Os.FAMILY_WINDOWS)) {
         executable "cmd.exe"
-        args "/c", "src\\overture\\make.bat " + minSdkVersion
+        args "/c", file("src/overture/make.bat").absolutePath , minSdkVersion
     } else {
         executable "sh"
         args "-c", "src/overture/make.bash " + minSdkVersion
@@ -48,7 +48,7 @@ task goBuild(type: Exec) {
 task goClean(type: Exec) {
     if (Os.isFamily(Os.FAMILY_WINDOWS)) {
         executable "cmd.exe"
-        args "/c", "src\\overture\\clean.bat"
+        args "/c", file("src/overture/clean.bat").absolutePath
     } else {
         executable "sh"
         args "-c", "src/overture/clean.bash"

core/gfwlist/parse.py

@@ -0,0 +1,121 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+import pkgutil
+import urlparse
+import socket
+import logging
+from argparse import ArgumentParser
+from datetime import date
+
+__all__ = ['main']
+
+
+def parse_args():
+    parser = ArgumentParser()
+    parser.add_argument('-i', '--input', dest='input', required=True,
+                      help='path to gfwlist', metavar='GFWLIST')
+    parser.add_argument('-f', '--file', dest='output', required=True,
+                      help='path to output acl', metavar='ACL')
+    return parser.parse_args()
+
+
+def decode_gfwlist(content):
+    # decode base64 if have to
+    try:
+        return content.decode('base64')
+    except:
+        return content
+
+
+def get_hostname(something):
+    try:
+        # quite enough for GFW
+        if not something.startswith('http:'):
+            something = 'http://' + something
+        r = urlparse.urlparse(something)
+        return r.hostname
+    except Exception as e:
+        logging.error(e) 
+        return None
+
+
+def add_domain_to_set(s, something):
+    hostname = get_hostname(something)
+    if hostname is not None:
+        if hostname.startswith('.'):
+            hostname = hostname.lstrip('.')
+        if hostname.endswith('/'):
+            hostname = hostname.rstrip('/')
+        if hostname:
+            s.add(hostname)
+
+
+def parse_gfwlist(content):
+    gfwlist = content.splitlines(False)
+    domains = set()
+    for line in gfwlist:
+        if line.find('.*') >= 0:
+            continue
+        elif line.find('*') >= 0:
+            line = line.replace('*', '/')
+        if line.startswith('!'):
+            continue
+        elif line.startswith('['):
+            continue
+        elif line.startswith('@'):
+            # ignore white list
+            continue
+        elif line.startswith('||'):
+            add_domain_to_set(domains, line.lstrip('||'))
+        elif line.startswith('|'):
+            add_domain_to_set(domains, line.lstrip('|'))
+        elif line.startswith('.'):
+            add_domain_to_set(domains, line.lstrip('.'))
+        else:
+            add_domain_to_set(domains, line)
+    # TODO: reduce ['www.google.com', 'google.com'] to ['google.com']
+    return domains
+
+
+def generate_acl(domains):
+    header ="""#
+# GFW list from https://github.com/gfwlist/gfwlist/blob/master/gfwlist.txt
+# updated on DATE
+#
+
+[bypass_all]
+
+[proxy_list]
+
+"""
+    header = header.replace('DATE', str(date.today()))
+    proxy_content = ""
+    ip_content = ""
+
+    for domain in sorted(domains):
+        try:
+            socket.inet_aton(domain)
+            ip_content += (domain + "\n")
+        except socket.error:
+            domain = domain.replace('.', '\.')
+            proxy_content += ('(^|\.)' + domain + '$\n')
+
+    proxy_content = header + ip_content + proxy_content
+
+    return proxy_content
+
+
+def main():
+    args = parse_args()
+    with open(args.input, 'rb') as f:
+        content = f.read()
+    content = decode_gfwlist(content)
+    domains = parse_gfwlist(content)
+    acl_content = generate_acl(domains)
+    with open(args.output, 'wb') as f:
+        f.write(acl_content)
+
+if __name__ == '__main__':
+    main()
+

core/src/overture/make.bat

@@ -28,21 +28,35 @@ MKDIR %TARGET%\armeabi-v7a>nul 2>nul
 MKDIR %TARGET%\x86>nul 2>nul 
 MKDIR %TARGET%\arm64-v8a>nul 2>nul 
 
+SET CC=%ANDROID_ARM_TOOLCHAIN%\bin\arm-linux-androideabi-gcc.exe
+
+REM Check environment availability
+IF NOT EXIST %CC% (
+    ECHO "gcc not found"
+    EXIT 1
+)
+
+WHERE python.exe
+IF "%ERRORLEVEL%" == 1 (
+    ECHO "python not found"
+    EXIT 1
+)
+
 IF NOT EXIST %ANDROID_ARM_CC% (
 	ECHO "Make standalone toolchain for ARM arch"
-    %ANDROID_NDK_HOME%\build\tools\make_standalone_toolchain.py --arch arm ^
+    python.exe %ANDROID_NDK_HOME%\build\tools\make_standalone_toolchain.py --arch arm ^
         --api %MIN_API% --install-dir %ANDROID_ARM_TOOLCHAIN%
 )
 
 IF NOT EXIST %ANDROID_ARM64_CC% (
     ECHO "Make standalone toolchain for ARM64 arch"
-    %ANDROID_NDK_HOME%\build\tools\make_standalone_toolchain.py --arch arm64 ^
+    python.exe %ANDROID_NDK_HOME%\build\tools\make_standalone_toolchain.py --arch arm64 ^
         --api %MIN_API% --install-dir %ANDROID_ARM64_TOOLCHAIN%
 )
 
 IF NOT EXIST %ANDROID_X86_CC% (
     ECHO "Make standalone toolchain for X86 arch"
-    %ANDROID_NDK_HOME%\build\tools\make_standalone_toolchain.py --arch x86 ^
+    python.exe %ANDROID_NDK_HOME%\build\tools\make_standalone_toolchain.py --arch x86 ^
         --api %MIN_API% --install-dir %ANDROID_X86_TOOLCHAIN%
 )
 
@@ -118,4 +132,4 @@ IF %BUILD% == 1 (
 )
 
 ECHO "Successfully build overture"
-ENDLOCAL
+ENDLOCAL

detekt.yml

@@ -1,4 +1,4 @@
-# https://github.com/arturbosch/detekt/blob/801994bd60cc759b181649356cea045b8125301b/detekt-cli/src/main/resources/default-detekt-config.yml
+# https://github.com/arturbosch/detekt/blob/RC6-4/detekt-cli/src/main/resources/default-detekt-config.yml
 
 comments:
   active: false
@@ -7,7 +7,7 @@ complexity:
   active: true
   ComplexCondition:
     active: true
-    threshold: 3
+    threshold: 4
   ComplexInterface:
     active: true
     threshold: 10
@@ -15,6 +15,7 @@ complexity:
   ComplexMethod:
     active: true
     threshold: 10
+    ignoreSingleWhenExpression: false
   LabeledExpression:
     active: true
   LargeClass:
@@ -25,31 +26,32 @@ complexity:
     threshold: 20
   LongParameterList:
     active: true
-    threshold: 5
+    threshold: 6
     ignoreDefaultParameters: true
   MethodOverloading:
     active: false
   NestedBlockDepth:
     active: true
-    threshold: 3
+    threshold: 4
   StringLiteralDuplication:
     active: true
-    threshold: 2
+    threshold: 3
     ignoreAnnotation: true
     excludeStringsWithLessThan5Characters: true
     ignoreStringsRegex: '$^'
   TooManyFunctions:
     active: true
-    thresholdInFiles: 10
+    thresholdInFiles: 11
-    thresholdInClasses: 10
+    thresholdInClasses: 11
-    thresholdInInterfaces: 10
+    thresholdInInterfaces: 11
-    thresholdInObjects: 10
+    thresholdInObjects: 11
-    thresholdInEnums: 10
+    thresholdInEnums: 11
 
 empty-blocks:
   active: true
   EmptyCatchBlock:
-    active: false
+    active: true
+    allowedExceptionNameRegex: "^(_|ignore|expected).*"
   EmptyClassBlock:
     active: true
   EmptyDefaultConstructor:
@@ -64,6 +66,7 @@ empty-blocks:
     active: true
   EmptyFunctionBlock:
     active: true
+    ignoreOverriddenFunctions: false
   EmptyIfBlock:
     active: true
   EmptyInitBlock:
@@ -105,7 +108,7 @@ exceptions:
     active: true
   TooGenericExceptionCaught:
     active: true
-    exceptions:
+    exceptionNames:
      - ArrayIndexOutOfBoundsException
      - Error
      - Exception
@@ -116,10 +119,9 @@ exceptions:
      - Throwable
   TooGenericExceptionThrown:
     active: true
-    exceptions:
+    exceptionNames:
      - Error
      - Exception
-     - NullPointerException
      - Throwable
      - RuntimeException
 
@@ -143,6 +145,7 @@ naming:
   FunctionNaming:
     active: true
     functionPattern: '^([a-z$][a-zA-Z$0-9]*)|(`.*`)$'
+    excludeClassPattern: '$^'
   MatchingDeclarationName:
     active: true
   MemberNameEqualsClassName:
@@ -167,6 +170,7 @@ naming:
     active: true
     variablePattern: '[a-z][A-Za-z0-9]*'
     privateVariablePattern: '(_)?[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
 
 performance:
   active: true
@@ -239,15 +243,17 @@ style:
     maxLineLength: 120
     excludePackageStatements: false
     excludeImportStatements: false
+  MayBeConst:
+    active: true
   ModifierOrder:
     active: true
   NestedClassesVisibility:
     active: true
   NewLineAtEndOfFile:
     active: true
-  OptionalAbstractKeyword:
+  NoTabs:
     active: true
-  OptionalReturnKeyword:
+  OptionalAbstractKeyword:
     active: true
   OptionalUnit:
     active: true
@@ -268,6 +274,8 @@ style:
   ThrowsCount:
     active: true
     max: 2
+  TrailingWhitespace:
+    active: true
   UnnecessaryAbstractClass:
     active: true
   UnnecessaryInheritance:
@@ -278,6 +286,8 @@ style:
     active: true
   UnusedImports:
     active: true
+  UnusedPrivateMember:
+    active: true
   UseDataClass:
     active: false
   UtilityClassWithPublicConstructor:

mobile/build.gradle

@@ -21,8 +21,8 @@ android {
         applicationId "com.github.shadowsocks"
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.sdkVersion
-        versionCode 4050200
+        versionCode 4050400
-        versionName "4.5.2"
+        versionName "4.5.4"
         testApplicationId "com.github.shadowsocks.test"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         resConfigs "fa", "fr", "ja", "ko", "ru", "zh-rCN", "zh-rTW"
@@ -58,7 +58,7 @@ dependencies {
     implementation "com.android.support:design:$supportLibraryVersion"
     implementation "com.android.support:gridlayout-v7:$supportLibraryVersion"
     implementation 'com.futuremind.recyclerfastscroll:fastscroll:0.2.5'
-    implementation 'com.evernote:android-job:1.2.4'
+    implementation 'com.evernote:android-job:1.2.5'
     implementation "com.google.android.gms:play-services-ads:$playServicesVersion"
     implementation "com.google.android.gms:play-services-analytics:$playServicesVersion"
     implementation "com.google.android.gms:play-services-vision:$playServicesVersion"

mobile/src/main/java/com/github/shadowsocks/App.kt

@@ -23,6 +23,7 @@ package com.github.shadowsocks
 import android.app.Application
 import android.app.NotificationChannel
 import android.app.NotificationManager
+import android.app.admin.DevicePolicyManager
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
@@ -33,8 +34,8 @@ import android.content.res.Configuration
 import android.os.Build
 import android.os.Handler
 import android.os.Looper
+import android.os.UserManager
 import android.support.annotation.RequiresApi
-import android.support.v4.os.UserManagerCompat
 import android.support.v7.app.AppCompatDelegate
 import android.util.Log
 import android.widget.Toast
@@ -71,7 +72,12 @@ class App : Application() {
     val deviceContext: Context by lazy { if (Build.VERSION.SDK_INT < 24) this else DeviceContext(this) }
     val remoteConfig: FirebaseRemoteConfig by lazy { FirebaseRemoteConfig.getInstance() }
     private val tracker: Tracker by lazy { GoogleAnalytics.getInstance(deviceContext).newTracker(R.xml.tracker) }
+    private val exceptionParser by lazy { StandardExceptionParser(this, null) }
     val info: PackageInfo by lazy { getPackageInfo(packageName) }
+    val directBootSupported by lazy {
+        Build.VERSION.SDK_INT >= 24 && getSystemService(DevicePolicyManager::class.java)
+            .storageEncryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE_PER_USER
+    }
 
     fun getPackageInfo(packageName: String) =
             packageManager.getPackageInfo(packageName, PackageManager.GET_SIGNATURES)!!
@@ -101,7 +107,7 @@ class App : Application() {
     fun track(t: Throwable) = track(Thread.currentThread(), t)
     fun track(thread: Thread, t: Throwable) {
         tracker.send(HitBuilders.ExceptionBuilder()
-                .setDescription(StandardExceptionParser(this, null).getDescription(thread.name, t))
+                .setDescription("${exceptionParser.getDescription(thread.name, t)} - ${t.message}")
                 .setFatal(false)
                 .build())
         t.printStackTrace()
@@ -138,14 +144,15 @@ class App : Application() {
             app.track(e)
         }
 
-        // handle data restored
+        // handle data restored/crash
-        if (DataStore.directBootAware && UserManagerCompat.isUserUnlocked(this)) DirectBoot.update()
+        if (Build.VERSION.SDK_INT >= 24 && DataStore.directBootAware &&
+                (getSystemService(Context.USER_SERVICE) as UserManager).isUserUnlocked) DirectBoot.flushTrafficStats()
         TcpFastOpen.enabledAsync(DataStore.publicStore.getBoolean(Key.tfo, TcpFastOpen.sendEnabled))
         if (DataStore.publicStore.getLong(Key.assetUpdateTime, -1) != info.lastUpdateTime) {
             val assetManager = assets
             for (dir in arrayOf("acl", "overture"))
                 try {
-                    for (file in assetManager.list(dir)) assetManager.open(dir + '/' + file).use { input ->
+                    for (file in assetManager.list(dir)) assetManager.open("$dir/$file").use { input ->
                         File(deviceContext.filesDir, file).outputStream().use { output -> input.copyTo(output) }
                     }
                 } catch (e: IOException) {

mobile/src/main/java/com/github/shadowsocks/AppManager.kt

@@ -62,23 +62,21 @@ class AppManager : AppCompatActivity(), Toolbar.OnMenuItemClickListener {
 
         private var receiver: BroadcastReceiver? = null
         private var cachedApps: List<PackageInfo>? = null
-        private fun getApps(pm: PackageManager): List<ProxiedApp> {
+        private fun getApps(pm: PackageManager) = synchronized(AppManager) {
-            return synchronized(AppManager) {
+            if (receiver == null) receiver = app.listenForPackageChanges {
-                if (receiver == null) receiver = app.listenForPackageChanges {
+                synchronized(AppManager) {
-                    synchronized(AppManager) {
+                    receiver = null
-                        receiver = null
+                    cachedApps = null
-                        cachedApps = null
-                    }
-                    AppManager.instance?.reloadApps()
                 }
-                // Labels and icons can change on configuration (locale, etc.) changes, therefore they are not cached.
+                AppManager.instance?.reloadApps()
-                val cachedApps = cachedApps ?: pm.getInstalledPackages(PackageManager.GET_PERMISSIONS)
+            }
-                        .filter { it.packageName != app.packageName &&
+            // Labels and icons can change on configuration (locale, etc.) changes, therefore they are not cached.
-                                it.requestedPermissions?.contains(Manifest.permission.INTERNET) ?: false }
+            val cachedApps = cachedApps ?: pm.getInstalledPackages(PackageManager.GET_PERMISSIONS)
-                this.cachedApps = cachedApps
+                    .filter { it.packageName != app.packageName &&
-                cachedApps
+                            it.requestedPermissions?.contains(Manifest.permission.INTERNET) ?: false }
-            }.map { ProxiedApp(pm, it.applicationInfo, it.packageName) }
+            this.cachedApps = cachedApps
-        }
+            cachedApps
+        }.map { ProxiedApp(pm, it.applicationInfo, it.packageName) }
     }
 
     private class ProxiedApp(private val pm: PackageManager, private val appInfo: ApplicationInfo,
@@ -155,7 +153,7 @@ class AppManager : AppCompatActivity(), Toolbar.OnMenuItemClickListener {
         appListView.visibility = View.GONE
         fastScroller.visibility = View.GONE
         loadingView.visibility = View.VISIBLE
-        thread {
+        thread("AppManager-loader") {
             val adapter = appListView.adapter as AppsAdapter
             do {
                 appsLoading.set(true)

mobile/src/main/java/com/github/shadowsocks/GlobalSettingsPreferenceFragment.kt

@@ -20,12 +20,12 @@
 
 package com.github.shadowsocks
 
-import android.app.admin.DevicePolicyManager
 import android.os.Build
 import android.os.Bundle
 import android.support.design.widget.Snackbar
 import android.support.v14.preference.SwitchPreference
 import android.support.v7.preference.Preference
+import com.github.shadowsocks.App.Companion.app
 import com.github.shadowsocks.bg.BaseService
 import com.github.shadowsocks.preference.DataStore
 import com.github.shadowsocks.utils.DirectBoot
@@ -39,20 +39,17 @@ class GlobalSettingsPreferenceFragment : PreferenceFragmentCompatDividers() {
         DataStore.initGlobal()
         addPreferencesFromResource(R.xml.pref_global)
         val boot = findPreference(Key.isAutoConnect) as SwitchPreference
-        val directBootAwareListener = Preference.OnPreferenceChangeListener { _, newValue ->
-            if (newValue as Boolean) DirectBoot.update() else DirectBoot.clean()
-            true
-        }
         boot.setOnPreferenceChangeListener { _, value ->
             BootReceiver.enabled = value as Boolean
-            directBootAwareListener.onPreferenceChange(null, DataStore.directBootAware)
+            true
         }
         boot.isChecked = BootReceiver.enabled
 
-        val dba = findPreference(Key.directBootAware)
+        val canToggleLocked = findPreference(Key.directBootAware)
-        if (Build.VERSION.SDK_INT >= 24 && requireContext().getSystemService(DevicePolicyManager::class.java)
+        if (Build.VERSION.SDK_INT >= 24) canToggleLocked.setOnPreferenceChangeListener { _, newValue ->
-                .storageEncryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE_PER_USER)
+            if (app.directBootSupported && newValue as Boolean) DirectBoot.update() else DirectBoot.clean()
-            dba.onPreferenceChangeListener = directBootAwareListener else dba.parent!!.removePreference(dba)
+            true
+        } else canToggleLocked.parent!!.removePreference(canToggleLocked)
 
         val tfo = findPreference(Key.tfo) as SwitchPreference
         tfo.isChecked = TcpFastOpen.sendEnabled

mobile/src/main/java/com/github/shadowsocks/MainActivity.kt

@@ -266,18 +266,20 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Interface, Drawe
                 ++testCount
                 statusText.setText(R.string.connection_test_testing)
                 val id = testCount  // it would change by other code
-                thread { testConnection(id) }
+                thread("ConnectionTest") { testConnection(id) }
             }
         }
 
         fab = findViewById(R.id.fab)
         fab.setOnClickListener {
-            if (state == BaseService.CONNECTED) app.stopService() else thread {
+            when {
-                if (BaseService.usingVpnMode) {
+                state == BaseService.CONNECTED -> app.stopService()
+                BaseService.usingVpnMode -> {
                     val intent = VpnService.prepare(this)
                     if (intent != null) startActivityForResult(intent, REQUEST_CONNECT)
-                    else app.handler.post { onActivityResult(REQUEST_CONNECT, Activity.RESULT_OK, null) }
+                    else onActivityResult(REQUEST_CONNECT, Activity.RESULT_OK, null)
-                } else app.startService()
+                }
+                else -> app.startService()
             }
         }
 

mobile/src/main/java/com/github/shadowsocks/bg/BaseService.kt

@@ -49,6 +49,7 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.json.JSONObject
 import java.io.File
+import java.io.IOException
 import java.net.UnknownHostException
 import java.security.MessageDigest
 import java.util.*
@@ -116,7 +117,10 @@ object BaseService {
                                             val item = callbacks.getBroadcastItem(i)
                                             if (bandwidthListeners.contains(item.asBinder()))
                                                 item.trafficUpdated(profile!!.id, txRate, rxRate, txTotal, rxTotal)
-                                        } catch (_: Exception) { }  // ignore
+                                        } catch (e: Exception) {
+                                            e.printStackTrace()
+                                            app.track(e)
+                                        }
                                         callbacks.finishBroadcast()
                                     }
                                 }
@@ -145,22 +149,35 @@ object BaseService {
         }
 
         internal fun updateTrafficTotal(tx: Long, rx: Long) {
-            // this.profile may have host, etc. modified and thus a re-fetch is necessary (possible race condition)
+            try {
-            val profile = ProfileManager.getProfile((profile ?: return).id) ?: return
+                // this.profile may have host, etc. modified and thus a re-fetch is necessary (possible race condition)
-            profile.tx += tx
+                val profile = ProfileManager.getProfile((profile ?: return).id) ?: return
-            profile.rx += rx
+                profile.tx += tx
-            ProfileManager.updateProfile(profile)
+                profile.rx += rx
-            app.handler.post {
+                ProfileManager.updateProfile(profile)
-                if (bandwidthListeners.isNotEmpty()) {
+                app.handler.post {
-                    val n = callbacks.beginBroadcast()
+                    if (bandwidthListeners.isNotEmpty()) {
-                    for (i in 0 until n) {
+                        val n = callbacks.beginBroadcast()
-                        try {
+                        for (i in 0 until n) {
-                            val item = callbacks.getBroadcastItem(i)
+                            try {
-                            if (bandwidthListeners.contains(item.asBinder())) item.trafficPersisted(profile.id)
+                                val item = callbacks.getBroadcastItem(i)
-                        } catch (_: Exception) { }  // ignore
+                                if (bandwidthListeners.contains(item.asBinder())) item.trafficPersisted(profile.id)
+                            } catch (e: Exception) {
+                                e.printStackTrace()
+                                app.track(e)
+                            }
+                        }
+                        callbacks.finishBroadcast()
                     }
-                    callbacks.finishBroadcast()
                 }
+            } catch (e: IOException) {
+                if (!DataStore.directBootAware) throw e // we should only reach here because we're in direct boot
+                val profile = DirectBoot.getDeviceProfile()!!
+                profile.tx += tx
+                profile.rx += rx
+                profile.dirty = true
+                DirectBoot.update(profile)
+                DirectBoot.listenForUnlock()
             }
         }
 
@@ -200,7 +217,10 @@ object BaseService {
                 val n = callbacks.beginBroadcast()
                 for (i in 0 until n) try {
                     callbacks.getBroadcastItem(i).stateChanged(s, binder.profileName, msg)
-                } catch (_: Exception) { }  // ignore
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                    app.track(e)
+                }
                 callbacks.finishBroadcast()
             }
             state = s
@@ -235,6 +255,7 @@ object BaseService {
 
         fun startNativeProcesses() {
             val data = data
+            val profile = data.profile!!
             val cmd = buildAdditionalArguments(arrayListOf(
                     File((this as Context).applicationInfo.nativeLibraryDir, Executable.SS_LOCAL).absolutePath,
                     "-u",
@@ -249,6 +270,8 @@ object BaseService {
                 cmd += acl.absolutePath
             }
 
+            if (profile.udpdns) cmd += "-D"
+
             if (TcpFastOpen.sendEnabled) cmd += "--fast-open"
 
             data.sslocalProcess = GuardedProcess(cmd).start()
@@ -341,7 +364,7 @@ object BaseService {
 
             data.changeState(CONNECTING)
 
-            thread {
+            thread("$tag-Connecting") {
                 try {
                     if (profile.host == "198.199.101.152") {
                         val client = OkHttpClient.Builder()

mobile/src/main/java/com/github/shadowsocks/bg/GuardedProcess.kt

@@ -28,6 +28,7 @@ import com.github.shadowsocks.BuildConfig
 import com.github.shadowsocks.JniHelper
 import com.github.shadowsocks.utils.Commandline
 import com.github.shadowsocks.utils.thread
+import java.io.File
 import java.io.IOException
 import java.io.InputStream
 import java.util.concurrent.Semaphore
@@ -42,8 +43,9 @@ class GuardedProcess(private val cmd: List<String>) {
     private var isDestroyed = false
     @Volatile
     private lateinit var process: Process
+    private val name = File(cmd.first()).nameWithoutExtension
 
-    private fun streamLogger(input: InputStream, logger: (String, String) -> Int) = thread {
+    private fun streamLogger(input: InputStream, logger: (String, String) -> Int) = thread("StreamLogger-$name") {
         try {
             input.bufferedReader().useLines { it.forEach { logger(TAG, it) } }
         } catch (_: IOException) { }    // ignore
@@ -53,7 +55,7 @@ class GuardedProcess(private val cmd: List<String>) {
         val semaphore = Semaphore(1)
         semaphore.acquire()
         var ioException: IOException? = null
-        guardThread = thread(name = "GuardThread-" + cmd.first()) {
+        guardThread = thread("GuardThread-$name") {
             try {
                 var callback: (() -> Unit)? = null
                 while (!isDestroyed) {

mobile/src/main/java/com/github/shadowsocks/bg/LocalDnsService.kt

@@ -72,19 +72,18 @@ object LocalDnsService {
                         .put("MinimumTTL", 120)
                         .put("CacheSize", 4096)
                 val remoteDns = JSONArray(profile.remoteDns.split(",")
-                        .mapIndexed { i, dns -> makeDns("UserDef-" + i,
+                        .mapIndexed { i, dns -> makeDns("UserDef-$i", dns.trim() + ":53", 9) })
-                        dns.trim() + ":53", 9) })
                 val localDns = JSONArray(arrayOf(
-                        makeDns("Primary-1", "119.29.29.29:53", 3, false),
+                        makeDns("Primary-1", "208.67.222.222:443", 3, false),
-                        makeDns("Primary-2", "114.114.114.114:53", 3, false),
+                        makeDns("Primary-2", "119.29.29.29:53", 3, false),
-                        makeDns("Primary-3", "208.67.222.222:443", 3, false)
+                        makeDns("Primary-3", "114.114.114.114:53", 3, false)
                 ))
 
                 when (profile.route) {
                     Acl.BYPASS_CHN, Acl.BYPASS_LAN_CHN, Acl.GFWLIST, Acl.CUSTOM_RULES -> config
                             .put("PrimaryDNS", localDns)
                             .put("AlternativeDNS", remoteDns)
-                            .put("DomainFile", data.aclFile!!.absolutePath)
+                            .put("IPNetworkFile", "china_ip_list.txt")
                     Acl.CHINALIST -> config
                             .put("PrimaryDNS", localDns)
                             .put("AlternativeDNS", remoteDns)

mobile/src/main/java/com/github/shadowsocks/bg/LocalSocketListener.kt

@@ -28,7 +28,7 @@ import com.github.shadowsocks.App.Companion.app
 import java.io.File
 import java.io.IOException
 
-abstract class LocalSocketListener(protected val tag: String) : Thread() {
+abstract class LocalSocketListener(protected val tag: String) : Thread(tag) {
     init {
         setUncaughtExceptionHandler(app::track)
     }

mobile/src/main/java/com/github/shadowsocks/bg/TileService.kt

@@ -82,7 +82,7 @@ class TileService : BaseTileService(), ShadowsocksConnection.Interface {
     }
 
     override fun onClick() {
-        if (isLocked && !DataStore.directBootAware) unlockAndRun(this::toggle) else toggle()
+        if (isLocked && !DataStore.canToggleLocked) unlockAndRun(this::toggle) else toggle()
     }
 
     private fun toggle() {

mobile/src/main/java/com/github/shadowsocks/bg/VpnService.kt

@@ -20,6 +20,7 @@
 
 package com.github.shadowsocks.bg
 
+import android.annotation.TargetApi
 import android.app.Service
 import android.content.Context
 import android.content.Intent
@@ -28,6 +29,7 @@ import android.net.*
 import android.os.Build
 import android.os.IBinder
 import android.os.ParcelFileDescriptor
+import android.support.v4.os.BuildCompat
 import android.util.Log
 import com.github.shadowsocks.App.Companion.app
 import com.github.shadowsocks.JniHelper
@@ -116,12 +118,14 @@ class VpnService : BaseVpnService(), LocalDnsService.Interface {
     private var worker: ProtectWorker? = null
     private var tun2socksProcess: GuardedProcess? = null
     private var underlyingNetwork: Network? = null
+        @TargetApi(28)
         set(value) {
-            if (Build.VERSION.SDK_INT >= 22) setUnderlyingNetworks(if (value == null) null else arrayOf(value))
+            setUnderlyingNetworks(if (value == null) null else arrayOf(value))
             field = value
         }
 
     private val connectivity by lazy { getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager }
+    @TargetApi(28)
     private val defaultNetworkCallback = object : ConnectivityManager.NetworkCallback() {
         override fun onAvailable(network: Network) {
             underlyingNetwork = network
@@ -229,9 +233,11 @@ class VpnService : BaseVpnService(), LocalDnsService.Interface {
         this.conn = conn
         val fd = conn.fd
 
-        // we want REQUEST here instead of LISTEN
+        if (BuildCompat.isAtLeastP()) {
-        connectivity.requestNetwork(defaultNetworkRequest, defaultNetworkCallback)
+            // we want REQUEST here instead of LISTEN
-        listeningForDefaultNetwork = true
+            connectivity.requestNetwork(defaultNetworkRequest, defaultNetworkCallback)
+            listeningForDefaultNetwork = true
+        }
 
         val cmd = arrayListOf(File(applicationInfo.nativeLibraryDir, Executable.TUN2SOCKS).absolutePath,
                 "--netif-ipaddr", PRIVATE_VLAN.format(Locale.ENGLISH, "2"),

mobile/src/main/java/com/github/shadowsocks/database/LockUtils.kt

@@ -1,61 +0,0 @@
-/*******************************************************************************
- *                                                                             *
- *  Copyright (C) 2017 by Max Lv <max.c.lv@gmail.com>                          *
- *  Copyright (C) 2017 by Mygod Studio <contact-shadowsocks-android@mygod.be>  *
- *                                                                             *
- *  This program is free software: you can redistribute it and/or modify       *
- *  it under the terms of the GNU General Public License as published by       *
- *  the Free Software Foundation, either version 3 of the License, or          *
- *  (at your option) any later version.                                        *
- *                                                                             *
- *  This program is distributed in the hope that it will be useful,            *
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
- *  GNU General Public License for more details.                               *
- *                                                                             *
- *  You should have received a copy of the GNU General Public License          *
- *  along with this program. If not, see <http://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
-
-package com.github.shadowsocks.database
-
-import android.database.sqlite.SQLiteDatabaseLockedException
-import com.j256.ormlite.dao.Dao
-import com.j256.ormlite.support.ConnectionSource
-import com.j256.ormlite.table.TableUtils
-import java.sql.SQLException
-
-private val Throwable.ultimateCause: Throwable get() {
-    var result = this
-    while (true) {
-        val cause = result.cause ?: return result
-        result = cause
-    }
-}
-
-@Throws(SQLException::class)
-fun <T> safeWrapper(func: () -> T): T {
-    while (true) {
-        try {
-            return func()
-        } catch (e: SQLException) {
-            if (e.ultimateCause !is SQLiteDatabaseLockedException) throw e
-        }
-    }
-}
-
-@Throws(SQLException::class)
-inline fun <reified T> ConnectionSource.createTableSafe() = safeWrapper { TableUtils.createTable(this, T::class.java) }
-@Throws(SQLException::class)
-fun <T, ID> Dao<T, ID>.queryAllSafe(): MutableList<T> = safeWrapper { queryForAll() }
-@Throws(SQLException::class)
-fun <T, ID> Dao<T, ID>.queryByIdSafe(id: ID?): T? = safeWrapper { queryForId(id) }
-@Throws(SQLException::class)
-fun <T, ID> Dao<T, ID>.updateSafe(data: T?): Int = safeWrapper { update(data) }
-@Throws(SQLException::class)
-fun <T, ID> Dao<T, ID>.replaceSafe(data: T?): Dao.CreateOrUpdateStatus? = safeWrapper { createOrUpdate(data) }
-@Throws(SQLException::class)
-fun <T, ID> Dao<T, ID>.deleteByIdSafe(id: ID?) = safeWrapper { deleteById(id) }
-@Throws(SQLException::class)
-fun <T, ID> Dao<T, ID>.executeSafe(statement: String?) = safeWrapper { executeRawNoArgs(statement) }

mobile/src/main/java/com/github/shadowsocks/database/PrivateDatabase.kt

@@ -37,18 +37,18 @@ object PrivateDatabase : OrmLiteSqliteOpenHelper(app, Key.DB_PROFILE, null, 25)
     @Suppress("UNCHECKED_CAST")
     val kvPairDao: Dao<KeyValuePair, String?> by lazy { getDao(KeyValuePair::class.java) as Dao<KeyValuePair, String?> }
 
-    override fun onCreate(database: SQLiteDatabase?, connectionSource: ConnectionSource) {
+    override fun onCreate(database: SQLiteDatabase?, connectionSource: ConnectionSource?) {
-        connectionSource.createTableSafe<Profile>()
+        TableUtils.createTable(connectionSource, Profile::class.java)
-        connectionSource.createTableSafe<KeyValuePair>()
+        TableUtils.createTable(connectionSource, KeyValuePair::class.java)
     }
 
-    private fun recreate(database: SQLiteDatabase?, connectionSource: ConnectionSource) {
+    private fun recreate(database: SQLiteDatabase?, connectionSource: ConnectionSource?) {
         TableUtils.dropTable<Profile, Int>(connectionSource, Profile::class.java, true)
         TableUtils.dropTable<KeyValuePair, String?>(connectionSource, KeyValuePair::class.java, true)
         onCreate(database, connectionSource)
     }
 
-    override fun onUpgrade(database: SQLiteDatabase?, connectionSource: ConnectionSource,
+    override fun onUpgrade(database: SQLiteDatabase?, connectionSource: ConnectionSource?,
                            oldVersion: Int, newVersion: Int) {
         if (oldVersion < 7) {
             recreate(database, connectionSource)
@@ -57,38 +57,38 @@ object PrivateDatabase : OrmLiteSqliteOpenHelper(app, Key.DB_PROFILE, null, 25)
 
         try {
             if (oldVersion < 8) {
-                profileDao.executeSafe("ALTER TABLE `profile` ADD COLUMN udpdns SMALLINT;")
+                profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN udpdns SMALLINT;")
             }
             if (oldVersion < 9) {
-                profileDao.executeSafe("ALTER TABLE `profile` ADD COLUMN route VARCHAR DEFAULT 'all';")
+                profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN route VARCHAR DEFAULT 'all';")
             } else if (oldVersion < 19) {
-                profileDao.executeSafe("UPDATE `profile` SET route = 'all' WHERE route IS NULL;")
+                profileDao.executeRawNoArgs("UPDATE `profile` SET route = 'all' WHERE route IS NULL;")
             }
             if (oldVersion < 11) {
-                profileDao.executeSafe("ALTER TABLE `profile` ADD COLUMN ipv6 SMALLINT;")
+                profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN ipv6 SMALLINT;")
             }
             if (oldVersion < 12) {
-                profileDao.executeSafe("BEGIN TRANSACTION;")
+                profileDao.executeRawNoArgs("BEGIN TRANSACTION;")
-                profileDao.executeSafe("ALTER TABLE `profile` RENAME TO `tmp`;")
+                profileDao.executeRawNoArgs("ALTER TABLE `profile` RENAME TO `tmp`;")
-                connectionSource.createTableSafe<Profile>()
+                TableUtils.createTable(connectionSource, Profile::class.java)
-                profileDao.executeSafe(
+                profileDao.executeRawNoArgs(
                         "INSERT INTO `profile`(id, name, host, localPort, remotePort, password, method, route," +
                                 " proxyApps, bypass, udpdns, ipv6, individual) " +
                                 "SELECT id, name, host, localPort, remotePort, password, method, route, 1 - global," +
                                 " bypass, udpdns, ipv6, individual FROM `tmp`;")
-                profileDao.executeSafe("DROP TABLE `tmp`;")
+                profileDao.executeRawNoArgs("DROP TABLE `tmp`;")
-                profileDao.executeSafe("COMMIT;")
+                profileDao.executeRawNoArgs("COMMIT;")
             } else if (oldVersion < 13) {
-                profileDao.executeSafe("ALTER TABLE `profile` ADD COLUMN tx LONG;")
+                profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN tx LONG;")
-                profileDao.executeSafe("ALTER TABLE `profile` ADD COLUMN rx LONG;")
+                profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN rx LONG;")
-                profileDao.executeSafe("ALTER TABLE `profile` ADD COLUMN date VARCHAR;")
+                profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN date VARCHAR;")
             }
 
             if (oldVersion < 15) {
-                if (oldVersion >= 12) profileDao.executeSafe("ALTER TABLE `profile` ADD COLUMN userOrder LONG;")
+                if (oldVersion >= 12) profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN userOrder LONG;")
                 var i = 0L
                 val apps by lazy { app.packageManager.getInstalledApplications(0) }
-                for (profile in profileDao.queryAllSafe()) {
+                for (profile in profileDao.queryForAll()) {
                     if (oldVersion < 14) {
                         val uidSet = profile.individual.split('|').filter(TextUtils::isDigitsOnly)
                                 .map(String::toInt).toSet()
@@ -96,28 +96,28 @@ object PrivateDatabase : OrmLiteSqliteOpenHelper(app, Key.DB_PROFILE, null, 25)
                                 .joinToString("\n") { it.packageName }
                     }
                     profile.userOrder = i
-                    profileDao.updateSafe(profile)
+                    profileDao.update(profile)
                     i += 1
                 }
             }
 
             if (oldVersion < 16) {
-                profileDao.executeSafe(
+                profileDao.executeRawNoArgs(
                         "UPDATE `profile` SET route = 'bypass-lan-china' WHERE route = 'bypass-china'")
             }
 
             if (oldVersion < 21) {
-                profileDao.executeSafe("ALTER TABLE `profile` ADD COLUMN remoteDns VARCHAR DEFAULT '8.8.8.8';")
+                profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN remoteDns VARCHAR DEFAULT '8.8.8.8';")
             }
 
             if (oldVersion < 17) {
-                profileDao.executeSafe("ALTER TABLE `profile` ADD COLUMN plugin VARCHAR;")
+                profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN plugin VARCHAR;")
             } else if (oldVersion < 22) {
                 // upgrade kcptun to SIP003 plugin
-                profileDao.executeSafe("BEGIN TRANSACTION;")
+                profileDao.executeRawNoArgs("BEGIN TRANSACTION;")
-                profileDao.executeSafe("ALTER TABLE `profile` RENAME TO `tmp`;")
+                profileDao.executeRawNoArgs("ALTER TABLE `profile` RENAME TO `tmp`;")
-                connectionSource.createTableSafe<Profile>()
+                TableUtils.createTable(connectionSource, Profile::class.java)
-                profileDao.executeSafe(
+                profileDao.executeRawNoArgs(
                         "INSERT INTO `profile`(id, name, host, localPort, remotePort, password, method, route, " +
                                 "remoteDns, proxyApps, bypass, udpdns, ipv6, individual, tx, rx, date, userOrder, " +
                                 "plugin) " +
@@ -125,17 +125,17 @@ object PrivateDatabase : OrmLiteSqliteOpenHelper(app, Key.DB_PROFILE, null, 25)
                                 "CASE WHEN kcp = 1 THEN kcpPort ELSE remotePort END, password, method, route, " +
                                 "remoteDns, proxyApps, bypass, udpdns, ipv6, individual, tx, rx, date, userOrder, " +
                                 "CASE WHEN kcp = 1 THEN 'kcptun ' || kcpcli ELSE NULL END FROM `tmp`;")
-                profileDao.executeSafe("DROP TABLE `tmp`;")
+                profileDao.executeRawNoArgs("DROP TABLE `tmp`;")
-                profileDao.executeSafe("COMMIT;")
+                profileDao.executeRawNoArgs("COMMIT;")
             }
 
             if (oldVersion < 23) {
-                profileDao.executeSafe("BEGIN TRANSACTION;")
+                profileDao.executeRawNoArgs("BEGIN TRANSACTION;")
-                connectionSource.createTableSafe<KeyValuePair>()
+                TableUtils.createTable(connectionSource, KeyValuePair::class.java)
-                profileDao.executeSafe("COMMIT;")
+                profileDao.executeRawNoArgs("COMMIT;")
                 val old = PreferenceManager.getDefaultSharedPreferences(app)
-                PublicDatabase.kvPairDao.replaceSafe(KeyValuePair(Key.id).put(old.getInt(Key.id, 0)))
+                PublicDatabase.kvPairDao.createOrUpdate(KeyValuePair(Key.id).put(old.getInt(Key.id, 0)))
-                PublicDatabase.kvPairDao.replaceSafe(KeyValuePair(Key.tfo).put(old.getBoolean(Key.tfo, false)))
+                PublicDatabase.kvPairDao.createOrUpdate(KeyValuePair(Key.tfo).put(old.getBoolean(Key.tfo, false)))
             }
 
             if (oldVersion < 25) {

mobile/src/main/java/com/github/shadowsocks/database/Profile.kt

@@ -147,6 +147,9 @@ class Profile : Serializable {
     @DatabaseField
     var plugin: String? = null
 
+    // not persisted in db, only used by direct boot
+    var dirty: Boolean = false
+
     val formattedAddress get() = (if (host.contains(":")) "[%s]:%d" else "%s:%d").format(host, remotePort)
     val formattedName get() = if (name.isNullOrEmpty()) formattedAddress else name!!
 

mobile/src/main/java/com/github/shadowsocks/database/ProfileManager.kt

@@ -20,11 +20,13 @@
 
 package com.github.shadowsocks.database
 
+import android.database.sqlite.SQLiteCantOpenDatabaseException
 import android.util.Log
 import com.github.shadowsocks.App.Companion.app
 import com.github.shadowsocks.ProfilesFragment
 import com.github.shadowsocks.preference.DataStore
 import com.github.shadowsocks.utils.DirectBoot
+import java.io.IOException
 import java.sql.SQLException
 
 /**
@@ -48,12 +50,10 @@ object ProfileManager {
             profile.individual = oldProfile.individual
             profile.udpdns = oldProfile.udpdns
         }
-        val last = safeWrapper {
+        val last = PrivateDatabase.profileDao.queryRaw(PrivateDatabase.profileDao.queryBuilder()
-            PrivateDatabase.profileDao.queryRaw(PrivateDatabase.profileDao.queryBuilder()
                 .selectRaw("MAX(userOrder)").prepareStatementString()).firstResult
-        }
         if (last != null && last.size == 1 && last[0] != null) profile.userOrder = last[0].toLong() + 1
-        PrivateDatabase.profileDao.replaceSafe(profile)
+        PrivateDatabase.profileDao.createOrUpdate(profile)
         ProfilesFragment.instance?.profilesAdapter?.add(profile)
         return profile
     }
@@ -62,11 +62,13 @@ object ProfileManager {
      * Note: It's caller's responsibility to update DirectBoot profile if necessary.
      */
     @Throws(SQLException::class)
-    fun updateProfile(profile: Profile) = PrivateDatabase.profileDao.updateSafe(profile)
+    fun updateProfile(profile: Profile) = PrivateDatabase.profileDao.update(profile)
 
+    @Throws(IOException::class)
     fun getProfile(id: Int): Profile? = try {
-        PrivateDatabase.profileDao.queryByIdSafe(id)
+        PrivateDatabase.profileDao.queryForId(id)
     } catch (ex: SQLException) {
+        if (ex.cause is SQLiteCantOpenDatabaseException) throw IOException(ex)
         Log.e(TAG, "getProfile", ex)
         app.track(ex)
         null
@@ -74,28 +76,26 @@ object ProfileManager {
 
     @Throws(SQLException::class)
     fun delProfile(id: Int) {
-        PrivateDatabase.profileDao.deleteByIdSafe(id)
+        PrivateDatabase.profileDao.deleteById(id)
         ProfilesFragment.instance?.profilesAdapter?.removeId(id)
         if (id == DataStore.profileId && DataStore.directBootAware) DirectBoot.clean()
     }
 
+    @Throws(IOException::class)
     fun getFirstProfile(): Profile? = try {
-        safeWrapper {
+        PrivateDatabase.profileDao.query(PrivateDatabase.profileDao.queryBuilder().limit(1L).prepare()).singleOrNull()
-            PrivateDatabase.profileDao.query(
-                    PrivateDatabase.profileDao.queryBuilder().limit(1L).prepare()).singleOrNull()
-        }
     } catch (ex: SQLException) {
+        if (ex.cause is SQLiteCantOpenDatabaseException) throw IOException(ex)
         Log.e(TAG, "getFirstProfile", ex)
         app.track(ex)
         null
     }
 
+    @Throws(IOException::class)
     fun getAllProfiles(): List<Profile>? = try {
-        safeWrapper {
+        PrivateDatabase.profileDao.query(PrivateDatabase.profileDao.queryBuilder().orderBy("userOrder", true).prepare())
-            PrivateDatabase.profileDao.query(
-                    PrivateDatabase.profileDao.queryBuilder().orderBy("userOrder", true).prepare())
-        }
     } catch (ex: SQLException) {
+        if (ex.cause is SQLiteCantOpenDatabaseException) throw IOException(ex)
         Log.e(TAG, "getAllProfiles", ex)
         app.track(ex)
         null

mobile/src/main/java/com/github/shadowsocks/database/PublicDatabase.kt

@@ -34,21 +34,20 @@ object PublicDatabase : OrmLiteSqliteOpenHelper(app.deviceContext, Key.DB_PUBLIC
     @Suppress("UNCHECKED_CAST")
     val kvPairDao: Dao<KeyValuePair, String?> by lazy { getDao(KeyValuePair::class.java) as Dao<KeyValuePair, String?> }
 
-    override fun onCreate(database: SQLiteDatabase?, connectionSource: ConnectionSource) {
+    override fun onCreate(database: SQLiteDatabase?, connectionSource: ConnectionSource?) {
-        connectionSource.createTableSafe<KeyValuePair>()
+        TableUtils.createTable(connectionSource, KeyValuePair::class.java)
     }
 
     override fun onUpgrade(database: SQLiteDatabase?, connectionSource: ConnectionSource?,
                            oldVersion: Int, newVersion: Int) {
         if (oldVersion < 1) {
-            safeWrapper {
+            PrivateDatabase.kvPairDao.queryBuilder().where().`in`("key",
-                PrivateDatabase.kvPairDao.queryBuilder().where().`in`("key",
                     Key.id, Key.tfo, Key.serviceMode, Key.portProxy, Key.portLocalDns, Key.portTransproxy).query()
-            }.forEach { kvPairDao.replaceSafe(it) }
+                    .forEach { kvPairDao.createOrUpdate(it) }
         }
 
         if (oldVersion < 2) {
-            kvPairDao.replaceSafe(KeyValuePair(Acl.CUSTOM_RULES).put(Acl().fromId(Acl.CUSTOM_RULES).toString()))
+            kvPairDao.createOrUpdate(KeyValuePair(Acl.CUSTOM_RULES).put(Acl().fromId(Acl.CUSTOM_RULES).toString()))
         }
     }
 

mobile/src/main/java/com/github/shadowsocks/plugin/PluginManager.kt

@@ -87,21 +87,19 @@ object PluginManager {
 
     private var receiver: BroadcastReceiver? = null
     private var cachedPlugins: Map<String, Plugin>? = null
-    fun fetchPlugins(): Map<String, Plugin> {
+    fun fetchPlugins(): Map<String, Plugin> = synchronized(this) {
-        return synchronized(this) {
+        if (receiver == null) receiver = app.listenForPackageChanges {
-            if (receiver == null) receiver = app.listenForPackageChanges {
+            synchronized(this) {
-                synchronized(this) {
+                receiver = null
-                    receiver = null
+                cachedPlugins = null
-                    cachedPlugins = null
-                }
             }
-            if (cachedPlugins == null) {
-                val pm = app.packageManager
-                cachedPlugins = (pm.queryIntentContentProviders(Intent(PluginContract.ACTION_NATIVE_PLUGIN),
-                        PackageManager.GET_META_DATA).map { NativePlugin(it) } + NoPlugin).associate { it.id to it }
-            }
-            cachedPlugins!!
         }
+        if (cachedPlugins == null) {
+            val pm = app.packageManager
+            cachedPlugins = (pm.queryIntentContentProviders(Intent(PluginContract.ACTION_NATIVE_PLUGIN),
+                    PackageManager.GET_META_DATA).map { NativePlugin(it) } + NoPlugin).associate { it.id to it }
+        }
+        cachedPlugins!!
     }
 
     private fun buildUri(id: String) = Uri.Builder()
@@ -134,10 +132,10 @@ object PluginManager {
     private fun initNative(options: PluginOptions): String? {
         val providers = app.packageManager.queryIntentContentProviders(
                 Intent(PluginContract.ACTION_NATIVE_PLUGIN, buildUri(options.id)), 0)
-        check(providers.size == 1)
+        if (providers.isEmpty()) return null
         val uri = Uri.Builder()
                 .scheme(ContentResolver.SCHEME_CONTENT)
-                .authority(providers[0].providerInfo.authority)
+                .authority(providers.single().providerInfo.authority)
                 .build()
         val cr = app.contentResolver
         return try {

mobile/src/main/java/com/github/shadowsocks/preference/DataStore.kt

@@ -21,7 +21,7 @@
 package com.github.shadowsocks.preference
 
 import android.os.Binder
-import com.github.shadowsocks.BootReceiver
+import com.github.shadowsocks.App.Companion.app
 import com.github.shadowsocks.database.PrivateDatabase
 import com.github.shadowsocks.database.PublicDatabase
 import com.github.shadowsocks.utils.DirectBoot
@@ -49,10 +49,8 @@ object DataStore {
             publicStore.putInt(Key.id, value)
             if (DataStore.directBootAware) DirectBoot.update()
         }
-    /**
+    val canToggleLocked: Boolean get() = publicStore.getBoolean(Key.directBootAware) == true
-     * Setter is defined in MainActivity.onPreferenceDataStoreChanged.
+    val directBootAware: Boolean get() = app.directBootSupported && canToggleLocked
-     */
-    val directBootAware: Boolean get() = BootReceiver.enabled && publicStore.getBoolean(Key.directBootAware) == true
     var serviceMode: String
         get() = publicStore.getString(Key.serviceMode) ?: Key.modeVpn
         set(value) = publicStore.putString(Key.serviceMode, value)

mobile/src/main/java/com/github/shadowsocks/preference/OrmLitePreferenceDataStore.kt

@@ -22,20 +22,17 @@ package com.github.shadowsocks.preference
 
 import android.support.v7.preference.PreferenceDataStore
 import com.github.shadowsocks.database.KeyValuePair
-import com.github.shadowsocks.database.deleteByIdSafe
-import com.github.shadowsocks.database.queryByIdSafe
-import com.github.shadowsocks.database.replaceSafe
 import com.j256.ormlite.dao.Dao
 import java.util.HashSet
 
 @Suppress("MemberVisibilityCanPrivate", "unused")
 open class OrmLitePreferenceDataStore(private val kvPairDao: Dao<KeyValuePair, String?>) : PreferenceDataStore() {
-    fun getBoolean(key: String?) = kvPairDao.queryByIdSafe(key)?.boolean
+    fun getBoolean(key: String?) = kvPairDao.queryForId(key)?.boolean
-    fun getFloat(key: String?) = kvPairDao.queryByIdSafe(key)?.float
+    fun getFloat(key: String?) = kvPairDao.queryForId(key)?.float
-    fun getInt(key: String?) = kvPairDao.queryByIdSafe(key)?.int
+    fun getInt(key: String?) = kvPairDao.queryForId(key)?.int
-    fun getLong(key: String?) = kvPairDao.queryByIdSafe(key)?.long
+    fun getLong(key: String?) = kvPairDao.queryForId(key)?.long
-    fun getString(key: String?) = kvPairDao.queryByIdSafe(key)?.string
+    fun getString(key: String?) = kvPairDao.queryForId(key)?.string
-    fun getStringSet(key: String?) = kvPairDao.queryByIdSafe(key)?.stringSet
+    fun getStringSet(key: String?) = kvPairDao.queryForId(key)?.stringSet
 
     override fun getBoolean(key: String?, defValue: Boolean) = getBoolean(key) ?: defValue
     override fun getFloat(key: String?, defValue: Float) = getFloat(key) ?: defValue
@@ -49,32 +46,32 @@ open class OrmLitePreferenceDataStore(private val kvPairDao: Dao<KeyValuePair, S
     fun putInt(key: String?, value: Int?) = if (value == null) remove(key) else putInt(key, value)
     fun putLong(key: String?, value: Long?) = if (value == null) remove(key) else putLong(key, value)
     override fun putBoolean(key: String?, value: Boolean) {
-        kvPairDao.replaceSafe(KeyValuePair(key).put(value))
+        kvPairDao.createOrUpdate(KeyValuePair(key).put(value))
         fireChangeListener(key)
     }
     override fun putFloat(key: String?, value: Float) {
-        kvPairDao.replaceSafe(KeyValuePair(key).put(value))
+        kvPairDao.createOrUpdate(KeyValuePair(key).put(value))
         fireChangeListener(key)
     }
     override fun putInt(key: String?, value: Int) {
-        kvPairDao.replaceSafe(KeyValuePair(key).put(value))
+        kvPairDao.createOrUpdate(KeyValuePair(key).put(value))
         fireChangeListener(key)
     }
     override fun putLong(key: String?, value: Long) {
-        kvPairDao.replaceSafe(KeyValuePair(key).put(value))
+        kvPairDao.createOrUpdate(KeyValuePair(key).put(value))
         fireChangeListener(key)
     }
     override fun putString(key: String?, value: String?) = if (value == null) remove(key) else {
-        kvPairDao.replaceSafe(KeyValuePair(key).put(value))
+        kvPairDao.createOrUpdate(KeyValuePair(key).put(value))
         fireChangeListener(key)
     }
     override fun putStringSet(key: String?, values: MutableSet<String>?) = if (values == null) remove(key) else {
-        kvPairDao.replaceSafe(KeyValuePair(key).put(values))
+        kvPairDao.createOrUpdate(KeyValuePair(key).put(values))
         fireChangeListener(key)
     }
 
     fun remove(key: String?) {
-        kvPairDao.deleteByIdSafe(key)
+        kvPairDao.deleteById(key)
         fireChangeListener(key)
     }
 

mobile/src/main/java/com/github/shadowsocks/tasker/Settings.kt

@@ -29,8 +29,8 @@ import com.twofortyfouram.locale.api.Intent as ApiIntent
 
 class Settings(bundle: Bundle?) {
     companion object {
-        private val KEY_SWITCH_ON = "switch_on"
+        private const val KEY_SWITCH_ON = "switch_on"
-        private val KEY_PROFILE_ID = "profile_id"
+        private const val KEY_PROFILE_ID = "profile_id"
 
         fun fromIntent(intent: Intent) = Settings(intent.getBundleExtra(ApiIntent.EXTRA_BUNDLE))
     }

mobile/src/main/java/com/github/shadowsocks/utils/DirectBoot.kt

@@ -1,6 +1,10 @@
 package com.github.shadowsocks.utils
 
 import android.annotation.TargetApi
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
 import com.github.shadowsocks.App.Companion.app
 import com.github.shadowsocks.bg.BaseService
 import com.github.shadowsocks.database.Profile
@@ -12,8 +16,9 @@ import java.io.ObjectInputStream
 import java.io.ObjectOutputStream
 
 @TargetApi(24)
-object DirectBoot {
+object DirectBoot : BroadcastReceiver() {
     private val file = File(app.deviceContext.noBackupFilesDir, "directBootProfile")
+    private var registered = false
 
     fun getDeviceProfile(): Profile? = try {
         ObjectInputStream(file.inputStream()).use { it.readObject() as Profile }
@@ -24,8 +29,26 @@ object DirectBoot {
         File(app.deviceContext.noBackupFilesDir, BaseService.CONFIG_FILE).delete()
     }
 
-    fun update() {
+    /**
-        val profile = ProfileManager.getProfile(DataStore.profileId)    // app.currentProfile will call this
+     * app.currentProfile will call this.
-        if (profile == null) clean() else ObjectOutputStream(file.outputStream()).use { it.writeObject(profile) }
+     */
+    fun update(profile: Profile? = ProfileManager.getProfile(DataStore.profileId)) =
+            if (profile == null) clean() else ObjectOutputStream(file.outputStream()).use { it.writeObject(profile) }
+
+    fun flushTrafficStats() {
+        val profile = getDeviceProfile()
+        if (profile?.dirty == true) ProfileManager.updateProfile(profile)
+        update()
+    }
+
+    fun listenForUnlock() {
+        if (registered) return
+        app.registerReceiver(this, IntentFilter(Intent.ACTION_BOOT_COMPLETED))
+        registered = true
+    }
+    override fun onReceive(context: Context, intent: Intent) {
+        flushTrafficStats()
+        app.unregisterReceiver(this)
+        registered = false
     }
 }

mobile/src/main/java/com/github/shadowsocks/utils/TcpFastOpen.kt

@@ -52,5 +52,5 @@ object TcpFastOpen {
             "else",
             "  echo Failed.",
             "fi"), null, true)?.joinToString("\n")
-    fun enabledAsync(value: Boolean) = thread { enabled(value) }.join(1000)
+    fun enabledAsync(value: Boolean) = thread("TcpFastOpen") { enabled(value) }.join(1000)
 }

mobile/src/main/java/com/github/shadowsocks/utils/Utils.kt

@@ -39,8 +39,8 @@ fun broadcastReceiver(callback: (Context, Intent) -> Unit): BroadcastReceiver =
 /**
  * Wrapper for kotlin.concurrent.thread that tracks uncaught exceptions.
  */
-fun thread(start: Boolean = true, isDaemon: Boolean = false, contextClassLoader: ClassLoader? = null,
+fun thread(name: String? = null, start: Boolean = true, isDaemon: Boolean = false,
-           name: String? = null, priority: Int = -1, block: () -> Unit): Thread {
+           contextClassLoader: ClassLoader? = null, priority: Int = -1, block: () -> Unit): Thread {
     val thread = kotlin.concurrent.thread(false, isDaemon, contextClassLoader, name, priority, block)
     thread.setUncaughtExceptionHandler(app::track)
     if (start) thread.start()

mobile/src/main/res/drawable-v26/ic_qu_camera_launcher.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/material_grey_100"/>
+    <foreground>
+        <!-- 44dp icon scaled to 52dp in 72dp, padding = (1-52/44*24/72)/2 -->
+        <inset
+            android:drawable="@drawable/ic_image_camera_alt"
+            android:inset="30.303%"/>
+    </foreground>
+</adaptive-icon>

mobile/src/main/res/drawable-v26/ic_qu_shadowsocks_launcher.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/material_grey_100"/>
+    <foreground>
+        <!-- 44dp icon scaled to 52dp in 72dp, padding = (1-52/44*24/72)/2 -->
+        <inset
+            android:drawable="@drawable/ic_qu_shadowsocks_foreground"
+            android:inset="30.303%"/>
+    </foreground>
+</adaptive-icon>

mobile/src/main/res/drawable/ic_app_shortcut_background.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2017 Google Inc.
+
+  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+  in compliance with the License. You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software distributed under the License
+  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+  or implied. See the License for the specific language governing permissions and limitations under
+  the License.
+  -->
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@color/material_grey_100" />
+    <size android:width="44dp" android:height="44dp" />
+</shape>

mobile/src/main/res/drawable/ic_image_camera_alt.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/material_primary_600"
+        android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
+    <path
+        android:fillColor="@color/material_primary_600"
+        android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
+</vector>

mobile/src/main/res/drawable/ic_qu_camera_launcher.xml

@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="48"
-        android:viewportHeight="48">
 
-    <path
+    <item
-        android:fillColor="#f5f5f5"
+        android:drawable="@drawable/ic_app_shortcut_background"
-        android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0Z" />
+        android:left="2dp"
-    <path
+        android:top="2dp"
-        android:fillColor="#546e7a"
+        android:right="2dp"
-        android:pathData="M24,21.8 C25.7673,21.8,27.2,23.2327,27.2,25 C27.2,26.7673,25.7673,28.2,24,28.2
+        android:bottom="2dp" />
-C22.2327,28.2,20.8,26.7673,20.8,25 C20.8,23.2327,22.2327,21.8,24,21.8 Z" />
+
-    <path
+    <item
-        android:fillColor="#546e7a"
+        android:drawable="@drawable/ic_image_camera_alt"
-        android:pathData="M21,15 L19.17,17 L16,17 A2,2,0,0,0,14,19 L14,31 A2,2,0,0,0,16,33 L32,33
+        android:left="12dp"
-A2,2,0,0,0,34,31 L34,19 A2,2,0,0,0,32,17 L28.83,17 L27,15 Z M24,30
+        android:top="12dp"
-A5,5,0,1,1,29,25 A5,5,0,0,1,24,30 Z" />
+        android:right="12dp"
-</vector>
+        android:bottom="12dp" />
+
+</layer-list>

mobile/src/main/res/drawable/ic_qu_shadowsocks_foreground.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+
+    <path
+        android:name="path"
+        android:fillColor="@color/material_blue_grey_600"
+        android:pathData="M 21.25 2.28 L 17.55 18.55 L 9.26 15.89 L 16.58 7.16 L 6.83 15.37 L 0 12.8 L 21.25 2.28 ZM 9.45 17.56 L 12.09 18.41 L 9.46 22 L 9.45 17.56 Z" />
+</vector>

mobile/src/main/res/drawable/ic_qu_shadowsocks_launcher.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="48"
-    android:viewportHeight="48">
 
-    <path
+    <item
-        android:fillColor="#f5f5f5"
+        android:drawable="@drawable/ic_app_shortcut_background"
-        android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0Z" />
+        android:left="2dp"
-    <path
+        android:top="2dp"
-        android:fillColor="#546e7a"
+        android:right="2dp"
-        android:pathData="M34,14.72 L30.52,30.04 L22.72,27.53 L29.61,19.31 L20.43,27.04 L14,24.62
+        android:bottom="2dp" />
-L34,14.72 Z" />
+
-    <path
+    <item
-        android:fillColor="#546e7a"
+        android:drawable="@drawable/ic_qu_shadowsocks_foreground"
-        android:pathData="M22.89,29.1 L25.38,29.9 L22.9,33.28 L22.89,29.1 Z" />
+        android:left="12dp"
-</vector>
+        android:top="12dp"
+        android:right="12dp"
+        android:bottom="12dp" />
+
+</layer-list>

mobile/src/main/res/values/strings.xml

@@ -57,9 +57,8 @@
   <string name="auto_connect_summary">Enable Shadowsocks on startup</string>
   <string name="auto_connect_summary_v24">Enable Shadowsocks on startup. Recommended to use always-on VPN
     instead</string>
-  <string name="direct_boot_aware">Direct Boot Aware</string>
+  <string name="direct_boot_aware">Allow Toggling in Lock Screen</string>
-  <string name="direct_boot_aware_summary">Allow Shadowsocks to start before your device is unlocked (your selected
+  <string name="direct_boot_aware_summary">Your selected profile information will be less protected</string>
-    profile information will be less protected)</string>
   <string name="tcp_fastopen_summary">Toggling requires ROOT permission</string>
   <string name="tcp_fastopen_summary_unsupported">Unsupported kernel version: %s &lt; 3.7.1</string>
   <string name="udp_dns">DNS Forwarding</string>

mobile/src/main/res/xml/pref_global.xml

@@ -7,7 +7,6 @@
                       android:title="@string/auto_connect"/>
     <!-- Direct Boot Aware alone doesn't do anything without auto connect -->
     <SwitchPreference android:key="directBootAware"
-                      android:dependency="isAutoConnect"
                       android:summary="@string/direct_boot_aware_summary"
                       android:title="@string/direct_boot_aware"/>
     <SwitchPreference android:key="tcp_fastopen"

plugin/src/main/res/values/colors.xml

@@ -7,10 +7,12 @@
   <color name="material_blue_grey_100">#CFD8DC</color>
   <color name="material_blue_grey_300">#90A4AE</color>
   <color name="material_blue_grey_500">#607D8B</color>
+  <color name="material_blue_grey_600">#546E7A</color>
   <color name="material_blue_grey_700">#455A64</color>
   <color name="material_primary_100">@color/material_blue_grey_100</color>
   <color name="material_primary_300">@color/material_blue_grey_300</color>
   <color name="material_primary_500">@color/material_blue_grey_500</color>
+  <color name="material_primary_600">@color/material_blue_grey_600</color>
   <color name="material_primary_700">@color/material_blue_grey_700</color>
   <color name="material_accent_200">@color/material_green_a700</color>