diff --git a/app/src/huawei/java/com/aurora/store/util/FlavouredUtil.kt b/app/src/huawei/java/com/aurora/store/util/FlavouredUtil.kt new file mode 100644 index 000000000..098305917 --- /dev/null +++ b/app/src/huawei/java/com/aurora/store/util/FlavouredUtil.kt @@ -0,0 +1,12 @@ +package com.aurora.store.util + +import android.content.Context +import com.aurora.extensions.isHuawei + +object FlavouredUtil : IFlavouredUtil { + override fun promptMicroGInstall(context: Context): Boolean { + return isHuawei && + PackageUtil.hasSupportedAppGallery(context) && + !PackageUtil.isMicroGBundleInstalled(context) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/aurora/store/util/IFlavouredUtil.kt b/app/src/main/java/com/aurora/store/util/IFlavouredUtil.kt new file mode 100644 index 000000000..859a4d8cf --- /dev/null +++ b/app/src/main/java/com/aurora/store/util/IFlavouredUtil.kt @@ -0,0 +1,7 @@ +package com.aurora.store.util + +import android.content.Context + +interface IFlavouredUtil { + fun promptMicroGInstall(context: Context): Boolean +} \ No newline at end of file diff --git a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt index ba5ebaff4..72a91fbd6 100644 --- a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt @@ -50,7 +50,6 @@ import com.aurora.Constants.EXODUS_SUBMIT_PAGE import com.aurora.Constants.PACKAGE_NAME_GMS import com.aurora.extensions.browse import com.aurora.extensions.hide -import com.aurora.extensions.isHuawei import com.aurora.extensions.px import com.aurora.extensions.requiresObbDir import com.aurora.extensions.runOnUiThread @@ -77,6 +76,7 @@ import com.aurora.store.data.model.ViewState.Loading.getDataAs import com.aurora.store.databinding.FragmentDetailsBinding import com.aurora.store.util.CertUtil import com.aurora.store.util.CommonUtil +import com.aurora.store.util.FlavouredUtil import com.aurora.store.util.PackageUtil import com.aurora.store.util.Preferences import com.aurora.store.util.Preferences.PREFERENCE_SIMILAR @@ -529,20 +529,9 @@ class AppDetailsFragment : BaseFragment() { } private fun purchase(app: App) { - /** - * MicroG Fragment Preconditions: - * 1. App being installed must have GSF dependency - * 2. It should be a Huawei device - * 3. Supported App Gallery should be available, i.e. v15.1.x or above - * 4. MicroG bundle should not be already installed - * - * TODO: Extract this trigger out of Vanilla & put in Huawei flavour - */ if ( app.dependencies.dependentPackages.fastAny { it == PACKAGE_NAME_GMS } && - isHuawei && - PackageUtil.hasSupportedAppGallery(requireContext()) && - !PackageUtil.isMicroGBundleInstalled(requireContext()) + FlavouredUtil.promptMicroGInstall(requireContext()) ) { return openGMSWarningFragment() } diff --git a/app/src/preload/java/com/aurora/store/util/FlavouredUtil.kt b/app/src/preload/java/com/aurora/store/util/FlavouredUtil.kt new file mode 100644 index 000000000..b3275132c --- /dev/null +++ b/app/src/preload/java/com/aurora/store/util/FlavouredUtil.kt @@ -0,0 +1,10 @@ +package com.aurora.store.util + +import android.content.Context + +object FlavouredUtil : IFlavouredUtil { + + override fun promptMicroGInstall(context: Context): Boolean { + return false + } +} \ No newline at end of file diff --git a/app/src/vanilla/java/com/aurora/store/util/FlavouredUtil.kt b/app/src/vanilla/java/com/aurora/store/util/FlavouredUtil.kt new file mode 100644 index 000000000..b3275132c --- /dev/null +++ b/app/src/vanilla/java/com/aurora/store/util/FlavouredUtil.kt @@ -0,0 +1,10 @@ +package com.aurora.store.util + +import android.content.Context + +object FlavouredUtil : IFlavouredUtil { + + override fun promptMicroGInstall(context: Context): Boolean { + return false + } +} \ No newline at end of file