Commit b71f3f15 authored by Mygod's avatar Mygod

Refine code style

parent 8356b483
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
<application <application
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:allowBackup="true" android:allowBackup="true"
android:autoRevokePermissions="allowed"
android:backupAgent="com.github.shadowsocks.ConfigBackupHelper" android:backupAgent="com.github.shadowsocks.ConfigBackupHelper"
android:extractNativeLibs="true" android:extractNativeLibs="true"
android:fullBackupContent="@xml/backup_descriptor" android:fullBackupContent="@xml/backup_descriptor"
......
...@@ -88,6 +88,7 @@ sealed class DnsResolverCompat { ...@@ -88,6 +88,7 @@ sealed class DnsResolverCompat {
"bindSocketToNetwork", Int::class.java, Int::class.java) "bindSocketToNetwork", Int::class.java, Int::class.java)
} }
private val netId by lazy { Network::class.java.getDeclaredField("netId") } private val netId by lazy { Network::class.java.getDeclaredField("netId") }
@SuppressLint("NewApi")
override fun bindSocket(network: Network, socket: FileDescriptor) { override fun bindSocket(network: Network, socket: FileDescriptor) {
val netId = netId.get(network)!! val netId = netId.get(network)!!
val err = bindSocketToNetwork.invoke(null, socket.int, netId) as Int val err = bindSocketToNetwork.invoke(null, socket.int, netId) as Int
......
...@@ -24,9 +24,7 @@ import android.os.Build ...@@ -24,9 +24,7 @@ import android.os.Build
import android.os.SystemClock import android.os.SystemClock
import androidx.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import com.github.shadowsocks.Core
import com.github.shadowsocks.Core.app import com.github.shadowsocks.Core.app
import com.github.shadowsocks.acl.Acl
import com.github.shadowsocks.core.R import com.github.shadowsocks.core.R
import com.github.shadowsocks.preference.DataStore import com.github.shadowsocks.preference.DataStore
import com.github.shadowsocks.utils.Key import com.github.shadowsocks.utils.Key
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
package com.github.shadowsocks.net package com.github.shadowsocks.net
import android.annotation.SuppressLint
import android.net.LocalServerSocket import android.net.LocalServerSocket
import android.net.LocalSocket import android.net.LocalSocket
import android.net.LocalSocketAddress import android.net.LocalSocketAddress
...@@ -63,6 +64,7 @@ abstract class LocalSocketListener(name: String, socketFile: File) : Thread(name ...@@ -63,6 +64,7 @@ abstract class LocalSocketListener(name: String, socketFile: File) : Thread(name
closeChannel.sendBlocking(Unit) closeChannel.sendBlocking(Unit)
} }
@SuppressLint("NewApi")
open fun shutdown(scope: CoroutineScope) { open fun shutdown(scope: CoroutineScope) {
running = false running = false
localSocket.fileDescriptor?.apply { localSocket.fileDescriptor?.apply {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment