From c2cd633794b830f4aa2155eb09d22c4926c85172 Mon Sep 17 00:00:00 2001 From: Dayona Joseph Date: Wed, 22 Jul 2020 12:03:26 +0530 Subject: [PATCH 1/5] Fix arch values in download api --- .../e/apps/api/AppDownloadedRequest.kt | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/foundation/e/apps/api/AppDownloadedRequest.kt b/app/src/main/java/foundation/e/apps/api/AppDownloadedRequest.kt index 991ef91bc..7326e01aa 100644 --- a/app/src/main/java/foundation/e/apps/api/AppDownloadedRequest.kt +++ b/app/src/main/java/foundation/e/apps/api/AppDownloadedRequest.kt @@ -25,11 +25,25 @@ class AppDownloadedRequest(private val id: String) { companion object { private val reader = Common.getObjectMapper().readerFor(Result::class.java) } + val sb = StringBuilder() + + init { + val arch = android.os.Build.SUPPORTED_ABIS.toList() + var size = 0 + for (v in arch) { + if (size < arch.size - 1) { + sb.append("'$v',") + } else { + sb.append("'$v']") + } + size++ + } + } + fun request() { try { - val arch = System.getProperty("os.arch") - val url = Constants.BASE_URL + "apps?action=download&app_id=$id&architecture=:$arch" + val url = Constants.BASE_URL + "apps?action=download&app_id=$id&architecture=:$sb" val urlConnection = Common.createConnection(url, Constants.REQUEST_METHOD_GET) reader.readValue(urlConnection.inputStream) urlConnection.disconnect() -- GitLab From 7321cd629bd169cb131ee52300a93001387029ab Mon Sep 17 00:00:00 2001 From: Dayona Joseph Date: Wed, 22 Jul 2020 14:36:40 +0530 Subject: [PATCH 2/5] Fix arch value on download api --- .../main/java/foundation/e/apps/api/AppDownloadedRequest.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/foundation/e/apps/api/AppDownloadedRequest.kt b/app/src/main/java/foundation/e/apps/api/AppDownloadedRequest.kt index 7326e01aa..a4e721dc4 100644 --- a/app/src/main/java/foundation/e/apps/api/AppDownloadedRequest.kt +++ b/app/src/main/java/foundation/e/apps/api/AppDownloadedRequest.kt @@ -43,7 +43,8 @@ class AppDownloadedRequest(private val id: String) { fun request() { try { - val url = Constants.BASE_URL + "apps?action=download&app_id=$id&architecture=:$sb" + val url = Constants.BASE_URL + "apps?action=download&app_id=$id&architecture=[$sb" + val urlConnection = Common.createConnection(url, Constants.REQUEST_METHOD_GET) reader.readValue(urlConnection.inputStream) urlConnection.disconnect() -- GitLab From daed3f62b031be624be569e79625f11bf91d7450 Mon Sep 17 00:00:00 2001 From: Dayona Joseph Date: Wed, 22 Jul 2020 15:41:42 +0530 Subject: [PATCH 3/5] Improve architecture selection logic --- .../main/java/foundation/e/apps/api/AppDownloadedRequest.kt | 4 ++-- .../java/foundation/e/apps/application/model/Application.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/foundation/e/apps/api/AppDownloadedRequest.kt b/app/src/main/java/foundation/e/apps/api/AppDownloadedRequest.kt index a4e721dc4..4e5dfad69 100644 --- a/app/src/main/java/foundation/e/apps/api/AppDownloadedRequest.kt +++ b/app/src/main/java/foundation/e/apps/api/AppDownloadedRequest.kt @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonCreator import foundation.e.apps.utils.Common import foundation.e.apps.utils.Constants -class AppDownloadedRequest(private val id: String) { +class AppDownloadedRequest(private val id: String, private val apkArchitecture: String?) { companion object { private val reader = Common.getObjectMapper().readerFor(Result::class.java) } @@ -43,7 +43,7 @@ class AppDownloadedRequest(private val id: String) { fun request() { try { - val url = Constants.BASE_URL + "apps?action=download&app_id=$id&architecture=[$sb" + val url = Constants.BASE_URL + "apps?action=download&app_id=$id&architecture=$apkArchitecture" val urlConnection = Common.createConnection(url, Constants.REQUEST_METHOD_GET) reader.readValue(urlConnection.inputStream) 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 a7665b29c..02a92a736 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 @@ -201,7 +201,7 @@ class Application(val packageName: String, private val applicationManager: Appli override fun onDownloadComplete(context: Context, status: Int) { if (status == DownloadManager.STATUS_SUCCESSFUL) { Execute({ - AppDownloadedRequest(basicData!!.id).request() + AppDownloadedRequest(basicData!!.id,fullData!!.getLastVersion()?.apkArchitecture).request() }, {}) if(info.isXapk(fullData!!,basicData)){ XAPKFile(info.getxApkFile(context,basicData!!)) -- GitLab From da47a6dc524520eccfc0327a856270b13d0e41fd Mon Sep 17 00:00:00 2001 From: Dayona Joseph Date: Thu, 23 Jul 2020 11:43:01 +0530 Subject: [PATCH 4/5] Clear garbage code --- .../foundation/e/apps/api/AppDownloadedRequest.kt | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/app/src/main/java/foundation/e/apps/api/AppDownloadedRequest.kt b/app/src/main/java/foundation/e/apps/api/AppDownloadedRequest.kt index 4e5dfad69..a59707384 100644 --- a/app/src/main/java/foundation/e/apps/api/AppDownloadedRequest.kt +++ b/app/src/main/java/foundation/e/apps/api/AppDownloadedRequest.kt @@ -27,24 +27,9 @@ class AppDownloadedRequest(private val id: String, private val apkArchitecture: } val sb = StringBuilder() - init { - val arch = android.os.Build.SUPPORTED_ABIS.toList() - var size = 0 - for (v in arch) { - if (size < arch.size - 1) { - sb.append("'$v',") - } else { - sb.append("'$v']") - } - size++ - } - } - - fun request() { try { val url = Constants.BASE_URL + "apps?action=download&app_id=$id&architecture=$apkArchitecture" - val urlConnection = Common.createConnection(url, Constants.REQUEST_METHOD_GET) reader.readValue(urlConnection.inputStream) urlConnection.disconnect() -- GitLab From bcaaf9abc935a270a529dc9ce12210b279a6b08d Mon Sep 17 00:00:00 2001 From: Dayona Joseph Date: Mon, 27 Jul 2020 11:18:06 +0530 Subject: [PATCH 5/5] Clear garbage code --- app/src/main/java/foundation/e/apps/api/AppDownloadedRequest.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/foundation/e/apps/api/AppDownloadedRequest.kt b/app/src/main/java/foundation/e/apps/api/AppDownloadedRequest.kt index a59707384..aa652a5e5 100644 --- a/app/src/main/java/foundation/e/apps/api/AppDownloadedRequest.kt +++ b/app/src/main/java/foundation/e/apps/api/AppDownloadedRequest.kt @@ -25,7 +25,6 @@ class AppDownloadedRequest(private val id: String, private val apkArchitecture: companion object { private val reader = Common.getObjectMapper().readerFor(Result::class.java) } - val sb = StringBuilder() fun request() { try { -- GitLab