Add support for proxies - 3/3
This commit is contained in:
@@ -23,7 +23,6 @@ import android.os.Handler
|
||||
import android.os.Looper
|
||||
|
||||
fun runAsync(action: () -> Unit) = Thread(Runnable(action)).start()
|
||||
fun runAsyncResult(action: () -> Boolean) = Thread { action() }.apply { start() }
|
||||
|
||||
fun runOnUiThread(action: () -> Unit) {
|
||||
when {
|
||||
|
||||
@@ -56,7 +56,7 @@ object OkHttpClient : IProxyHttpClient {
|
||||
|
||||
override fun setProxy(proxyInfo: ProxyInfo): OkHttpClient {
|
||||
val proxy = Proxy(
|
||||
if (proxyInfo.protocol == "socks") Proxy.Type.SOCKS else Proxy.Type.HTTP,
|
||||
if (proxyInfo.protocol == "SOCKS") Proxy.Type.SOCKS else Proxy.Type.HTTP,
|
||||
InetSocketAddress.createUnresolved(
|
||||
proxyInfo.host,
|
||||
proxyInfo.port
|
||||
|
||||
@@ -191,7 +191,7 @@ object CommonUtil {
|
||||
|
||||
return when {
|
||||
match != null -> {
|
||||
val protocol = match.groupValues[1].toUpperCase()
|
||||
val protocol = match.groupValues[1].uppercase()
|
||||
val username = match.groupValues[2]
|
||||
val password = match.groupValues[3]
|
||||
val url = match.groupValues[4]
|
||||
|
||||
@@ -49,6 +49,8 @@ import com.aurora.store.util.Preferences.PREFERENCE_INSECURE_ANONYMOUS
|
||||
import com.aurora.store.util.Preferences.PREFERENCE_INSTALLER_ID
|
||||
import com.aurora.store.util.Preferences.PREFERENCE_INTRO
|
||||
import com.aurora.store.util.Preferences.PREFERENCE_PROXY_ENABLED
|
||||
import com.aurora.store.util.Preferences.PREFERENCE_PROXY_INFO
|
||||
import com.aurora.store.util.Preferences.PREFERENCE_PROXY_URL
|
||||
import com.aurora.store.util.Preferences.PREFERENCE_SIMILAR
|
||||
import com.aurora.store.util.Preferences.PREFERENCE_THEME_ACCENT
|
||||
import com.aurora.store.util.Preferences.PREFERENCE_THEME_TYPE
|
||||
@@ -167,6 +169,8 @@ class OnboardingFragment : Fragment(R.layout.fragment_onboarding) {
|
||||
/*Network*/
|
||||
save(PREFERENCE_INSECURE_ANONYMOUS, false)
|
||||
save(PREFERENCE_PROXY_ENABLED, false)
|
||||
save(PREFERENCE_PROXY_URL, "")
|
||||
save(PREFERENCE_PROXY_INFO, "{}")
|
||||
|
||||
/*Customization*/
|
||||
save(PREFERENCE_THEME_TYPE, 0)
|
||||
|
||||
Reference in New Issue
Block a user