athaliar/APKDownloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve and fix proxy setup/usage

Browse Source 
* Switch connectivitycheck URL to HTTPS as cleartext communication is disabled
* Use GlobalScope to verify and setup proxy URL
* Ignore proxy setup in HttpClient if its empty

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
This commit is contained in:
Aayush Gupta
2024-03-05 13:07:57 +05:30
parent 80df8affe4
commit ac3065ab2c
5 changed files with 62 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/aurora/Constants.kt
View File

@@ -47,7 +47,7 @@ object Constants {
const val URL_DISPENSER = "https://auroraoss.com/api/auth"
const val PLAY_QUERY_URL = "https://play.google.com/store/search?q="
const val ANDROID_CONNECTIVITY_URL = "http://connectivitycheck.android.com/generate_204"
const val ANDROID_CONNECTIVITY_URL = "https://connectivitycheck.android.com/generate_204"
//ACCOUNTS
const val ACCOUNT_SIGNED_IN = "ACCOUNT_SIGNED_IN"

9
app/src/main/java/com/aurora/store/data/network/HttpClient.kt
View File

@@ -27,13 +27,10 @@ import com.google.gson.Gson
object HttpClient {
fun getPreferredClient(context: Context): IProxyHttpClient {
val proxyEnabled = Preferences.getBoolean(
context,
Preferences.PREFERENCE_PROXY_ENABLED
)
val proxyEnabled = Preferences.getBoolean(context, Preferences.PREFERENCE_PROXY_ENABLED)
val proxyInfoString = Preferences.getString(context, Preferences.PREFERENCE_PROXY_INFO)
return if (proxyEnabled) {
val proxyInfoString = Preferences.getString(context, Preferences.PREFERENCE_PROXY_INFO)
return if (proxyEnabled && proxyInfoString.isNotBlank() && proxyInfoString != "{}") {
val proxyInfo = Gson().fromJson(proxyInfoString, ProxyInfo::class.java)
if (proxyInfo != null) {

8
app/src/main/java/com/aurora/store/data/network/OkHttpClient.kt
View File

@@ -57,16 +57,13 @@ object OkHttpClient : IProxyHttpClient {
override fun setProxy(proxyInfo: ProxyInfo): OkHttpClient {
val proxy = Proxy(
if (proxyInfo.protocol == "SOCKS") Proxy.Type.SOCKS else Proxy.Type.HTTP,
InetSocketAddress.createUnresolved(
proxyInfo.host,
proxyInfo.port
)
InetSocketAddress.createUnresolved(proxyInfo.host, proxyInfo.port)
)
val proxyUser = proxyInfo.proxyUser
val proxyPassword = proxyInfo.proxyPassword
if (proxyUser != null && proxyPassword != null) {
if (!proxyUser.isNullOrBlank() && !proxyPassword.isNullOrBlank()) {
okHttpClientBuilder.proxyAuthenticator { _, response ->
if (response.request.header("Proxy-Authorization") != null) {
return@proxyAuthenticator null
@@ -82,7 +79,6 @@ object OkHttpClient : IProxyHttpClient {
okHttpClientBuilder.proxy(proxy)
okHttpClient = okHttpClientBuilder.build()
return this
}

6
app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingFragment.kt
View File

@@ -43,9 +43,6 @@ import com.aurora.store.util.Preferences.PREFERENCE_FOR_YOU
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
@@ -160,9 +157,6 @@ 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, "{}")
save(PREFERENCE_VENDING_VERSION, 0)
/*Customization*/

122
app/src/main/java/com/aurora/store/view/ui/preferences/NetworkPreference.kt
View File

@@ -20,14 +20,16 @@
package com.aurora.store.view.ui.preferences
import android.os.Bundle
import android.util.Log
import android.view.View
import androidx.appcompat.widget.Toolbar
import androidx.navigation.fragment.findNavController
import androidx.preference.EditTextPreference
import androidx.preference.ListPreference
import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat
import androidx.preference.SwitchPreferenceCompat
import com.aurora.Constants
import com.aurora.extensions.runAsync
import com.aurora.extensions.runOnUiThread
import com.aurora.extensions.toast
import com.aurora.store.R
@@ -40,6 +42,10 @@ import com.aurora.store.view.custom.preference.ListPreferenceMaterialDialogFragm
import com.google.gson.Gson
import dagger.hilt.android.AndroidEntryPoint
import javax.inject.Inject
import kotlinx.coroutines.DelicateCoroutinesApi
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
@AndroidEntryPoint
class NetworkPreference : PreferenceFragmentCompat() {
@@ -47,80 +53,64 @@ class NetworkPreference : PreferenceFragmentCompat() {
@Inject
lateinit var gson: Gson
private val TAG = NetworkPreference::class.java.simpleName
@OptIn(DelicateCoroutinesApi::class)
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
setPreferencesFromResource(R.xml.preferences_network, rootKey)
val proxyUrl = Preferences.getString(requireContext(), Preferences.PREFERENCE_PROXY_URL, "")
val proxyInfo =
Preferences.getString(requireContext(), Preferences.PREFERENCE_PROXY_INFO, "{}")
findPreference<EditTextPreference>(Preferences.PREFERENCE_PROXY_URL)?.let {
it.summary =
Preferences.getString(requireContext(), Preferences.PREFERENCE_PROXY_URL, "")
val preferenceProxyUrl: Preference? = findPreference(Preferences.PREFERENCE_PROXY_URL)
preferenceProxyUrl?.summary = proxyUrl
it.setOnPreferenceChangeListener { _, newValue ->
val newProxyUrl = newValue.toString()
val newProxyInfo = CommonUtil.parseProxyUrl(newProxyUrl)
preferenceProxyUrl?.let {
it.onPreferenceChangeListener =
Preference.OnPreferenceChangeListener { preference, newValue ->
val newProxyUrl = newValue.toString()
val newProxyInfo = CommonUtil.parseProxyUrl(newProxyUrl)
if (newProxyInfo == null) {
runOnUiThread {
requireContext().toast(getString(R.string.toast_proxy_invalid))
}
false
} else {
runAsync {
kotlin.runCatching {
val result = HttpClient
.getPreferredClient(requireContext())
.setProxy(newProxyInfo)
.get(
Constants.ANDROID_CONNECTIVITY_URL,
mapOf()
)
runOnUiThread {
if (result.code == 204) {
requireContext().toast(getString(R.string.toast_proxy_success))
save(Preferences.PREFERENCE_PROXY_URL, newProxyUrl)
save(
Preferences.PREFERENCE_PROXY_INFO,
gson.toJson(newProxyInfo)
)
preference.summary = newProxyUrl
} else {
throw Exception("Failed to set proxy")
}
}
}.onFailure {
runOnUiThread {
requireContext().toast(getText(R.string.toast_proxy_failed))
save(Preferences.PREFERENCE_PROXY_URL, proxyUrl)
save(
Preferences.PREFERENCE_PROXY_INFO,
proxyInfo
)
}
}
}
true
}
}
}
val insecureAnonymous: Preference? =
findPreference(Preferences.PREFERENCE_INSECURE_ANONYMOUS)
insecureAnonymous?.let {
it.onPreferenceClickListener =
Preference.OnPreferenceClickListener {
if (newProxyInfo == null) {
runOnUiThread {
requireContext().toast(R.string.insecure_anonymous_apply)
requireContext().toast(getString(R.string.toast_proxy_invalid))
}
false
} else {
GlobalScope.launch(Dispatchers.IO) {
try {
val result = HttpClient
.getPreferredClient(requireContext())
.setProxy(newProxyInfo)
.get(Constants.ANDROID_CONNECTIVITY_URL, mapOf())
if (result.code == 204) {
save(Preferences.PREFERENCE_PROXY_URL, newProxyUrl)
save(Preferences.PREFERENCE_PROXY_INFO, gson.toJson(newProxyInfo))
runOnUiThread {
requireContext().toast(getString(R.string.toast_proxy_success))
}
it.summary = newProxyUrl
} else {
throw Exception("Failed to set proxy")
}
} catch (exception: Exception) {
Log.e(TAG, "Failed to set proxy", exception)
runOnUiThread {
requireContext().toast(getText(R.string.toast_proxy_failed))
}
}
}
true
}
}
}
findPreference<SwitchPreferenceCompat>(Preferences.PREFERENCE_INSECURE_ANONYMOUS)?.let {
it.setOnPreferenceChangeListener { _, _ ->
runOnUiThread {
requireContext().toast(R.string.insecure_anonymous_apply)
}
false
}
}
findPreference<Preference>(Preferences.PREFERENCE_VENDING_VERSION)?.let {