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

Commit d002ca4c authored by Vincent Bourgmayer's avatar Vincent Bourgmayer
Browse files

refactor: apply Jonathan's suggestion

parent 28b2aca6
Loading
Loading
Loading
Loading
Loading
+9 −8
Original line number Original line Diff line number Diff line
@@ -113,7 +113,7 @@ class SystemAppsUpdatesRepository @Inject constructor(
    ): String? {
    ): String? {
        val projectId = systemAppProject.projectId
        val projectId = systemAppProject.projectId
        val releaseResponse = releaseInfoApi.getReleases(projectId)
        val releaseResponse = releaseInfoApi.getReleases(projectId)
        val releases = releaseResponse.body()?.toMutableList()
        var releases = releaseResponse.body()


        if (!releaseResponse.isSuccessful || releases == null) {
        if (!releaseResponse.isSuccessful || releases == null) {
            Timber.e("Failed to fetch releases for project id - $projectId")
            Timber.e("Failed to fetch releases for project id - $projectId")
@@ -121,15 +121,11 @@ class SystemAppsUpdatesRepository @Inject constructor(
        }
        }


        if (systemAppProject.dependsOnAndroidVersion) {
        if (systemAppProject.dependsOnAndroidVersion) {
            //expects something like: vx.y.z-T for android T
            val versionSuffix = "-$androidVersionCode"
            releases.removeIf {
            releases = releases.filter { isVersionedTag(it.tagName, versionSuffix) }
                !it.tagName.endsWith(
                    suffix = "-$androidVersionCode",
                    ignoreCase = true
                )
            }
        }
        }



        val sortedReleases = releases.sortedByDescending {
        val sortedReleases = releases.sortedByDescending {
            it.releasedAt
            it.releasedAt
        }
        }
@@ -143,6 +139,11 @@ class SystemAppsUpdatesRepository @Inject constructor(
        return null
        return null
    }
    }


    private fun isVersionedTag(tag: String, versionSuffix: String): Boolean {
        return tag.endsWith(suffix = versionSuffix, ignoreCase = true)
    }


    private suspend fun getApplication(
    private suspend fun getApplication(
        packageName: String,
        packageName: String,
        releaseType: OsReleaseType,
        releaseType: OsReleaseType,