Fix code style issues

2018-02-04 15:07:38 -08:00
parent 9fb180956f
commit a755b669c8
30 changed files with 145 additions and 178 deletions
@@ -31,7 +31,6 @@ import android.os.RemoteCallbackList
 import android.support.v4.os.UserManagerCompat
 import android.util.Base64
 import android.util.Log
-import android.widget.Toast
 import com.github.shadowsocks.App.Companion.app
 import com.github.shadowsocks.R
 import com.github.shadowsocks.acl.Acl
@@ -146,18 +145,18 @@ object BaseService {
        }

        internal fun updateTrafficTotal(tx: Long, rx: Long) {
-            val profile = profile ?: return
-            val p = ProfileManager.getProfile(profile.id) ?: return // profile may have host, etc. modified
-            p.tx += tx
-            p.rx += rx
-            ProfileManager.updateProfile(p)
+            // this.profile may have host, etc. modified and thus a re-fetch is necessary (possible race condition)
+            val profile = ProfileManager.getProfile((profile ?: return).id) ?: return
+            profile.tx += tx
+            profile.rx += rx
+            ProfileManager.updateProfile(profile)
            app.handler.post {
                if (bandwidthListeners.isNotEmpty()) {
                    val n = callbacks.beginBroadcast()
                    for (i in 0 until n) {
                        try {
                            val item = callbacks.getBroadcastItem(i)
-                            if (bandwidthListeners.contains(item.asBinder())) item.trafficPersisted(p.id)
+                            if (bandwidthListeners.contains(item.asBinder())) item.trafficPersisted(profile.id)
                        } catch (_: Exception) { }  // ignore
                    }
                    callbacks.finishBroadcast()
@@ -182,9 +181,9 @@ object BaseService {
                        .put("plugin_opts", plugin.toString())
            }
            // sensitive Shadowsocks config is stored in
-            val file = File((if (UserManagerCompat.isUserUnlocked(app)) app.filesDir else @TargetApi(24) {
+            val file = File(if (UserManagerCompat.isUserUnlocked(app)) app.filesDir else @TargetApi(24) {
                app.deviceContext.noBackupFilesDir  // only API 24+ will be in locked state
-            }), CONFIG_FILE)
+            }, CONFIG_FILE)
            shadowsocksConfigFile = file
            file.writeText(config.toString())
            return file
@@ -218,9 +217,9 @@ object BaseService {
                    false
                } else true
        fun forceLoad() {
-            val p = app.currentProfile
+            val profile = app.currentProfile
                    ?: return stopRunner(true, (this as Context).getString(R.string.profile_empty))
-            if (!checkProfile(p)) return
+            if (!checkProfile(profile)) return
            val s = data.state
            when (s) {
                STOPPED -> startRunner()
@@ -24,22 +24,19 @@ import android.util.Log
 import com.github.shadowsocks.App.Companion.app
 import com.github.shadowsocks.BuildConfig
 import org.xbill.DNS.*
-import java.net.Inet6Address
-import java.net.InetAddress
-import java.net.NetworkInterface
-import java.net.UnknownHostException
-import okhttp3.Dns as Okdns
+import java.io.IOException
+import java.net.*

 object Dns {
    private const val TAG = "Dns"

    private val hasIPv6Support get() = try {
        val result = NetworkInterface.getNetworkInterfaces().asSequence().flatMap { it.inetAddresses.asSequence() }
-                .count { it is Inet6Address && !it.isLoopbackAddress && !it.isLinkLocalAddress } > 0
+                .any { it is Inet6Address && !it.isLoopbackAddress && !it.isLinkLocalAddress }
        if (result && BuildConfig.DEBUG) Log.d(TAG, "IPv6 address detected")
        result
-    } catch (ex: Exception) {
-        Log.e(TAG, "Failed to get interfaces' addresses.")
+    } catch (ex: SocketException) {
+        Log.e(TAG, "Failed to get interfaces' addresses.", ex)
        app.track(ex)
        false
    }
@@ -60,7 +57,7 @@ object Dns {
                    Type.AAAA -> return (r as AAAARecord).address.hostAddress
                }
            }
-        } catch (_: Exception) { }
+        } catch (_: IOException) { }
        return null
    }
    private fun resolve(host: String): String? = try {
@@ -20,7 +20,6 @@

 package com.github.shadowsocks.bg

-import android.content.Context
 import com.github.shadowsocks.App.Companion.app
 import com.github.shadowsocks.acl.Acl
 import com.github.shadowsocks.preference.DataStore
@@ -50,10 +49,10 @@ object LocalDnsService {
            fun makeDns(name: String, address: String, timeout: Int, edns: Boolean = true): JSONObject {
                val dns = JSONObject()
                .put("Name", name)
-                .put("Address", (when (address.parseNumericAddress()) {
+                .put("Address", when (address.parseNumericAddress()) {
                    is Inet6Address -> "[$address]"
                    else -> address
-                }))
+                })
                .put("Timeout", timeout)
                .put("EDNSClientSubnet", JSONObject().put("Policy", "disable"))
                if (edns) dns
@@ -23,7 +23,6 @@ package com.github.shadowsocks.bg
 import android.app.Service
 import android.content.Intent
 import android.os.IBinder
-import com.github.shadowsocks.database.Profile

 /**
 * Shadowsocks service at its minimum.
@@ -44,7 +44,7 @@ object TrafficMonitor {
    private val units = arrayOf("KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB", "BB", "NB", "DB", "CB")
    private val numberFormat = DecimalFormat("@@@")
    fun formatTraffic(size: Long): String {
-        var n: Double = size.toDouble()
+        var n = size.toDouble()
        var i = -1
        while (n >= 999.5) {
            n /= 1024
@@ -38,7 +38,7 @@ class TrafficMonitorThread : LocalSocketListener("TrafficMonitorThread") {
            val stat = ByteBuffer.wrap(buffer).order(ByteOrder.LITTLE_ENDIAN)
            TrafficMonitor.update(stat.getLong(0), stat.getLong(8))
            socket.outputStream.write(0)
-        } catch (e: Exception) {
+        } catch (e: IOException) {
            Log.e(tag, "Error when recv traffic stat", e)
            app.track(e)
        }
@@ -38,6 +38,7 @@ import com.github.shadowsocks.utils.Subnet
 import com.github.shadowsocks.utils.parseNumericAddress
 import java.io.File
 import java.io.FileDescriptor
+import java.io.IOException
 import java.lang.reflect.Method
 import java.util.*
 import android.net.VpnService as BaseVpnService
@@ -55,18 +56,24 @@ class VpnService : BaseVpnService(), LocalDnsService.Interface {
        override val socketFile: File = File(app.deviceContext.filesDir, "protect_path")

        override fun accept(socket: LocalSocket) {
+            var success = false
            try {
                socket.inputStream.read()
                val fds = socket.ancillaryFileDescriptors
                if (fds.isEmpty()) return
                val fd = getInt.invoke(fds.first()) as Int
-                val ret = protect(fd)
+                success = protect(fd)
                JniHelper.close(fd) // Trick to close file decriptor
-                socket.outputStream.write(if (ret) 0 else 1)
            } catch (e: Exception) {
                Log.e(tag, "Error when protect socket", e)
                app.track(e)
            }
+            try {
+                socket.outputStream.write(if (success) 0 else 1)
+            } catch (e: IOException) {
+                Log.e(tag, "Error when returning result in protect", e)
+                app.track(e)
+            }
        }
    }
    class NullConnectionException : NullPointerException()
@@ -118,7 +125,7 @@ class VpnService : BaseVpnService(), LocalDnsService.Interface {
        super.startNativeProcesses()

        val fd = startVpn()
-        if (!sendFd(fd)) throw Exception("sendFd failed")
+        if (!sendFd(fd)) throw IOException("sendFd failed")
    }

    override fun buildAdditionalArguments(cmd: ArrayList<String>): ArrayList<String> {