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

Commit 2840ee0c authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch '2240-fix-trust-false-positive-report' into 'v0.13' 

Use "*-release" in build number to detect the release type

See merge request e/apps/apps!42

(cherry picked from commit a8db4242)

6084f577 Display tags value
1d26aef2 display build type
56126beb add new display
c424246b Detect Release Type from build Tags
27021fb8 Use -release subfix instead of prefix
parent d67275b5

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

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



import android.content.Context

import android.os.Build

import com.google.gson.Gson

import com.google.gson.JsonParser

import foundation.e.apps.application.model.Application
@@ -41,8 +40,8 @@ class GitlabDataRequest { 
        val releaseList: List<ReleaseData> = Gson().fromJson(element.toString(),

                Array<ReleaseData>::class.java).toList()

        urlConnection.disconnect()

        var buildTag = Build.TAGS.split("-").toTypedArray();

        val osReleaseType = buildTag[0];



        val osReleaseType = OsInfo().getOSReleaseType()

        var releaseUrl = ""



        releaseList[0].assets.links.forEach {
@@ -51,7 +50,6 @@ class GitlabDataRequest { 
            }

        }





        callback.invoke(null, GitlabDataResult(SystemAppDataSource.createDataSource(Constants.MICROG_ID.toString(),

                releaseList[0].tag_name, Constants.MICROG_ICON_URI, releaseUrl)))

app/src/main/java/foundation/e/apps/utils/OsInfo.kt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
package foundation.e.apps.utils



import android.os.Build

import android.util.Log



class OsInfo() {



    fun getOSReleaseType(): String {

        val buildTags = Build.TAGS.split(",").toTypedArray()

        var osReleaseType = ""

        buildTags.forEach {

            if (it.contains("-release")) {

                osReleaseType = it.substringBefore("-release")

            }

        }



        Log.i("foundation.e.apps", "Release Type: $osReleaseType")



        return osReleaseType

    }



}
 
 No newline at end of file