From 9e4a7b28fbf6fbf3985373aec548baaa60dd6001 Mon Sep 17 00:00:00 2001 From: Nihar Thakkar Date: Thu, 13 Jun 2019 09:49:25 +0530 Subject: [PATCH 1/2] Handle apps which don't have architecture information --- .../java/foundation/e/apps/application/model/Application.kt | 4 ++-- .../main/java/foundation/e/apps/application/model/Version.kt | 2 +- .../java/foundation/e/apps/application/model/data/FullData.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/foundation/e/apps/application/model/Application.kt b/app/src/main/java/foundation/e/apps/application/model/Application.kt index 3f3c5c21a..8068cd3cd 100644 --- a/app/src/main/java/foundation/e/apps/application/model/Application.kt +++ b/app/src/main/java/foundation/e/apps/application/model/Application.kt @@ -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 } } diff --git a/app/src/main/java/foundation/e/apps/application/model/Version.kt b/app/src/main/java/foundation/e/apps/application/model/Version.kt index 50e163cdd..e794d16b7 100644 --- a/app/src/main/java/foundation/e/apps/application/model/Version.kt +++ b/app/src/main/java/foundation/e/apps/application/model/Version.kt @@ -32,4 +32,4 @@ class Version(val downloadFlag: String?, val privacyRating: Int?, val exodusPermissions: ArrayList?, val exodusTrackers: ArrayList?, - val apkArchitecture: String) \ No newline at end of file + val apkArchitecture: String?) \ No newline at end of file diff --git a/app/src/main/java/foundation/e/apps/application/model/data/FullData.kt b/app/src/main/java/foundation/e/apps/application/model/data/FullData.kt index 1a2e8de00..8176cb198 100644 --- a/app/src/main/java/foundation/e/apps/application/model/data/FullData.kt +++ b/app/src/main/java/foundation/e/apps/application/model/data/FullData.kt @@ -92,7 +92,7 @@ constructor( result["exodus_score"] as Int?, getPermissions(result["exodus_perms"] as ArrayList?), getTrackers(result["exodus_trackers"] as ArrayList>?), - result["architecture"] as String) + result["architecture"] as String?) } } -- GitLab From 39e50f0cd4f856ba44ce92f441e344eab2eefb9d Mon Sep 17 00:00:00 2001 From: Nihar Thakkar Date: Thu, 13 Jun 2019 09:53:26 +0530 Subject: [PATCH 2/2] Increment version number and version code --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1d663b141..a2bf173a6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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 { -- GitLab