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

Commit 7574d196 authored by Arnau Vàzquez's avatar Arnau Vàzquez
Browse files

Merge branch 'issue-131' into 'master' 

Fix arch values in download api

See merge request e/apps/apps!24
parents deb7442c e3b52206

app/src/main/java/foundation/e/apps/api/AppDownloadedRequest.kt

+2 −3
Original line number Diff line number Diff line
@@ -21,15 +21,14 @@ 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)

    }



    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=$apkArchitecture"

            val urlConnection = Common.createConnection(url, Constants.REQUEST_METHOD_GET)

            reader.readValue<Result>(urlConnection.inputStream)

            urlConnection.disconnect()

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

+1 −1
Original line number Diff line number Diff line
@@ -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)){

                isInstalling=true