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

Merge branch 'master' into 'master'

Browse Source 
Fix: Use user-selected vending version

See merge request AuroraOSS/AuroraStore!357
This commit is contained in:
Aayush Gupta
2024-07-30 04:03:38 +00:00
parent 35548d28cb 46565c0fba
commit 2aeb60ee48
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt
View File

@@ -68,10 +68,14 @@ class AuthViewModel @Inject constructor(
private val spoofProvider: SpoofProvider get() = SpoofProvider(context) private val spoofProvider: SpoofProvider get() = SpoofProvider(context)
val properties: Properties val properties: Properties
get() = if (spoofProvider.isDeviceSpoofEnabled()) { get() {
spoofProvider.getSpoofDeviceProperties() val currentProperties = if (spoofProvider.isDeviceSpoofEnabled()) {
} else { spoofProvider.getSpoofDeviceProperties()
NativeDeviceInfoProvider(context).getNativeDeviceProperties() } else {
NativeDeviceInfoProvider(context).getNativeDeviceProperties()
}
setVendingVersion(currentProperties)
return currentProperties
} }
val locale: Locale val locale: Locale
get() = if (spoofProvider.isLocaleSpoofEnabled()) { get() = if (spoofProvider.isLocaleSpoofEnabled()) {
@@ -228,24 +232,6 @@ class AuthViewModel @Inject constructor(
private fun verifyAndSaveAuth(authData: AuthData, type: AccountType) { private fun verifyAndSaveAuth(authData: AuthData, type: AccountType) {
liveData.postValue(AuthState.Verifying) liveData.postValue(AuthState.Verifying)
val versionId = Preferences.getInteger(context, Preferences.PREFERENCE_VENDING_VERSION)
if (versionId > 0) {
val resources = context.resources
authData.deviceInfoProvider?.properties?.let {
it.setProperty(
"Vending.version",
resources.getStringArray(R.array.pref_vending_version_codes)[versionId]
)
it.setProperty(
"Vending.versionString",
resources.getStringArray(R.array.pref_vending_version)[versionId]
)
}
}
if (authData.authToken.isNotEmpty() && authData.deviceConfigToken.isNotEmpty()) { if (authData.authToken.isNotEmpty() && authData.deviceConfigToken.isNotEmpty()) {
configAuthPref(authData, type, true) configAuthPref(authData, type, true)
liveData.postValue(AuthState.SignedIn) liveData.postValue(AuthState.SignedIn)
@@ -259,6 +245,18 @@ class AuthViewModel @Inject constructor(
} }
} }
private fun setVendingVersion(currentProperties: Properties) {
val vendingVersionIndex = Preferences.getInteger(context, Preferences.PREFERENCE_VENDING_VERSION)
if (vendingVersionIndex > 0) {
val resources = context.resources
val versionCodes = resources.getStringArray(R.array.pref_vending_version_codes)
val versionStrings = resources.getStringArray(R.array.pref_vending_version)
currentProperties.setProperty("Vending.version", versionCodes[vendingVersionIndex])
currentProperties.setProperty("Vending.versionString", versionStrings[vendingVersionIndex])
}
}
private fun configAuthPref(authData: AuthData, type: AccountType, signedIn: Boolean) { private fun configAuthPref(authData: AuthData, type: AccountType, signedIn: Boolean) {
if (signedIn) { if (signedIn) {
//Save Auth Data //Save Auth Data