issue_5413 [WIP]: use ResultSupreme in UpdatesManagerImpl and UpdatesManagerRepository (69503e90) · Commits · e / os / App Lounge

app/src/main/java/foundation/e/apps/updates/manager/UpdatesManagerImpl.kt

+9 −6

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		package foundation.e.apps.updates.manager

		import com.aurora.gplayapi.data.models.AuthData
		import foundation.e.apps.api.ResultSupreme
		import foundation.e.apps.api.fused.FusedAPIRepository
		import foundation.e.apps.api.fused.data.FusedApp
		import foundation.e.apps.manager.pkg.PkgManagerModule
		@@ -34,10 +35,11 @@ class UpdatesManagerImpl @Inject constructor(
		private val TAG = UpdatesManagerImpl::class.java.simpleName

		// TODO: MAKE THIS LOGIC MORE SANE
		suspend fun getUpdates(authData: AuthData): Pair<List<FusedApp>, ResultStatus> {
		suspend fun getUpdates(authData: AuthData): ResultSupreme<List<FusedApp>> {
		val pkgList = mutableListOf<String>()
		val updateList = mutableListOf<FusedApp>()
		var status = ResultStatus.OK
		var cleanapkFailed = false

		val userApplications = pkgManagerModule.getAllUserApps()
		userApplications.forEach { pkgList.add(it.packageName) }
		@@ -56,6 +58,7 @@ class UpdatesManagerImpl @Inject constructor(
		cleanAPKResult.second.let {
		if (it != ResultStatus.OK) {
		status = it
		cleanapkFailed = true
		}
		}

		@@ -74,26 +77,26 @@ class UpdatesManagerImpl @Inject constructor(
		}
		}
		}
		return Pair(updateList, status)
		return ResultSupreme.create(status, updateList, cleanapkFailed.toString())
		}

		/*
		* Get updates only from cleanapk.
		* Issue: https://gitlab.e.foundation/e/backlog/-/issues/5413 [2]
		*/
		suspend fun getUpdatesOSS(): Pair<List<FusedApp>, ResultStatus> {
		suspend fun getUpdatesOSS(): ResultSupreme<List<FusedApp>> {
		val updateList = mutableListOf<FusedApp>()
		val pkgList = pkgManagerModule.getAllUserApps().map { it.packageName }

		return if (pkgList.isNotEmpty()) {
		fusedAPIRepository.getApplicationDetailsOSS(pkgList).run {
		this.first.forEach {
		this.data?.forEach {
		if (it.status == Status.UPDATABLE) updateList.add(it)
		}
		Pair(updateList, this.second)
		ResultSupreme.replicate(this, updateList)
		}
		} else {
		Pair(listOf(), ResultStatus.OK)
		ResultSupreme.Success(listOf())
		}
		}

app/src/main/java/foundation/e/apps/updates/manager/UpdatesManagerRepository.kt

+3 −3

Original line number	Diff line number	Diff line
		@@ -19,19 +19,19 @@
		package foundation.e.apps.updates.manager

		import com.aurora.gplayapi.data.models.AuthData
		import foundation.e.apps.api.ResultSupreme
		import foundation.e.apps.api.fused.data.FusedApp
		import foundation.e.apps.utils.enums.ResultStatus
		import javax.inject.Inject

		class UpdatesManagerRepository @Inject constructor(
		private val updatesManagerImpl: UpdatesManagerImpl
		) {

		suspend fun getUpdates(authData: AuthData): Pair<List<FusedApp>, ResultStatus> {
		suspend fun getUpdates(authData: AuthData): ResultSupreme<List<FusedApp>> {
		return updatesManagerImpl.getUpdates(authData)
		}

		suspend fun getUpdatesOSS(): Pair<List<FusedApp>, ResultStatus> {
		suspend fun getUpdatesOSS(): ResultSupreme<List<FusedApp>> {
		return updatesManagerImpl.getUpdatesOSS()
		}