diff --git a/app/src/huawei/java/com/aurora/store/util/FlavouredUtil.kt b/app/src/huawei/java/com/aurora/store/util/FlavouredUtil.kt index 098305917..62a58bae9 100644 --- a/app/src/huawei/java/com/aurora/store/util/FlavouredUtil.kt +++ b/app/src/huawei/java/com/aurora/store/util/FlavouredUtil.kt @@ -4,9 +4,12 @@ import android.content.Context import com.aurora.extensions.isHuawei object FlavouredUtil : IFlavouredUtil { + + override val defaultDispensers = emptySet() + 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 index 859a4d8cf..b960623da 100644 --- a/app/src/main/java/com/aurora/store/util/IFlavouredUtil.kt +++ b/app/src/main/java/com/aurora/store/util/IFlavouredUtil.kt @@ -3,5 +3,6 @@ package com.aurora.store.util import android.content.Context interface IFlavouredUtil { + val defaultDispensers: Set fun promptMicroGInstall(context: Context): Boolean -} \ No newline at end of file +} diff --git a/app/src/main/java/com/aurora/store/viewmodel/onboarding/OnboardingViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/onboarding/OnboardingViewModel.kt index 5aab12238..bba0298f2 100644 --- a/app/src/main/java/com/aurora/store/viewmodel/onboarding/OnboardingViewModel.kt +++ b/app/src/main/java/com/aurora/store/viewmodel/onboarding/OnboardingViewModel.kt @@ -8,12 +8,12 @@ package com.aurora.store.viewmodel.onboarding import android.content.Context import android.util.Log import androidx.lifecycle.ViewModel -import com.aurora.Constants import com.aurora.extensions.areNotificationsEnabled import com.aurora.extensions.isIgnoringBatteryOptimizations import com.aurora.store.data.helper.UpdateHelper import com.aurora.store.data.model.UpdateMode import com.aurora.store.data.work.CacheWorker +import com.aurora.store.util.FlavouredUtil import com.aurora.store.util.Preferences import com.aurora.store.util.Preferences.PREFERENCE_AUTO_DELETE import com.aurora.store.util.Preferences.PREFERENCE_DEFAULT_SELECTED_TAB @@ -71,7 +71,7 @@ class OnboardingViewModel @Inject constructor( save(PREFERENCE_FILTER_FDROID, true) /*Network*/ - save(PREFERENCE_DISPENSER_URLS, setOf(Constants.URL_DISPENSER)) + save(PREFERENCE_DISPENSER_URLS, FlavouredUtil.defaultDispensers) save(PREFERENCE_VENDING_VERSION, 0) /*Customization*/ diff --git a/app/src/preload/java/com/aurora/store/util/FlavouredUtil.kt b/app/src/preload/java/com/aurora/store/util/FlavouredUtil.kt index b3275132c..94d91d052 100644 --- a/app/src/preload/java/com/aurora/store/util/FlavouredUtil.kt +++ b/app/src/preload/java/com/aurora/store/util/FlavouredUtil.kt @@ -4,7 +4,9 @@ import android.content.Context object FlavouredUtil : IFlavouredUtil { + override val defaultDispensers = setOf(Constants.URL_DISPENSER) + 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 index b3275132c..eae8d4c20 100644 --- a/app/src/vanilla/java/com/aurora/store/util/FlavouredUtil.kt +++ b/app/src/vanilla/java/com/aurora/store/util/FlavouredUtil.kt @@ -1,10 +1,13 @@ package com.aurora.store.util import android.content.Context +import com.aurora.Constants object FlavouredUtil : IFlavouredUtil { + override val defaultDispensers = setOf(Constants.URL_DISPENSER) + override fun promptMicroGInstall(context: Context): Boolean { return false } -} \ No newline at end of file +}