brianhansonxyz/vpnhotspotmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to API 34

Browse Source
This commit is contained in:
Mygod
2023-06-08 19:45:23 -04:00
parent 0b87e1461f
commit 10565bcba7
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/build.gradle.kts
View File

@@ -26,7 +26,7 @@ android {
defaultConfig { defaultConfig {
applicationId = "be.mygod.vpnhotspot" applicationId = "be.mygod.vpnhotspot"
minSdk = 28 minSdk = 28
targetSdk = 33 targetSdk = 34
resourceConfigurations.addAll(arrayOf("it", "pt-rBR", "ru", "zh-rCN", "zh-rTW")) resourceConfigurations.addAll(arrayOf("it", "pt-rBR", "ru", "zh-rCN", "zh-rTW"))
versionCode = 1004 versionCode = 1004
versionName = "2.16.4" versionName = "2.16.4"

3
mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiApDialogFragment.kt
View File

@@ -22,7 +22,6 @@ import android.widget.Toast
import androidx.annotation.RequiresApi import androidx.annotation.RequiresApi
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import androidx.appcompat.widget.Toolbar import androidx.appcompat.widget.Toolbar
import androidx.core.os.BuildCompat
import androidx.core.os.persistableBundleOf import androidx.core.os.persistableBundleOf
import androidx.core.view.isGone import androidx.core.view.isGone
import be.mygod.librootkotlinx.toByteArray import be.mygod.librootkotlinx.toByteArray
@@ -517,7 +516,7 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
val canGenerate = ssidOk && passwordValid && bandError == null && canCopy val canGenerate = ssidOk && passwordValid && bandError == null && canCopy
(dialog as? AlertDialog)?.getButton(DialogInterface.BUTTON_POSITIVE)?.isEnabled = canGenerate (dialog as? AlertDialog)?.getButton(DialogInterface.BUTTON_POSITIVE)?.isEnabled = canGenerate
dialogView.toolbar.menu.apply { dialogView.toolbar.menu.apply {
findItem(R.id.invalid).isVisible = canGenerate && BuildCompat.isAtLeastU() && !arg.p2pMode && findItem(R.id.invalid).isVisible = canGenerate && Build.VERSION.SDK_INT >= 34 && !arg.p2pMode &&
!arg.readOnly && !Services.wifi.validateSoftApConfiguration(generateConfig().toPlatform()) !arg.readOnly && !Services.wifi.validateSoftApConfiguration(generateConfig().toPlatform())
findItem(android.R.id.copy).isEnabled = canCopy findItem(android.R.id.copy).isEnabled = canCopy
} }

7
mobile/src/main/java/be/mygod/vpnhotspot/util/Utils.kt
View File

@@ -16,7 +16,6 @@ import android.widget.ImageView
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
import androidx.annotation.RequiresApi import androidx.annotation.RequiresApi
import androidx.core.net.toUri import androidx.core.net.toUri
import androidx.core.os.BuildCompat
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.databinding.BindingAdapter import androidx.databinding.BindingAdapter
import androidx.fragment.app.DialogFragment import androidx.fragment.app.DialogFragment
@@ -267,9 +266,9 @@ private val engine by lazy @TargetApi(34) {
}.build() }.build()
} }
suspend fun <T> connectCancellable(url: String, block: suspend (HttpURLConnection) -> T): T { suspend fun <T> connectCancellable(url: String, block: suspend (HttpURLConnection) -> T): T {
val conn = (if (BuildCompat.isAtLeastU()) { val conn = (if (Build.VERSION.SDK_INT < 34) @Suppress("BlockingMethodInNonBlockingContext") {
engine.openConnection(URL(url)) URL(url).openConnection()
} else @Suppress("BlockingMethodInNonBlockingContext") URL(url).openConnection()) as HttpURLConnection } else engine.openConnection(URL(url))) as HttpURLConnection
return suspendCancellableCoroutine { cont -> return suspendCancellableCoroutine { cont ->
val job = GlobalScope.launch(Dispatchers.IO) { val job = GlobalScope.launch(Dispatchers.IO) {
try { try {