Loading app/src/main/java/foundation/e/apps/data/gitlab/SystemAppsUpdatesRepository.kt +9 −8 Original line number Original line Diff line number Diff line Loading @@ -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") Loading @@ -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 } } Loading @@ -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, Loading Loading
app/src/main/java/foundation/e/apps/data/gitlab/SystemAppsUpdatesRepository.kt +9 −8 Original line number Original line Diff line number Diff line Loading @@ -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") Loading @@ -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 } } Loading @@ -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, Loading