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

Commit 9dcf6881 authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Merge branch '1879-t-fix-loading-apps' into 'main'

Fix apps not loading from the Play Store

See merge request !418
parents babea775 e26d3f58
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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) {
+2 −7
Original line number Diff line number Diff line
@@ -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 {