diff --git a/V2rayNG/app/build.gradle.kts b/V2rayNG/app/build.gradle.kts index bd6d35ad..3ecad0eb 100644 --- a/V2rayNG/app/build.gradle.kts +++ b/V2rayNG/app/build.gradle.kts @@ -6,12 +6,12 @@ plugins { android { namespace = "com.v2ray.ang" - compileSdk = 36 + compileSdk = 37 defaultConfig { applicationId = "com.v2ray.ang" minSdk = 24 - targetSdk = 36 + targetSdk = 37 versionCode = 728 versionName = "2.1.8" multiDexEnabled = true diff --git a/V2rayNG/app/src/main/AndroidManifest.xml b/V2rayNG/app/src/main/AndroidManifest.xml index 754a8ddf..4d150c65 100644 --- a/V2rayNG/app/src/main/AndroidManifest.xml +++ b/V2rayNG/app/src/main/AndroidManifest.xml @@ -30,15 +30,14 @@ - - + - = Build.VERSION_CODES.S && + e.javaClass.name == "android.app.ForegroundServiceStartNotAllowedException" + ) { + LogUtil.e(AppConfig.TAG, "StartCore-Manager: Foreground service start not allowed", e) + throw IllegalStateException(e.message ?: e.javaClass.simpleName, e) + } + throw e + } } /** diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/enums/PermissionType.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/enums/PermissionType.kt index 9defe638..f57d489d 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/enums/PermissionType.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/enums/PermissionType.kt @@ -13,17 +13,6 @@ enum class PermissionType { override fun getPermission(): String = Manifest.permission.CAMERA }, - /** Read storage / media permission (adapts to Android version) */ - READ_STORAGE { - override fun getPermission(): String { - return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - Manifest.permission.READ_MEDIA_IMAGES - } else { - Manifest.permission.READ_EXTERNAL_STORAGE - } - } - }, - /** Notification permission (Android 13+) */ POST_NOTIFICATIONS { @RequiresApi(Build.VERSION_CODES.TIRAMISU) @@ -37,7 +26,6 @@ enum class PermissionType { fun getLabel(): String { return when (this) { CAMERA -> "Camera" - READ_STORAGE -> "Storage" POST_NOTIFICATIONS -> "Notification" } } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/HelperBaseActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/HelperBaseActivity.kt index a8bd3958..c8078450 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/HelperBaseActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/HelperBaseActivity.kt @@ -56,9 +56,7 @@ abstract class HelperBaseActivity : BaseActivity() { mimeType: String = "*/*", onResult: (Uri?) -> Unit ) { - checkAndRequestPermission(PermissionType.READ_STORAGE) { - fileChooser.launch(mimeType, onResult) - } + fileChooser.launch(mimeType, onResult) } /**