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

Commit 76a56b9c authored by Dayona Joseph's avatar Dayona Joseph
Browse files

Ability to switch between production and test api

parent 7388b862

app/src/main/java/foundation/e/apps/MainActivity.kt

+16 −0
Original line number Diff line number Diff line
@@ -112,6 +112,22 @@ class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemS 
        selectFragment(currentFragmentId, null)

    }



    fun BASE_URL(): String {

        val preferences = PreferenceManager.getDefaultSharedPreferences(mActivity)

        var showAllApps:Boolean

        if(android.os.Build.TAGS=="test-keys"){

            showAllApps = preferences.getBoolean(getString(R.string.build_type), false)

            if(showAllApps){

                return "https://api.cleanapk.org/v2/"

            }

            else {

                return "https://api.test.cleanapk.org/v2/"

            }

        }else{

            return "https://api.cleanapk.org/v2/"

        }

    }



    private fun initialiseFragments(applicationManager: ApplicationManager) {

        homeFragment.initialise(applicationManager)

        searchFragment.initialise(applicationManager)

app/src/main/java/foundation/e/apps/PWA/PwaInstaller.kt

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ class PwaInstaller : AppCompatActivity() { 
                    Looper.prepare();//Call looper.prepare()

                try {

                    var uri = PwasBasicData.thisActivity!!.uri

                    val url = URL(Constants.BASE_URL + "media/" + uri)

                    val url = URL(mActivity.BASE_URL() + "media/" + uri)

                    val urlConnection = url.openConnection() as HttpsURLConnection

                    urlConnection.requestMethod = Constants.REQUEST_METHOD_GET

                    urlConnection.connectTimeout = Constants.CONNECT_TIMEOUT

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

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ class AllAppsSearchRequest(private val keyword: String, private val page: Int, p 
    fun request(callback: (Error?, SearchResult?) -> Unit) {

        try {

            var appType =mActivity.showApplicationTypePreference()

            val url = Constants.BASE_URL + "apps?action=search&type=$appType&source=$appType&keyword=${URLEncoder.encode(keyword, "utf-8")}&page=$page&nres=$resultsPerPage"

            val url = mActivity.BASE_URL() + "apps?action=search&type=$appType&source=$appType&keyword=${URLEncoder.encode(keyword, "utf-8")}&page=$page&nres=$resultsPerPage"

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

            val result = reader.readValue<SearchResult>(urlConnection.inputStream)

            urlConnection.disconnect()

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

+4 −2
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package foundation.e.apps.api 


import com.fasterxml.jackson.annotation.JsonCreator

import com.fasterxml.jackson.annotation.JsonProperty

import foundation.e.apps.MainActivity

import foundation.e.apps.MainActivity.Companion.mActivity

import foundation.e.apps.application.model.data.FullData

import foundation.e.apps.application.model.data.PwaFullData

import foundation.e.apps.utils.Common
@@ -49,7 +51,7 @@ class AppDetailRequest(private val id: String) { 


    fun request(callback: (Error?, FullData?) -> Unit) {

        try {

            val url = Constants.BASE_URL + "apps?action=app_detail&id=$id&architectures=[$sb"

            val url = mActivity.BASE_URL() + "apps?action=app_detail&id=$id&architectures=[$sb"

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

            val result = reader.readValue<Result>(urlConnection.inputStream)

            urlConnection.disconnect()
@@ -64,7 +66,7 @@ class AppDetailRequest(private val id: String) { 


    fun Pwarequest(callback: (Error?, PwaFullData?) -> Unit) {

        try {

            val url = Constants.BASE_URL + "apps?action=app_detail&id=$id&architectures=[$sb"

            val url = mActivity.BASE_URL() + "apps?action=app_detail&id=$id&architectures=[$sb"

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

            val PwaResult = Pwareader.readValue<PwaResult>(urlConnection.inputStream)

            urlConnection.disconnect()

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

+3 −1
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
package foundation.e.apps.api



import com.fasterxml.jackson.annotation.JsonCreator

import foundation.e.apps.MainActivity

import foundation.e.apps.MainActivity.Companion.mActivity

import foundation.e.apps.utils.Common

import foundation.e.apps.utils.Constants
@@ -29,7 +31,7 @@ class AppDownloadedRequest(private val id: String) { 
    fun request() {

        try {

            val arch = System.getProperty("os.arch")

            val url = Constants.BASE_URL + "apps?action=download&app_id=$id&architecture=:$arch"

            val url = mActivity.BASE_URL() + "apps?action=download&app_id=$id&architecture=:$arch"

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

            reader.readValue<Result>(urlConnection.inputStream)

            urlConnection.disconnect()