changes after rebasing (ef4c96f7) · Commits · e / os / App Lounge

app/src/main/java/foundation/e/apps/data/gitlab/SystemAppsUpdatesRepository.kt

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -17,7 +17,7 @@

	package foundation.e.apps.data.gitlab		package foundation.e.apps.data.gitlab

	import foundation.e.apps.data.application.ApplicationApi		import foundation.e.apps.data.application.ApplicationDataManager
	import foundation.e.apps.data.application.data.Application		import foundation.e.apps.data.application.data.Application
	import foundation.e.apps.data.gitlab.models.EligibleSystemApps		import foundation.e.apps.data.gitlab.models.EligibleSystemApps
	import foundation.e.apps.data.gitlab.models.toApplication		import foundation.e.apps.data.gitlab.models.toApplication
	@@ -28,7 +28,7 @@ import timber.log.Timber
	@Singleton		@Singleton
	class SystemAppsUpdatesRepository @Inject constructor(		class SystemAppsUpdatesRepository @Inject constructor(
	private val systemAppsUpdatesApi: SystemAppsUpdatesApi,		private val systemAppsUpdatesApi: SystemAppsUpdatesApi,
	private val applicationApi: ApplicationApi,		private val applicationDataManager: ApplicationDataManager,
	) {		) {

	suspend fun getAllEligibleApps(): List<EligibleSystemApps>? {		suspend fun getAllEligibleApps(): List<EligibleSystemApps>? {
	@@ -72,7 +72,7 @@ class SystemAppsUpdatesRepository @Inject constructor(
	}		}
	else -> {		else -> {
	val app = updateDef.toApplication()		val app = updateDef.toApplication()
	app.status = applicationApi.getFusedAppInstallationStatus(app)		app.status = applicationDataManager.getFusedAppInstallationStatus(app)
	app		app
	}		}
	}		}

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -185,7 +185,7 @@ class UpdatesManagerImpl @Inject constructor(
	return@forEach		return@forEach
	}		}

	if (!pkgManagerModule.isInstalled(it.packageName)) {		if (!appLoungePackageManager.isInstalled(it.packageName)) {
	// Don't install for system apps which are removed (by root or otherwise)		// Don't install for system apps which are removed (by root or otherwise)
	return@forEach		return@forEach
	}		}