Bump version

Manage all processes with GuardedProcessPool

build.gradle

@@ -8,8 +8,8 @@ buildscript {
         minSdkVersion = 21
         sdkVersion = 27
         buildToolsVersion = '27.0.3'
-        supportLibraryVersion = '27.1.0'
-        takisoftFixVersion = '27.1.0.0'
+        supportLibraryVersion = '27.1.1'
+        takisoftFixVersion = '27.1.1.0'
         playServicesVersion = '12.0.1'
         junitVersion = '4.12'
         androidTestVersion = '1.0.1'
@@ -22,7 +22,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.android.tools.build:gradle:3.1.1'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
         classpath 'com.google.gms:google-services:3.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"

mobile/build.gradle

@@ -21,8 +21,8 @@ android {
         applicationId "com.github.shadowsocks"
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.sdkVersion
-        versionCode 4050500
-        versionName "4.5.5"
+        versionCode 4050600
+        versionName "4.5.6"
         testApplicationId "com.github.shadowsocks.test"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         resConfigs "fa", "fr", "ja", "ko", "ru", "zh-rCN", "zh-rTW"
@@ -64,7 +64,7 @@ dependencies {
     implementation "com.google.android.gms:play-services-vision:$playServicesVersion"
     implementation "com.google.firebase:firebase-config:$playServicesVersion"
     implementation 'com.j256.ormlite:ormlite-android:5.1'
-    implementation 'com.mikepenz:materialdrawer:6.0.6'
+    implementation 'com.mikepenz:materialdrawer:6.0.7'
     implementation 'com.squareup.okhttp3:okhttp:3.10.0'
     implementation "com.takisoft.fix:preference-v7-simplemenu:$takisoftFixVersion"
     implementation 'com.twofortyfouram:android-plugin-api-for-locale:1.0.2'

mobile/src/main/AndroidManifest.xml

@@ -72,7 +72,7 @@
 
         <activity
             android:name=".VpnRequestActivity"
-            android:theme="@style/Theme.Translucent"
+            android:theme="@style/Theme.AppCompat.Translucent"
             android:excludeFromRecents="true"
             android:taskAffinity=""
             android:launchMode="singleTask"/>

mobile/src/main/assets/acl/bypass-china.acl

@@ -5634,9 +5634,7 @@
 (^|\.)blogs\.libraryinformationtechnology\.com$
 (^|\.)blogs\.tampabay\.com$
 (^|\.)blogs\.yahoo\.co\.jp$
-(^|\.)blogspot\.com$
-(^|\.)blogspot\.hk$
-(^|\.)blogspot\.jp$
+(^|\.)blogspot(\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?){1,2}$
 (^|\.)blogtd\.net$
 (^|\.)blogtd\.org$
 (^|\.)bloodshed\.net$
@@ -6875,61 +6873,8 @@
 (^|\.)goodtv\.com\.tw$
 (^|\.)goodtv\.tv$
 (^|\.)goofind\.com$
-(^|\.)google\.ae$
-(^|\.)google\.am$
-(^|\.)google\.as$
-(^|\.)google\.at$
-(^|\.)google\.az$
-(^|\.)google\.ba$
-(^|\.)google\.be$
-(^|\.)google\.bg$
-(^|\.)google\.ca$
-(^|\.)google\.calstate\.edu$
-(^|\.)google\.cd$
-(^|\.)google\.ci$
-(^|\.)google\.co\.id$
-(^|\.)google\.co\.jp$
-(^|\.)google\.co\.kr$
-(^|\.)google\.co\.ma$
-(^|\.)google\.co\.uk$
-(^|\.)google\.com$
-(^|\.)google\.de$
-(^|\.)google\.dj$
-(^|\.)google\.dk$
-(^|\.)google\.es$
-(^|\.)google\.fi$
-(^|\.)google\.fm$
-(^|\.)google\.fr$
-(^|\.)google\.gg$
-(^|\.)google\.gl$
-(^|\.)google\.gr$
-(^|\.)google\.ie$
-(^|\.)google\.is$
-(^|\.)google\.it$
-(^|\.)google\.jo$
-(^|\.)google\.kz$
-(^|\.)google\.lv$
-(^|\.)google\.mn$
-(^|\.)google\.ms$
-(^|\.)google\.nl$
-(^|\.)google\.no$
-(^|\.)google\.nu$
-(^|\.)google\.ro$
-(^|\.)google\.ru$
-(^|\.)google\.rw$
-(^|\.)google\.sc$
-(^|\.)google\.sh$
-(^|\.)google\.sk$
-(^|\.)google\.sm$
-(^|\.)google\.sn$
-(^|\.)google\.tk$
-(^|\.)google\.tm$
-(^|\.)google\.to$
-(^|\.)google\.tt$
-(^|\.)google\.vu$
-(^|\.)google\.ws$
-(^|\.)googleapis\.cn$
-(^|\.)googleapis\.com$
+(^|\.)google(\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?){1,2}$
+(^|\.)googleapis(\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?){1,2}$
 (^|\.)googleapps\.com$
 (^|\.)googlearth\.com$
 (^|\.)googleartproject\.com$

mobile/src/main/assets/acl/bypass-lan-china.acl

@@ -5648,9 +5648,7 @@
 (^|\.)blogs\.libraryinformationtechnology\.com$
 (^|\.)blogs\.tampabay\.com$
 (^|\.)blogs\.yahoo\.co\.jp$
-(^|\.)blogspot\.com$
-(^|\.)blogspot\.hk$
-(^|\.)blogspot\.jp$
+(^|\.)blogspot(\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?){1,2}$
 (^|\.)blogtd\.net$
 (^|\.)blogtd\.org$
 (^|\.)bloodshed\.net$
@@ -6889,61 +6887,8 @@
 (^|\.)goodtv\.com\.tw$
 (^|\.)goodtv\.tv$
 (^|\.)goofind\.com$
-(^|\.)google\.ae$
-(^|\.)google\.am$
-(^|\.)google\.as$
-(^|\.)google\.at$
-(^|\.)google\.az$
-(^|\.)google\.ba$
-(^|\.)google\.be$
-(^|\.)google\.bg$
-(^|\.)google\.ca$
-(^|\.)google\.calstate\.edu$
-(^|\.)google\.cd$
-(^|\.)google\.ci$
-(^|\.)google\.co\.id$
-(^|\.)google\.co\.jp$
-(^|\.)google\.co\.kr$
-(^|\.)google\.co\.ma$
-(^|\.)google\.co\.uk$
-(^|\.)google\.com$
-(^|\.)google\.de$
-(^|\.)google\.dj$
-(^|\.)google\.dk$
-(^|\.)google\.es$
-(^|\.)google\.fi$
-(^|\.)google\.fm$
-(^|\.)google\.fr$
-(^|\.)google\.gg$
-(^|\.)google\.gl$
-(^|\.)google\.gr$
-(^|\.)google\.ie$
-(^|\.)google\.is$
-(^|\.)google\.it$
-(^|\.)google\.jo$
-(^|\.)google\.kz$
-(^|\.)google\.lv$
-(^|\.)google\.mn$
-(^|\.)google\.ms$
-(^|\.)google\.nl$
-(^|\.)google\.no$
-(^|\.)google\.nu$
-(^|\.)google\.ro$
-(^|\.)google\.ru$
-(^|\.)google\.rw$
-(^|\.)google\.sc$
-(^|\.)google\.sh$
-(^|\.)google\.sk$
-(^|\.)google\.sm$
-(^|\.)google\.sn$
-(^|\.)google\.tk$
-(^|\.)google\.tm$
-(^|\.)google\.to$
-(^|\.)google\.tt$
-(^|\.)google\.vu$
-(^|\.)google\.ws$
-(^|\.)googleapis\.cn$
-(^|\.)googleapis\.com$
+(^|\.)google(\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?){1,2}$
+(^|\.)googleapis(\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?){1,2}$
 (^|\.)googleapps\.com$
 (^|\.)googlearth\.com$
 (^|\.)googleartproject\.com$

mobile/src/main/assets/acl/gfwlist.acl

@@ -561,9 +561,7 @@
 (^|\.)blogs\.libraryinformationtechnology\.com$
 (^|\.)blogs\.tampabay\.com$
 (^|\.)blogs\.yahoo\.co\.jp$
-(^|\.)blogspot\.com$
-(^|\.)blogspot\.hk$
-(^|\.)blogspot\.jp$
+(^|\.)blogspot(\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?){1,2}$
 (^|\.)blogtd\.net$
 (^|\.)blogtd\.org$
 (^|\.)bloodshed\.net$
@@ -1802,61 +1800,8 @@
 (^|\.)goodtv\.com\.tw$
 (^|\.)goodtv\.tv$
 (^|\.)goofind\.com$
-(^|\.)google\.ae$
-(^|\.)google\.am$
-(^|\.)google\.as$
-(^|\.)google\.at$
-(^|\.)google\.az$
-(^|\.)google\.ba$
-(^|\.)google\.be$
-(^|\.)google\.bg$
-(^|\.)google\.ca$
-(^|\.)google\.calstate\.edu$
-(^|\.)google\.cd$
-(^|\.)google\.ci$
-(^|\.)google\.co\.id$
-(^|\.)google\.co\.jp$
-(^|\.)google\.co\.kr$
-(^|\.)google\.co\.ma$
-(^|\.)google\.co\.uk$
-(^|\.)google\.com$
-(^|\.)google\.de$
-(^|\.)google\.dj$
-(^|\.)google\.dk$
-(^|\.)google\.es$
-(^|\.)google\.fi$
-(^|\.)google\.fm$
-(^|\.)google\.fr$
-(^|\.)google\.gg$
-(^|\.)google\.gl$
-(^|\.)google\.gr$
-(^|\.)google\.ie$
-(^|\.)google\.is$
-(^|\.)google\.it$
-(^|\.)google\.jo$
-(^|\.)google\.kz$
-(^|\.)google\.lv$
-(^|\.)google\.mn$
-(^|\.)google\.ms$
-(^|\.)google\.nl$
-(^|\.)google\.no$
-(^|\.)google\.nu$
-(^|\.)google\.ro$
-(^|\.)google\.ru$
-(^|\.)google\.rw$
-(^|\.)google\.sc$
-(^|\.)google\.sh$
-(^|\.)google\.sk$
-(^|\.)google\.sm$
-(^|\.)google\.sn$
-(^|\.)google\.tk$
-(^|\.)google\.tm$
-(^|\.)google\.to$
-(^|\.)google\.tt$
-(^|\.)google\.vu$
-(^|\.)google\.ws$
-(^|\.)googleapis\.cn$
-(^|\.)googleapis\.com$
+(^|\.)google(\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?){1,2}$
+(^|\.)googleapis(\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?){1,2}$
 (^|\.)googleapps\.com$
 (^|\.)googlearth\.com$
 (^|\.)googleartproject\.com$

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

@@ -123,7 +123,10 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
         private var adView: AdView? = null
 
         init {
-            edit.setOnClickListener { startConfig(item) }
+            edit.setOnClickListener {
+                item = ProfileManager.getProfile(item.id)!!
+                startConfig(item)
+            }
             TooltipCompat.setTooltipText(edit, edit.contentDescription)
             itemView.setOnClickListener(this)
             val share = itemView.findViewById<View>(R.id.share)

mobile/src/main/java/com/github/shadowsocks/acl/AclSyncJob.kt

@@ -38,13 +38,13 @@ class AclSyncJob(private val route: String) : Job() {
             return when (parts[0]) {
                 TAG -> AclSyncJob(parts[1])
                 else -> {
-                    Log.w(TAG, "Unknown job tag: " + tag)
+                    Log.w(TAG, "Unknown job tag: $tag")
                     null
                 }
             }
         }
 
-        fun schedule(route: String): Int = JobRequest.Builder(TAG + ':' + route)
+        fun schedule(route: String): Int = JobRequest.Builder("$TAG:$route")
                 .setExecutionWindow(TimeUnit.SECONDS.toMillis(10), TimeUnit.DAYS.toMillis(28))
                 .setRequirementsEnforced(true)
                 .setRequiredNetworkType(JobRequest.NetworkType.UNMETERED)

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

@@ -76,7 +76,7 @@ object BaseService {
         @Volatile var state = STOPPED
         @Volatile var plugin = PluginOptions()
         @Volatile var pluginPath: String? = null
-        var sslocalProcess: GuardedProcess? = null
+        val processes = GuardedProcessPool()
 
         var timer: Timer? = null
         var trafficMonitorThread: TrafficMonitorThread? = null
@@ -274,7 +274,7 @@ object BaseService {
 
             if (TcpFastOpen.sendEnabled) cmd += "--fast-open"
 
-            data.sslocalProcess = GuardedProcess(cmd).start()
+            data.processes.start(cmd)
         }
 
         fun createNotification(profileName: String): ServiceNotification
@@ -285,11 +285,7 @@ object BaseService {
             else startService(Intent(this, javaClass))
         }
 
-        fun killProcesses() {
-            val data = data
-            data.sslocalProcess?.destroy()
-            data.sslocalProcess = null
-        }
+        fun killProcesses() = data.processes.killAll()
 
         fun stopRunner(stopService: Boolean, msg: String? = null) {
             // channge the state

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

@@ -31,31 +31,34 @@ import com.github.shadowsocks.utils.thread
 import java.io.File
 import java.io.IOException
 import java.io.InputStream
-import java.util.concurrent.Semaphore
+import java.util.*
+import java.util.concurrent.ArrayBlockingQueue
 
-class GuardedProcess(private val cmd: List<String>) {
+class GuardedProcessPool {
     companion object {
-        private const val TAG = "GuardedProcess"
+        private const val TAG = "GuardedProcessPool"
+        private val dummy = IOException()
     }
 
-    private lateinit var guardThread: Thread
-    @Volatile
-    private var isDestroyed = false
-    @Volatile
-    private lateinit var process: Process
-    private val name = File(cmd.first()).nameWithoutExtension
+    private inner class Guard(private val cmd: List<String>, private val onRestartCallback: (() -> Unit)?) {
+        val cmdName = File(cmd.first()).nameWithoutExtension
+        val excQueue = ArrayBlockingQueue<IOException>(1)   // ArrayBlockingQueue doesn't want null
+        private var pushed = false
 
-    private fun streamLogger(input: InputStream, logger: (String, String) -> Int) = thread("StreamLogger-$name") {
-        try {
-            input.bufferedReader().useLines { it.forEach { logger(TAG, it) } }
-        } catch (_: IOException) { }    // ignore
-    }
+        private fun streamLogger(input: InputStream, logger: (String, String) -> Int) =
+                thread("StreamLogger-$cmdName") {
+                    try {
+                        input.bufferedReader().useLines { it.forEach { logger(TAG, it) } }
+                    } catch (_: IOException) { }    // ignore
+                }
+        private fun pushException(ioException: IOException?) {
+            if (pushed) return
+            excQueue.put(ioException ?: dummy)
+            pushed = true
+        }
 
-    fun start(onRestartCallback: (() -> Unit)? = null): GuardedProcess {
-        val semaphore = Semaphore(1)
-        semaphore.acquire()
-        var ioException: IOException? = null
-        guardThread = thread("GuardThread-$name") {
+        fun looper() {
+            var process: Process? = null
             try {
                 var callback: (() -> Unit)? = null
                 while (!isDestroyed) {
@@ -72,44 +75,54 @@ class GuardedProcess(private val cmd: List<String>) {
 
                     if (callback == null) callback = onRestartCallback else callback()
 
-                    semaphore.release()
+                    pushException(null)
                     process.waitFor()
 
                     synchronized(this) {
                         if (SystemClock.elapsedRealtime() - startTime < 1000) {
-                            Log.w(TAG, "process exit too fast, stop guard: " + Commandline.toString(cmd))
+                            Log.w(TAG, "process exit too fast, stop guard: $cmdName")
                             isDestroyed = true
                         }
                     }
                 }
             } catch (_: InterruptedException) {
-                if (BuildConfig.DEBUG) Log.d(TAG, "thread interrupt, destroy process: " + Commandline.toString(cmd))
-                destroyProcess()
+                if (BuildConfig.DEBUG) Log.d(TAG, "thread interrupt, destroy process: $cmdName")
             } catch (e: IOException) {
-                ioException = e
+                pushException(e)
             } finally {
-                semaphore.release()
+                if (process != null) {
+                    if (Build.VERSION.SDK_INT < 24) @Suppress("DEPRECATION") {
+                        JniHelper.sigtermCompat(process)
+                        JniHelper.waitForCompat(process, 500)
+                    }
+                    process.destroy()
+                    process.waitFor()   // ensure the process is destroyed
+                }
+                pushException(null)
             }
         }
-        semaphore.acquire()
-        if (ioException != null) throw ioException!!
+    }
+
+    private val guardThreads = HashSet<Thread>()
+    @Volatile
+    private var isDestroyed = false
+
+    fun start(cmd: List<String>, onRestartCallback: (() -> Unit)? = null): GuardedProcessPool {
+        val guard = Guard(cmd, onRestartCallback)
+        guardThreads.add(thread("GuardThread-${guard.cmdName}", block = guard::looper))
+        val ioException = guard.excQueue.take()
+        if (ioException !== dummy) throw ioException
         return this
     }
 
-    fun destroy() {
+    fun killAll() {
         isDestroyed = true
-        guardThread.interrupt()
-        destroyProcess()
+        guardThreads.forEach { it.interrupt() }
         try {
-            guardThread.join()
+            guardThreads.forEach { it.join() }
         } catch (_: InterruptedException) { }
-    }
 
-    private fun destroyProcess() {
-        if (Build.VERSION.SDK_INT < 24) @Suppress("DEPRECATION") {
-            JniHelper.sigtermCompat(process)
-            JniHelper.waitForCompat(process, 500)
-        }
-        process.destroy()
+        guardThreads.clear()
+        isDestroyed = false
     }
 }

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

@@ -28,19 +28,9 @@ import org.json.JSONArray
 import org.json.JSONObject
 import java.io.File
 import java.net.Inet6Address
-import java.util.*
 
-/**
- * This object also uses WeakMap to simulate the effects of multi-inheritance, but more lightweight.
- */
 object LocalDnsService {
     interface Interface : BaseService.Interface {
-        var overtureProcess: GuardedProcess?
-            get() = overtureProcesses[this]
-            set(value) {
-                if (value == null) overtureProcesses.remove(this) else overtureProcesses[this] = value
-            }
-
         override fun startNativeProcesses() {
             super.startNativeProcesses()
             val data = data
@@ -96,18 +86,10 @@ object LocalDnsService {
                 return file
             }
 
-            if (!profile.udpdns) overtureProcess = GuardedProcess(buildAdditionalArguments(arrayListOf(
+            if (!profile.udpdns) data.processes.start(buildAdditionalArguments(arrayListOf(
                     File(app.applicationInfo.nativeLibraryDir, Executable.OVERTURE).absolutePath,
                     "-c", buildOvertureConfig("overture.conf")
-            ))).start()
-        }
-
-        override fun killProcesses() {
-            super.killProcesses()
-            overtureProcess?.destroy()
-            overtureProcess = null
+            )))
         }
     }
-
-    private val overtureProcesses = WeakHashMap<Interface, GuardedProcess>()
 }

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

@@ -40,18 +40,14 @@ class TransproxyService : Service(), LocalDnsService.Interface {
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int =
             super<LocalDnsService.Interface>.onStartCommand(intent, flags, startId)
 
-    private var sstunnelProcess: GuardedProcess? = null
-    private var redsocksProcess: GuardedProcess? = null
-
     private fun startDNSTunnel() {
-        val cmd = arrayListOf(File(applicationInfo.nativeLibraryDir, Executable.SS_TUNNEL).absolutePath,
+        data.processes.start(listOf(File(applicationInfo.nativeLibraryDir, Executable.SS_TUNNEL).absolutePath,
                 "-t", "10",
                 "-b", "127.0.0.1",
                 "-u",
                 "-l", DataStore.portLocalDns.toString(),            // ss-tunnel listens on the same port as overture
                 "-L", data.profile!!.remoteDns.split(",").first().trim() + ":53",
-                "-c", data.shadowsocksConfigFile!!.absolutePath)    // config is already built by BaseService.Interface
-        sstunnelProcess = GuardedProcess(cmd).start()
+                "-c", data.shadowsocksConfigFile!!.absolutePath))   // config is already built by BaseService.Interface
     }
 
     private fun startRedsocksDaemon() {
@@ -70,10 +66,8 @@ redsocks {
  type = socks5;
 }
 """)
-        redsocksProcess = GuardedProcess(arrayListOf(
-                File(applicationInfo.nativeLibraryDir, Executable.REDSOCKS).absolutePath,
-                "-c", "redsocks.conf")
-        ).start()
+        data.processes.start(listOf(
+                File(applicationInfo.nativeLibraryDir, Executable.REDSOCKS).absolutePath, "-c", "redsocks.conf"))
     }
 
     override fun startNativeProcesses() {
@@ -81,12 +75,4 @@ redsocks {
         super.startNativeProcesses()
         if (data.profile!!.udpdns) startDNSTunnel()
     }
-
-    override fun killProcesses() {
-        super.killProcesses()
-        sstunnelProcess?.destroy()
-        sstunnelProcess = null
-        redsocksProcess?.destroy()
-        redsocksProcess = null
-    }
 }

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

@@ -116,7 +116,6 @@ class VpnService : BaseVpnService(), LocalDnsService.Interface {
 
     private var conn: ParcelFileDescriptor? = null
     private var worker: ProtectWorker? = null
-    private var tun2socksProcess: GuardedProcess? = null
     private var underlyingNetwork: Network? = null
         @TargetApi(28)
         set(value) {
@@ -155,8 +154,6 @@ class VpnService : BaseVpnService(), LocalDnsService.Interface {
         worker?.stopThread()
         worker = null
         super.killProcesses()
-        tun2socksProcess?.destroy()
-        tun2socksProcess = null
         conn?.close()
         conn = null
     }
@@ -256,7 +253,7 @@ class VpnService : BaseVpnService(), LocalDnsService.Interface {
             cmd += "--dnsgw"
             cmd += "127.0.0.1:${DataStore.portLocalDns}"
         }
-        tun2socksProcess = GuardedProcess(cmd).start { sendFd(fd) }
+        data.processes.start(cmd) { sendFd(fd) }
         return fd
     }
 

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

@@ -1,15 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Theme.Translucent" parent="Theme.AppCompat.Dialog">
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowAnimationStyle">@null</item>
-        <item name="android:backgroundDimEnabled">false</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowCloseOnTouchOutside">false</item>
-    </style>
     <style name="StyledScrollerTextAppearance" parent="@android:style/TextAppearance">
         <item name="android:textSize">24sp</item>
         <item name="android:textStyle">bold</item>

plugin/CHANGES.md

@@ -1,3 +1,8 @@
+* 0.1.1:
+  * Rewritten in Kotlin;
+  * Fix assert not working;
+  * Min API 21;
+  * Update support library version to 27.1.1.
 * 0.0.4:
   * Enlarge text size of number pickers;
   * Update support library version to 26.0.0.

plugin/build.gradle

@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.sdkVersion
-        versionCode 5
-        versionName "0.1.0"
+        versionCode 6
+        versionName "0.1.1"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }

plugin/doc.md

@@ -153,7 +153,8 @@ This corresponds to `com.github.shadowsocks.plugin.NativePluginProvider` in the
         ...
         <provider android:name=".BinaryProvider"
                   android:exported="true"
-                  android:authorities="$FULLY_QUALIFIED_NAME_OF_YOUR_CONTENTPROVIDER">
+                  android:authorities="$FULLY_QUALIFIED_NAME_OF_YOUR_CONTENTPROVIDER"
+                  tools:ignore="ExportedContentProvider">
             <intent-filter>
                 <action android:name="com.github.shadowsocks.plugin.ACTION_NATIVE_PLUGIN"/>
             </intent-filter>

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

@@ -11,4 +11,15 @@
         <item name="preferenceCategory_marginBottom">8dp</item>
         <item name="windowActionModeOverlay">true</item>
     </style>
+    <style name="Theme.AppCompat.Translucent" parent="Theme.AppCompat.Dialog">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowAnimationStyle">@null</item>
+        <item name="android:backgroundDimEnabled">false</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowCloseOnTouchOutside">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
 </resources>