Merge branch '3688-a16_compatibility' into 'main' (8f0f84ea) · Commits · e / os / Advanced Privacy

app/src/main/java/foundation/e/advancedprivacy/data/repositories/ResourcesRepository.kt

+2 −4

Original line number	Diff line number	Diff line
		@@ -22,16 +22,14 @@ import android.content.res.Configuration
		import android.content.res.Resources
		import androidx.annotation.StringRes
		import java.time.format.DateTimeFormatter
		import java.util.Locale
		import timber.log.Timber

		class ResourcesRepository(private val context: Context) {
		private val defaultResources by lazy { getLocalizedResources(context, Locale("")) }
		private val defaultResources by lazy { getLocalizedResources(context) }

		private fun getLocalizedResources(context: Context, desiredLocale: Locale?): Resources {
		private fun getLocalizedResources(context: Context): Resources {
		var conf: Configuration = context.resources.configuration
		conf = Configuration(conf)
		conf.setLocale(desiredLocale)
		val localizedContext = context.createConfigurationContext(conf)
		return localizedContext.resources
		}

app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyFragment.kt

+7 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@

		package foundation.e.advancedprivacy.features.internetprivacy

		import android.os.Build
		import android.os.Bundle
		import android.view.View
		import android.widget.AdapterView
		@@ -90,7 +91,12 @@ class InternetPrivacyFragment : NavToolbarFragment(R.layout.fragment_internet_ac
		if (it == "") {
		getString(R.string.ipscrambling_any_location)
		} else {
		Locale("", it).displayCountry
		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA) {
		Locale.of("", it)
		} else {
		@Suppress("DEPRECATION")
		Locale("", it)
		}.displayCountry
		}
		}
		).apply {

build.gradle

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,9 +19,9 @@
		// Top-level build file where you can add configuration options common to all sub-projects/modules.
		buildscript {
		ext.buildConfig = [
		'compileSdk': 35,
		'compileSdk': 36,
		'minSdk' : 30,
		'targetSdk' : 35,
		'targetSdk' : 36,
		'version' : [
		'major': 3,
		'minor': 3,

permissionseos/libs/hidden-apis-stub/src/main/java/android/app/AppOpsManager.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -31,8 +31,8 @@ public class AppOpsManager {

		@TargetApi(29)
		@DeprecatedSinceApi(
		api = 36,
		message = "Check availability in SDK36"
		api = 37,
		message = "Check availability in SDK37"
		)
		public static int strOpToOp(@NonNull String op) {
		return 0;
		@@ -40,8 +40,8 @@ public class AppOpsManager {

		@TargetApi(29)
		@DeprecatedSinceApi(
		api = 36,
		message = "Check availability in SDK36"
		api = 37,
		message = "Check availability in SDK37"
		)
		@RequiresPermission("android.permission.MANAGE_APP_OPS_MODES")
		public void setMode(int code, int uid, String packageName, int mode) {}

permissionseos/libs/hidden-apis-stub/src/main/java/android/content/pm/PackageManager.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -35,8 +35,8 @@ public abstract class PackageManager {

		@TargetApi(29)
		@DeprecatedSinceApi(
		api = 36,
		message = "Check availability in SDK36"
		api = 37,
		message = "Check availability in SDK37"
		)
		public static class NameNotFoundException extends AndroidException {
		public NameNotFoundException() {
		@@ -50,8 +50,8 @@ public abstract class PackageManager {

		@TargetApi(29)
		@DeprecatedSinceApi(
		api = 36,
		message = "Check availability in SDK36"
		api = 37,
		message = "Check availability in SDK37"
		)
		@RequiresPermission("android.permission.GRANT_RUNTIME_PERMISSIONS")
		public abstract void grantRuntimePermission(
		@@ -62,8 +62,8 @@ public abstract class PackageManager {

		@TargetApi(29)
		@DeprecatedSinceApi(
		api = 36,
		message = "Check availability in SDK36"
		api = 37,
		message = "Check availability in SDK37"
		)
		@RequiresPermission("android.permission.REVOKE_RUNTIME_PERMISSIONS")
		public abstract void revokeRuntimePermission(
		@@ -74,8 +74,8 @@ public abstract class PackageManager {

		@TargetApi(29)
		@DeprecatedSinceApi(
		api = 36,
		message = "Check availability in SDK36, since SDK33, " +
		api = 37,
		message = "Check availability in SDK37, since SDK33, " +
		"Use {@link #getApplicationInfoAsUser(String, ApplicationInfoFlags, int)} " +
		"when long flags are needed."
		)
		@@ -88,8 +88,8 @@ public abstract class PackageManager {

		@TargetApi(29)
		@DeprecatedSinceApi(
		api = 36,
		message = "Check availability in SDK36, since SDK33, " +
		api = 37,
		message = "Check availability in SDK37, since SDK33, " +
		"Use {@link #getInstalledPackagesAsUser(PackageInfoFlags, int)} " +
		"when long flags are needed."
		)