From e26d3f586b7da77821e12609a368a2d6b6f6b49f Mon Sep 17 00:00:00 2001 From: Jonathan Klee Date: Tue, 6 Feb 2024 09:45:32 +0100 Subject: [PATCH] Fix apps not loading from the Play Store We use GPlayApi library to request apps from the Google Play Store. GPlayApi is reading the Vending.versionString java environment variable that we set in AppLounge with the com.android.vending package version name. Setting the default version name makes AppLounge load apps from the Play Store again. --- .../playstore/utils/NativeDeviceInfoProviderModule.kt | 2 +- .../data/playstore/utils/NativeGsfVersionProvider.kt | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/foundation/e/apps/data/playstore/utils/NativeDeviceInfoProviderModule.kt b/app/src/main/java/foundation/e/apps/data/playstore/utils/NativeDeviceInfoProviderModule.kt index dde0fa5e1..409090290 100644 --- a/app/src/main/java/foundation/e/apps/data/playstore/utils/NativeDeviceInfoProviderModule.kt +++ b/app/src/main/java/foundation/e/apps/data/playstore/utils/NativeDeviceInfoProviderModule.kt @@ -65,7 +65,7 @@ object NativeDeviceInfoProviderModule { setProperty("Client", "android-google") setProperty("GSF.version", "${gsfVersionProvider.getGsfVersionCode(true)}") setProperty("Vending.version", "${gsfVersionProvider.getVendingVersionCode(true)}") - setProperty("Vending.versionString", gsfVersionProvider.getVendingVersionString(true)) + setProperty("Vending.versionString", gsfVersionProvider.getVendingVersionString()) } private fun Properties.setGLExtensions(context: Context) { diff --git a/app/src/main/java/foundation/e/apps/data/playstore/utils/NativeGsfVersionProvider.kt b/app/src/main/java/foundation/e/apps/data/playstore/utils/NativeGsfVersionProvider.kt index 175b8f511..5026a179c 100644 --- a/app/src/main/java/foundation/e/apps/data/playstore/utils/NativeGsfVersionProvider.kt +++ b/app/src/main/java/foundation/e/apps/data/playstore/utils/NativeGsfVersionProvider.kt @@ -26,7 +26,6 @@ import androidx.core.content.pm.PackageInfoCompat class NativeGsfVersionProvider(context: Context) { private var gsfVersionCode = 0 private var vendingVersionCode = 0 - private var vendingVersionString = "" private val packageManager = context.packageManager init { @@ -39,7 +38,6 @@ class NativeGsfVersionProvider(context: Context) { try { val vendingPkgInfo = packageManager.getPackageInfo(GOOGLE_VENDING_PACKAGE_ID, 0) vendingVersionCode = PackageInfoCompat.getLongVersionCode(vendingPkgInfo).toInt() - vendingVersionString = vendingPkgInfo.versionName } catch (e: PackageManager.NameNotFoundException) { // com.android.vending not found } @@ -59,11 +57,8 @@ class NativeGsfVersionProvider(context: Context) { vendingVersionCode } - fun getVendingVersionString(defaultIfNotFound: Boolean): String { - return if (defaultIfNotFound && vendingVersionCode < GOOGLE_VENDING_VERSION_CODE) - GOOGLE_VENDING_VERSION_STRING - else - vendingVersionString + fun getVendingVersionString(): String { + return GOOGLE_VENDING_VERSION_STRING } companion object { -- GitLab