Commit 1a890b12 authored by Mygod's avatar Mygod
parent c6676b50
......@@ -24,7 +24,6 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import com.github.shadowsocks.utils.childFragManager
class GlobalSettingsFragment : ToolbarFragment() {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? =
......@@ -34,13 +33,9 @@ class GlobalSettingsFragment : ToolbarFragment() {
super.onViewCreated(view, savedInstanceState)
toolbar.setTitle(R.string.settings)
if (savedInstanceState != null) return
val fm = childFragmentManager
fm.beginTransaction().replace(R.id.content, GlobalSettingsPreferenceFragment()).commit()
fm.executePendingTransactions()
}
override fun onDetach() {
super.onDetach()
childFragManager = null
}
}
......@@ -50,11 +50,11 @@ import okhttp3.Request
import org.json.JSONObject
import java.io.File
import java.io.IOException
import java.net.*
import java.net.InetAddress
import java.net.UnknownHostException
import java.security.MessageDigest
import java.util.*
import java.util.concurrent.TimeUnit
import kotlin.reflect.KClass
/**
* This object uses WeakMap to simulate the effects of multi-inheritance.
......@@ -427,7 +427,7 @@ object BaseService {
internal fun register(instance: Interface) = instances.put(instance, Data(instance))
val usingVpnMode: Boolean get() = DataStore.serviceMode == Key.modeVpn
val serviceClass: KClass<out Any> get() = when (DataStore.serviceMode) {
val serviceClass get() = when (DataStore.serviceMode) {
Key.modeProxy -> ProxyService::class
Key.modeVpn -> VpnService::class
Key.modeTransproxy -> TransproxyService::class
......
......@@ -11,8 +11,6 @@ import android.graphics.ImageDecoder
import android.net.Uri
import android.os.Build
import android.support.annotation.AttrRes
import android.support.v4.app.Fragment
import android.support.v4.app.FragmentManager
import android.support.v4.content.ContextCompat
import android.support.v7.util.SortedList
import android.util.TypedValue
......@@ -21,12 +19,6 @@ import com.github.shadowsocks.JniHelper
import java.net.InetAddress
import java.net.URLConnection
private val fieldChildFragmentManager by lazy {
val field = Fragment::class.java.getDeclaredField("mChildFragmentManager")
field.isAccessible = true
field
}
fun String.isNumericAddress() = JniHelper.parseNumericAddress(this) != null
fun String.parseNumericAddress(): InetAddress? {
val addr = JniHelper.parseNumericAddress(this)
......@@ -65,13 +57,6 @@ fun ContentResolver.openBitmap(uri: Uri) =
val PackageInfo.signaturesCompat get() =
if (Build.VERSION.SDK_INT >= 28) signingInfo.apkContentsSigners else @Suppress("DEPRECATION") signatures
/**
* Based on: https://stackoverflow.com/a/15656428/2245107
*/
var Fragment.childFragManager: FragmentManager?
get() = childFragmentManager
set(value) = fieldChildFragmentManager.set(this, value)
/**
* Based on: https://stackoverflow.com/a/26348729/2245107
*/
......
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