diff --git a/app/src/main/java/com/aurora/Constants.kt b/app/src/main/java/com/aurora/Constants.kt index cd9270005..09ca67e34 100644 --- a/app/src/main/java/com/aurora/Constants.kt +++ b/app/src/main/java/com/aurora/Constants.kt @@ -50,7 +50,7 @@ object Constants { const val GITLAB_URL = "https://gitlab.com/AuroraOSS/AuroraStore" const val URL_DISPENSER = "https://auroraoss.com/api/auth" - //ACCOUNTS + // ACCOUNTS const val ACCOUNT_SIGNED_IN = "ACCOUNT_SIGNED_IN" const val ACCOUNT_TYPE = "ACCOUNT_TYPE" const val ACCOUNT_EMAIL_PLAIN = "ACCOUNT_EMAIL_PLAIN" diff --git a/app/src/main/java/com/aurora/extensions/PackageInfo.kt b/app/src/main/java/com/aurora/extensions/PackageInfo.kt index 57e94c573..781b9bc39 100644 --- a/app/src/main/java/com/aurora/extensions/PackageInfo.kt +++ b/app/src/main/java/com/aurora/extensions/PackageInfo.kt @@ -28,7 +28,8 @@ fun PackageInfo.isValidApp(packageManager: PackageManager): Boolean { return when { isQAndAbove -> { Process.isApplicationUid(this.applicationInfo!!.uid) && - !this.applicationInfo!!.isResourceOverlay && !this.isApex + !this.applicationInfo!!.isResourceOverlay && + !this.isApex } isNAndAbove -> Process.isApplicationUid(this.applicationInfo!!.uid) diff --git a/app/src/main/java/com/aurora/store/compose/ui/onboarding/OnboardingScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/onboarding/OnboardingScreen.kt index 66d67f521..ac9162f83 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/onboarding/OnboardingScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/onboarding/OnboardingScreen.kt @@ -124,9 +124,8 @@ private fun ScreenContent( Button( modifier = buttonWidthModifier, - enabled = - !isFinalPage() || - (!uiState.isMicroBundleChecked || uiState.isMicroGBundleInstalled), + enabled = !isFinalPage() || + (!uiState.isMicroBundleChecked || uiState.isMicroGBundleInstalled), onClick = { when { isFinalPage() -> onFinishOnboarding() diff --git a/app/src/main/java/com/aurora/store/data/work/DownloadWorker.kt b/app/src/main/java/com/aurora/store/data/work/DownloadWorker.kt index 3f0b40f70..f974602c3 100644 --- a/app/src/main/java/com/aurora/store/data/work/DownloadWorker.kt +++ b/app/src/main/java/com/aurora/store/data/work/DownloadWorker.kt @@ -206,7 +206,8 @@ class DownloadWorker @AssistedInject constructor( private suspend fun onSuccess(): Result { return withContext(NonCancellable) { return@withContext try { - if (BuildConfig.FLAVOR == FLAVOUR_HUAWEI && download.requiresGMS && + if (BuildConfig.FLAVOR == FLAVOUR_HUAWEI && + download.requiresGMS && PackageUtil.hasMicroGCompanion(context) ) { appInstaller.getMicroGInstaller().install(download) diff --git a/app/src/main/java/com/aurora/store/data/work/ExportWorker.kt b/app/src/main/java/com/aurora/store/data/work/ExportWorker.kt index 935beea30..1e743db42 100644 --- a/app/src/main/java/com/aurora/store/data/work/ExportWorker.kt +++ b/app/src/main/java/com/aurora/store/data/work/ExportWorker.kt @@ -104,7 +104,6 @@ class ExportWorker @AssistedInject constructor( notificationManager = context.getSystemService()!! - @Suppress("ktlint:standard:mixed-condition-operators") if (packageName.isNullOrEmpty() || isDownload && versionCode == -1L) { Log.e(TAG, "Input data is corrupt, bailing out!") notifyStatus(displayName ?: String(), uri, false) diff --git a/app/src/main/java/com/aurora/store/util/PackageUtil.kt b/app/src/main/java/com/aurora/store/util/PackageUtil.kt index 8c0d52ea8..972db941a 100644 --- a/app/src/main/java/com/aurora/store/util/PackageUtil.kt +++ b/app/src/main/java/com/aurora/store/util/PackageUtil.kt @@ -123,11 +123,12 @@ object PackageUtil { context, PACKAGE_NAME_PLAY_STORE, VERSION_CODE_MICROG_COMPANION_MIN - ) && hasActivity( - context, - PACKAGE_NAME_PLAY_STORE, - MICROG_INSTALL_ACTIVITY - ) + ) && + hasActivity( + context, + PACKAGE_NAME_PLAY_STORE, + MICROG_INSTALL_ACTIVITY + ) fun isInstalled(context: Context, packageName: String, versionCode: Long? = null): Boolean = try { diff --git a/app/src/main/java/com/aurora/store/view/epoxy/controller/GenericCarouselController.kt b/app/src/main/java/com/aurora/store/view/epoxy/controller/GenericCarouselController.kt index 12e63e8f4..f9d7ccb16 100644 --- a/app/src/main/java/com/aurora/store/view/epoxy/controller/GenericCarouselController.kt +++ b/app/src/main/java/com/aurora/store/view/epoxy/controller/GenericCarouselController.kt @@ -41,8 +41,10 @@ open class GenericCarouselController(private val callbacks: Callbacks) : } open fun applyFilter(streamBundle: StreamCluster): Boolean { - return streamBundle.clusterTitle.isNotBlank() && // Filter noisy cluster - streamBundle.clusterAppList.isNotEmpty() && // Filter empty clusters + return streamBundle.clusterTitle.isNotBlank() && + // Filter noisy cluster + streamBundle.clusterAppList.isNotEmpty() && + // Filter empty clusters streamBundle.clusterAppList.count() > 1 // Filter clusters with single apps (promotions) } diff --git a/app/src/main/java/com/aurora/store/viewmodel/blacklist/BlacklistViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/blacklist/BlacklistViewModel.kt index 8b97cb0ad..bf597fe54 100644 --- a/app/src/main/java/com/aurora/store/viewmodel/blacklist/BlacklistViewModel.kt +++ b/app/src/main/java/com/aurora/store/viewmodel/blacklist/BlacklistViewModel.kt @@ -71,8 +71,8 @@ class BlacklistViewModel @Inject constructor( if (query.isNotBlank()) { _filteredPackages.value = packages.value!! .filter { - it.applicationInfo!!.loadLabel(context.packageManager) - .contains(query, true) || it.packageName.contains(query, true) + it.applicationInfo!!.loadLabel(context.packageManager).contains(query, true) || + it.packageName.contains(query, true) } } else { _filteredPackages.value = packages.value