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

Commit abd5e6d8 authored by Nihar Thakkar's avatar Nihar Thakkar
Browse files

Merge branch 'fix-app_architecture' into 'master' 

Fix app architecture

See merge request e/apps/apps!5
parents 9499074d 597bb35e

app/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ android { 
        applicationId "foundation.e.apps"

        minSdkVersion 21

        targetSdkVersion 27

        versionCode 4

        versionName "1.1.1"

        versionCode 5

        versionName "1.1.2"

        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

    }

    buildTypes {

app/src/main/java/foundation/e/apps/application/model/Application.kt

+2 −2
Original line number Diff line number Diff line
@@ -140,13 +140,13 @@ class Application(val packageName: String, private val applicationManager: Appli 
    private fun isAPKArchCompatible(): Boolean {

        val apkArchitecture: String? = fullData!!.getLastVersion()?.apkArchitecture

        return if (apkArchitecture != null) {

            if (apkArchitecture == "universal") {

            if (apkArchitecture == "universal" || apkArchitecture == "noarch") {

                true

            } else {

                android.os.Build.SUPPORTED_ABIS.toList().contains(apkArchitecture)

            }

        } else {

            false

            true

        }

    }

app/src/main/java/foundation/e/apps/application/model/Version.kt

+1 −1
Original line number Diff line number Diff line
@@ -32,4 +32,4 @@ class Version(val downloadFlag: String?, 
              val privacyRating: Int?,

              val exodusPermissions: ArrayList<String>?,

              val exodusTrackers: ArrayList<String>?,

              val apkArchitecture: String)
 
 No newline at end of file
 
              val apkArchitecture: String?)
 
 No newline at end of file

app/src/main/java/foundation/e/apps/application/model/data/FullData.kt

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ constructor( 
                    result["exodus_score"] as Int?,

                    getPermissions(result["exodus_perms"] as ArrayList<String>?),

                    getTrackers(result["exodus_trackers"] as ArrayList<LinkedHashMap<String, String>>?),

                    result["architecture"] as String)

                    result["architecture"] as String?)

        }

    }