diff --git a/app/src/main/java/com/aurora/extensions/Threading.kt b/app/src/main/java/com/aurora/extensions/Threading.kt index 038262fdc..d7d94e7ba 100644 --- a/app/src/main/java/com/aurora/extensions/Threading.kt +++ b/app/src/main/java/com/aurora/extensions/Threading.kt @@ -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 { diff --git a/app/src/main/java/com/aurora/store/data/network/OkHttpClient.kt b/app/src/main/java/com/aurora/store/data/network/OkHttpClient.kt index 7eac1d13e..4d5a63ad2 100644 --- a/app/src/main/java/com/aurora/store/data/network/OkHttpClient.kt +++ b/app/src/main/java/com/aurora/store/data/network/OkHttpClient.kt @@ -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 diff --git a/app/src/main/java/com/aurora/store/util/CommonUtil.kt b/app/src/main/java/com/aurora/store/util/CommonUtil.kt index 4d071e06c..7bd9b405e 100644 --- a/app/src/main/java/com/aurora/store/util/CommonUtil.kt +++ b/app/src/main/java/com/aurora/store/util/CommonUtil.kt @@ -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] diff --git a/app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingFragment.kt b/app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingFragment.kt index 77b925020..3e6f7e5d9 100644 --- a/app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingFragment.kt @@ -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)