Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e26d3f58 authored by Jonathan Klee's avatar Jonathan Klee
Browse files

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.
parent babea775

app/src/main/java/foundation/e/apps/data/playstore/utils/NativeDeviceInfoProviderModule.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -65,7 +65,7 @@ object NativeDeviceInfoProviderModule { 
        setProperty("Client", "android-google")

        setProperty("Client", "android-google")

        setProperty("GSF.version", "${gsfVersionProvider.getGsfVersionCode(true)}")

        setProperty("GSF.version", "${gsfVersionProvider.getGsfVersionCode(true)}")

        setProperty("Vending.version", "${gsfVersionProvider.getVendingVersionCode(true)}")

        setProperty("Vending.version", "${gsfVersionProvider.getVendingVersionCode(true)}")

        setProperty("Vending.versionString", gsfVersionProvider.getVendingVersionString(true))

        setProperty("Vending.versionString", gsfVersionProvider.getVendingVersionString())

    }

    }





    private fun Properties.setGLExtensions(context: Context) {

    private fun Properties.setGLExtensions(context: Context) {

app/src/main/java/foundation/e/apps/data/playstore/utils/NativeGsfVersionProvider.kt

+2 −7
Original line number Original line Diff line number Diff line
@@ -26,7 +26,6 @@ import androidx.core.content.pm.PackageInfoCompat 
class NativeGsfVersionProvider(context: Context) {

class NativeGsfVersionProvider(context: Context) {

    private var gsfVersionCode = 0

    private var gsfVersionCode = 0

    private var vendingVersionCode = 0

    private var vendingVersionCode = 0

    private var vendingVersionString = ""

    private val packageManager = context.packageManager

    private val packageManager = context.packageManager





    init {

    init {
@@ -39,7 +38,6 @@ class NativeGsfVersionProvider(context: Context) { 
        try {

        try {

            val vendingPkgInfo = packageManager.getPackageInfo(GOOGLE_VENDING_PACKAGE_ID, 0)

            val vendingPkgInfo = packageManager.getPackageInfo(GOOGLE_VENDING_PACKAGE_ID, 0)

            vendingVersionCode = PackageInfoCompat.getLongVersionCode(vendingPkgInfo).toInt()

            vendingVersionCode = PackageInfoCompat.getLongVersionCode(vendingPkgInfo).toInt()

            vendingVersionString = vendingPkgInfo.versionName

        } catch (e: PackageManager.NameNotFoundException) {

        } catch (e: PackageManager.NameNotFoundException) {

            // com.android.vending not found

            // com.android.vending not found

        }

        }
@@ -59,11 +57,8 @@ class NativeGsfVersionProvider(context: Context) { 
            vendingVersionCode

            vendingVersionCode

    }

    }





    fun getVendingVersionString(defaultIfNotFound: Boolean): String {

    fun getVendingVersionString(): String {

        return if (defaultIfNotFound && vendingVersionCode < GOOGLE_VENDING_VERSION_CODE)

        return GOOGLE_VENDING_VERSION_STRING

            GOOGLE_VENDING_VERSION_STRING

        else

            vendingVersionString

    }

    }





    companion object {

    companion object {