Update to API 34
This commit is contained in:
@@ -26,7 +26,7 @@ android {
|
||||
defaultConfig {
|
||||
applicationId = "be.mygod.vpnhotspot"
|
||||
minSdk = 28
|
||||
targetSdk = 33
|
||||
targetSdk = 34
|
||||
resourceConfigurations.addAll(arrayOf("it", "pt-rBR", "ru", "zh-rCN", "zh-rTW"))
|
||||
versionCode = 1004
|
||||
versionName = "2.16.4"
|
||||
|
||||
@@ -22,7 +22,6 @@ import android.widget.Toast
|
||||
import androidx.annotation.RequiresApi
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import androidx.appcompat.widget.Toolbar
|
||||
import androidx.core.os.BuildCompat
|
||||
import androidx.core.os.persistableBundleOf
|
||||
import androidx.core.view.isGone
|
||||
import be.mygod.librootkotlinx.toByteArray
|
||||
@@ -517,7 +516,7 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
|
||||
val canGenerate = ssidOk && passwordValid && bandError == null && canCopy
|
||||
(dialog as? AlertDialog)?.getButton(DialogInterface.BUTTON_POSITIVE)?.isEnabled = canGenerate
|
||||
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())
|
||||
findItem(android.R.id.copy).isEnabled = canCopy
|
||||
}
|
||||
|
||||
@@ -16,7 +16,6 @@ import android.widget.ImageView
|
||||
import androidx.annotation.DrawableRes
|
||||
import androidx.annotation.RequiresApi
|
||||
import androidx.core.net.toUri
|
||||
import androidx.core.os.BuildCompat
|
||||
import androidx.core.view.isVisible
|
||||
import androidx.databinding.BindingAdapter
|
||||
import androidx.fragment.app.DialogFragment
|
||||
@@ -267,9 +266,9 @@ private val engine by lazy @TargetApi(34) {
|
||||
}.build()
|
||||
}
|
||||
suspend fun <T> connectCancellable(url: String, block: suspend (HttpURLConnection) -> T): T {
|
||||
val conn = (if (BuildCompat.isAtLeastU()) {
|
||||
engine.openConnection(URL(url))
|
||||
} else @Suppress("BlockingMethodInNonBlockingContext") URL(url).openConnection()) as HttpURLConnection
|
||||
val conn = (if (Build.VERSION.SDK_INT < 34) @Suppress("BlockingMethodInNonBlockingContext") {
|
||||
URL(url).openConnection()
|
||||
} else engine.openConnection(URL(url))) as HttpURLConnection
|
||||
return suspendCancellableCoroutine { cont ->
|
||||
val job = GlobalScope.launch(Dispatchers.IO) {
|
||||
try {
|
||||
|
||||
Reference in New Issue
Block a user