athaliar/APKDownloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flavor: Move default dispenser logic to build flavor

Browse Source 
There is no default dispenser on Huawei builds

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
This commit is contained in:
Aayush Gupta
2025-12-01 20:57:22 +08:00
parent 1cabc95309
commit 938bb23a78
5 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/huawei/java/com/aurora/store/util/FlavouredUtil.kt
View File

@@ -4,9 +4,12 @@ import android.content.Context
import com.aurora.extensions.isHuawei import com.aurora.extensions.isHuawei
object FlavouredUtil : IFlavouredUtil { object FlavouredUtil : IFlavouredUtil {
override val defaultDispensers = emptySet()
override fun promptMicroGInstall(context: Context): Boolean { override fun promptMicroGInstall(context: Context): Boolean {
return isHuawei && return isHuawei &&
PackageUtil.hasSupportedAppGallery(context) && PackageUtil.hasSupportedAppGallery(context) &&
!PackageUtil.isMicroGBundleInstalled(context) !PackageUtil.isMicroGBundleInstalled(context)
} }
} }

3
app/src/main/java/com/aurora/store/util/IFlavouredUtil.kt
View File

@@ -3,5 +3,6 @@ package com.aurora.store.util
import android.content.Context import android.content.Context
interface IFlavouredUtil { interface IFlavouredUtil {
val defaultDispensers: Set<String>
fun promptMicroGInstall(context: Context): Boolean fun promptMicroGInstall(context: Context): Boolean
} }

4
app/src/main/java/com/aurora/store/viewmodel/onboarding/OnboardingViewModel.kt
View File

@@ -8,12 +8,12 @@ package com.aurora.store.viewmodel.onboarding
import android.content.Context import android.content.Context
import android.util.Log import android.util.Log
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import com.aurora.Constants
import com.aurora.extensions.areNotificationsEnabled import com.aurora.extensions.areNotificationsEnabled
import com.aurora.extensions.isIgnoringBatteryOptimizations import com.aurora.extensions.isIgnoringBatteryOptimizations
import com.aurora.store.data.helper.UpdateHelper import com.aurora.store.data.helper.UpdateHelper
import com.aurora.store.data.model.UpdateMode import com.aurora.store.data.model.UpdateMode
import com.aurora.store.data.work.CacheWorker 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
import com.aurora.store.util.Preferences.PREFERENCE_AUTO_DELETE import com.aurora.store.util.Preferences.PREFERENCE_AUTO_DELETE
import com.aurora.store.util.Preferences.PREFERENCE_DEFAULT_SELECTED_TAB import com.aurora.store.util.Preferences.PREFERENCE_DEFAULT_SELECTED_TAB
@@ -71,7 +71,7 @@ class OnboardingViewModel @Inject constructor(
save(PREFERENCE_FILTER_FDROID, true) save(PREFERENCE_FILTER_FDROID, true)
/*Network*/ /*Network*/
save(PREFERENCE_DISPENSER_URLS, setOf(Constants.URL_DISPENSER)) save(PREFERENCE_DISPENSER_URLS, FlavouredUtil.defaultDispensers)
save(PREFERENCE_VENDING_VERSION, 0) save(PREFERENCE_VENDING_VERSION, 0)
/*Customization*/ /*Customization*/

4
app/src/preload/java/com/aurora/store/util/FlavouredUtil.kt
View File

@@ -4,7 +4,9 @@ import android.content.Context
object FlavouredUtil : IFlavouredUtil { object FlavouredUtil : IFlavouredUtil {
override val defaultDispensers = setOf(Constants.URL_DISPENSER)
override fun promptMicroGInstall(context: Context): Boolean { override fun promptMicroGInstall(context: Context): Boolean {
return false return false
} }
} }

5
app/src/vanilla/java/com/aurora/store/util/FlavouredUtil.kt
View File

@@ -1,10 +1,13 @@
package com.aurora.store.util package com.aurora.store.util
import android.content.Context import android.content.Context
import com.aurora.Constants
object FlavouredUtil : IFlavouredUtil { object FlavouredUtil : IFlavouredUtil {
override val defaultDispensers = setOf(Constants.URL_DISPENSER)
override fun promptMicroGInstall(context: Context): Boolean { override fun promptMicroGInstall(context: Context): Boolean {
return false return false
} }
} }