Commit a98ab6df authored by Mygod's avatar Mygod

Update core and remove workaround

parent a9e8116a
...@@ -69,7 +69,7 @@ dependencies { ...@@ -69,7 +69,7 @@ dependencies {
val workVersion = "2.5.0" val workVersion = "2.5.0"
api(project(":plugin")) api(project(":plugin"))
api("androidx.core:core-ktx:1.5.0-rc02") api("androidx.core:core-ktx:1.6.0-alpha03")
api("androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion") api("androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion")
api("androidx.lifecycle:lifecycle-livedata-core-ktx:$lifecycleVersion") api("androidx.lifecycle:lifecycle-livedata-core-ktx:$lifecycleVersion")
......
...@@ -66,8 +66,7 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro ...@@ -66,8 +66,7 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro
* Sensitive shadowsocks configuration file requires extra protection. It may be stored in encrypted storage or * Sensitive shadowsocks configuration file requires extra protection. It may be stored in encrypted storage or
* device storage, depending on which is currently available. * device storage, depending on which is currently available.
*/ */
fun start(service: BaseService.Interface, stat: File, configFile: File, mode: String, fun start(service: BaseService.Interface, stat: File, configFile: File, mode: String, dnsRelay: Boolean = true) {
dnsRelay: Boolean = true) {
// setup traffic monitor path // setup traffic monitor path
trafficMonitor = TrafficMonitor(stat) trafficMonitor = TrafficMonitor(stat)
......
...@@ -32,8 +32,6 @@ object ListHolderListener : OnApplyWindowInsetsListener { ...@@ -32,8 +32,6 @@ object ListHolderListener : OnApplyWindowInsetsListener {
view.setPadding(statusBarInsets.left, statusBarInsets.top, statusBarInsets.right, statusBarInsets.bottom) view.setPadding(statusBarInsets.left, statusBarInsets.top, statusBarInsets.right, statusBarInsets.bottom)
return WindowInsetsCompat.Builder(insets).apply { return WindowInsetsCompat.Builder(insets).apply {
setInsets(WindowInsetsCompat.Type.statusBars(), Insets.NONE) setInsets(WindowInsetsCompat.Type.statusBars(), Insets.NONE)
setInsets(WindowInsetsCompat.Type.navigationBars(),
insets.getInsets(WindowInsetsCompat.Type.navigationBars()))
}.build() }.build()
} }
......
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