diff --git a/app/src/main/java/com/aurora/extensions/Context.kt b/app/src/main/java/com/aurora/extensions/Context.kt index e24f401c1..1d2c2cdd9 100644 --- a/app/src/main/java/com/aurora/extensions/Context.kt +++ b/app/src/main/java/com/aurora/extensions/Context.kt @@ -143,11 +143,7 @@ fun Context.getStyledAttributeColor(id: Int): Int { } fun Context.isIgnoringBatteryOptimizations(): Boolean { - return if (isMAndAbove) { - (getSystemService())?.isIgnoringBatteryOptimizations(packageName) ?: true - } else { - true - } + return getSystemService()?.isIgnoringBatteryOptimizations(packageName) ?: true } fun Context.areNotificationsEnabled(): Boolean { diff --git a/app/src/main/java/com/aurora/extensions/Platform.kt b/app/src/main/java/com/aurora/extensions/Platform.kt index e75d762e6..dd9f0c1df 100644 --- a/app/src/main/java/com/aurora/extensions/Platform.kt +++ b/app/src/main/java/com/aurora/extensions/Platform.kt @@ -24,9 +24,6 @@ import android.annotation.SuppressLint import android.os.Build import java.util.Locale -val isMAndAbove: Boolean - get() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M - val isNAndAbove: Boolean get() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N diff --git a/app/src/main/java/com/aurora/store/data/helper/UpdateHelper.kt b/app/src/main/java/com/aurora/store/data/helper/UpdateHelper.kt index 6d4637167..b2da0ee3f 100644 --- a/app/src/main/java/com/aurora/store/data/helper/UpdateHelper.kt +++ b/app/src/main/java/com/aurora/store/data/helper/UpdateHelper.kt @@ -12,7 +12,6 @@ import androidx.work.OutOfQuotaPolicy import androidx.work.PeriodicWorkRequest import androidx.work.PeriodicWorkRequestBuilder import androidx.work.WorkManager -import com.aurora.extensions.isMAndAbove import com.aurora.store.AuroraApp import com.aurora.store.data.event.BusEvent import com.aurora.store.data.event.InstallerEvent @@ -68,7 +67,7 @@ class UpdateHelper @Inject constructor( constraints.setRequiresBatteryNotLow(true) } - if (isMAndAbove && Preferences.getBoolean(context, PREFERENCES_UPDATES_RESTRICTIONS_IDLE, true)) { + if (Preferences.getBoolean(context, PREFERENCES_UPDATES_RESTRICTIONS_IDLE, true)) { constraints.setRequiresDeviceIdle(true) } diff --git a/app/src/main/java/com/aurora/store/data/providers/NetworkProvider.kt b/app/src/main/java/com/aurora/store/data/providers/NetworkProvider.kt index 5fee1408c..c6efc13ba 100644 --- a/app/src/main/java/com/aurora/store/data/providers/NetworkProvider.kt +++ b/app/src/main/java/com/aurora/store/data/providers/NetworkProvider.kt @@ -20,15 +20,12 @@ package com.aurora.store.data.providers import android.content.Context -import android.content.IntentFilter import android.net.ConnectivityManager import android.net.Network import android.net.NetworkRequest import androidx.core.content.getSystemService -import com.aurora.extensions.isMAndAbove import com.aurora.extensions.isNAndAbove import com.aurora.store.data.model.NetworkStatus -import com.aurora.store.data.receiver.NetworkBroadcastReceiver import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow @@ -47,44 +44,25 @@ class NetworkProvider @Inject constructor(@ApplicationContext private val contex val status: Flow get() = callbackFlow { - if (isMAndAbove) { - val networkCallback = object : ConnectivityManager.NetworkCallback() { - override fun onAvailable(network: Network) { - trySend(NetworkStatus.AVAILABLE).isSuccess - } - - override fun onLost(network: Network) { - trySend(NetworkStatus.UNAVAILABLE).isSuccess - } + val networkCallback = object : ConnectivityManager.NetworkCallback() { + override fun onAvailable(network: Network) { + trySend(NetworkStatus.AVAILABLE).isSuccess } - if (isNAndAbove) { - connectivityManager.registerDefaultNetworkCallback(networkCallback) - } else { - connectivityManager.registerNetworkCallback( - NetworkRequest.Builder().build(), - networkCallback - ) + override fun onLost(network: Network) { + trySend(NetworkStatus.UNAVAILABLE).isSuccess } - - awaitClose { connectivityManager.unregisterNetworkCallback(networkCallback) } - } else { - val receiver = NetworkBroadcastReceiver { isConnected -> - val status = if (isConnected) { - NetworkStatus.AVAILABLE - } else { - NetworkStatus.UNAVAILABLE - } - trySend(status).isSuccess - } - - @Suppress("DEPRECATION") - context.registerReceiver( - receiver, - IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION) - ) - - awaitClose { context.unregisterReceiver(receiver) } } + + if (isNAndAbove) { + connectivityManager.registerDefaultNetworkCallback(networkCallback) + } else { + connectivityManager.registerNetworkCallback( + NetworkRequest.Builder().build(), + networkCallback + ) + } + + awaitClose { connectivityManager.unregisterNetworkCallback(networkCallback) } }.distinctUntilChanged() } diff --git a/app/src/main/java/com/aurora/store/data/providers/PermissionProvider.kt b/app/src/main/java/com/aurora/store/data/providers/PermissionProvider.kt index a3c08bb78..edf7d95cc 100644 --- a/app/src/main/java/com/aurora/store/data/providers/PermissionProvider.kt +++ b/app/src/main/java/com/aurora/store/data/providers/PermissionProvider.kt @@ -18,7 +18,6 @@ import com.aurora.extensions.checkManifestPermission import com.aurora.extensions.isDomainVerified import com.aurora.extensions.isExternalStorageAccessible import com.aurora.extensions.isIgnoringBatteryOptimizations -import com.aurora.extensions.isMAndAbove import com.aurora.extensions.isTAndAbove import com.aurora.extensions.toast import com.aurora.store.BuildConfig @@ -118,9 +117,7 @@ class PermissionProvider(private val fragment: Fragment) : } } - PermissionType.DOZE_WHITELIST -> { - if (isMAndAbove) context.isIgnoringBatteryOptimizations() else true - } + PermissionType.DOZE_WHITELIST -> context.isIgnoringBatteryOptimizations() PermissionType.APP_LINKS -> context.isDomainVerified("play.google.com") && context.isDomainVerified("market.android.com") diff --git a/app/src/main/java/com/aurora/store/view/ui/onboarding/PermissionsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/onboarding/PermissionsFragment.kt index 967607b57..f3a93cfd0 100644 --- a/app/src/main/java/com/aurora/store/view/ui/onboarding/PermissionsFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/onboarding/PermissionsFragment.kt @@ -26,7 +26,6 @@ import androidx.core.os.bundleOf import androidx.core.view.isVisible import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs -import com.aurora.extensions.isMAndAbove import com.aurora.extensions.isOAndAbove import com.aurora.extensions.isRAndAbove import com.aurora.extensions.isSAndAbove @@ -76,6 +75,12 @@ class PermissionsFragment : BaseFragment() } else { getString(R.string.onboarding_permission_installer_legacy_desc) } + ), + Permission( + PermissionType.DOZE_WHITELIST, + getString(R.string.onboarding_permission_doze), + getString(R.string.onboarding_permission_doze_desc), + true ) ) @@ -99,17 +104,6 @@ class PermissionsFragment : BaseFragment() ) } - if (isMAndAbove) { - permissions.add( - Permission( - PermissionType.DOZE_WHITELIST, - getString(R.string.onboarding_permission_doze), - getString(R.string.onboarding_permission_doze_desc), - true - ) - ) - } - if (isTAndAbove) { permissions.add( Permission( diff --git a/app/src/main/java/com/aurora/store/view/ui/splash/BaseFlavouredSplashFragment.kt b/app/src/main/java/com/aurora/store/view/ui/splash/BaseFlavouredSplashFragment.kt index 28762e7d0..8c10fcfc7 100644 --- a/app/src/main/java/com/aurora/store/view/ui/splash/BaseFlavouredSplashFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/splash/BaseFlavouredSplashFragment.kt @@ -18,7 +18,6 @@ import androidx.lifecycle.lifecycleScope import androidx.navigation.fragment.findNavController import com.aurora.Constants.PACKAGE_NAME_PLAY_STORE import com.aurora.extensions.getPackageName -import com.aurora.extensions.isMAndAbove import com.aurora.extensions.navigate import com.aurora.gplayapi.helpers.AuthHelper import com.aurora.store.R @@ -45,7 +44,7 @@ abstract class BaseFlavouredSplashFragment : BaseFragment val viewModel: AuthViewModel by activityViewModels() val canLoginWithMicroG: Boolean - get() = isMAndAbove && PackageUtil.hasSupportedMicroGVariant(requireContext()) && + get() = PackageUtil.hasSupportedMicroGVariant(requireContext()) && Preferences.getBoolean(requireContext(), PREFERENCE_MICROG_AUTH, true) val startForAccount =