Get rid off Origin class (8e5e0aad) · Commits · e / os / App Lounge

app/src/main/java/foundation/e/apps/data/StoreRepository.kt

+1 −2

Original line number	Diff line number	Diff line
		@@ -23,6 +23,5 @@ import foundation.e.apps.data.application.data.Home

		interface StoreRepository {
		suspend fun getHomeScreenData(list: MutableList<Home>): List<Home>
		suspend fun getAppDetails(packageNameOrId: String): Application

		suspend fun getAppDetails(packageName: String): Application
		}

app/src/main/java/foundation/e/apps/data/Stores.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,8 +20,8 @@ class Stores @Inject constructor(
		}

		init {
		stores[Source.OPEN] = cleanApkAppsRepository
		stores[Source.OPEN_SOURCE] = cleanApkAppsRepository
		stores[Source.PWA] = cleanApkPwaRepository
		stores[Source.GPLAY] = playStoreRepository
		stores[Source.PLAY_STORE] = playStoreRepository
		}
		}
		No newline at end of file

app/src/main/java/foundation/e/apps/data/application/ApplicationDataManager.kt

+3 −4

Original line number	Diff line number	Diff line
		@@ -22,9 +22,8 @@ import com.aurora.gplayapi.Constants
		import foundation.e.apps.data.application.data.Application
		import foundation.e.apps.data.application.data.Home
		import foundation.e.apps.data.enums.FilterLevel
		import foundation.e.apps.data.enums.Origin
		import foundation.e.apps.data.enums.Source
		import foundation.e.apps.data.enums.Status
		import foundation.e.apps.data.playstore.PlayStoreRepository
		import foundation.e.apps.install.pkg.PwaManager
		import foundation.e.apps.install.pkg.AppLoungePackageManager
		import javax.inject.Inject
		@@ -58,8 +57,8 @@ class ApplicationDataManager @Inject constructor(
		return when {
		application.package_name.isBlank() -> FilterLevel.UNKNOWN
		!application.isFree && application.price.isBlank() -> FilterLevel.UI
		application.origin == Origin.CLEANAPK -> FilterLevel.NONE
		application.origin == Origin.GITLAB_RELEASES -> FilterLevel.NONE
		application.source == Source.PWA \|\| application.source == Source.OPEN_SOURCE -> FilterLevel.NONE
		application.source == Source.GITLAB_RELEASES -> FilterLevel.NONE
		!isRestricted(application) -> FilterLevel.NONE
		application.originalSize == 0L -> FilterLevel.UI
		else -> FilterLevel.NONE

app/src/main/java/foundation/e/apps/data/application/ApplicationRepository.kt

+9 −11

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import foundation.e.apps.data.ResultSupreme
		import foundation.e.apps.data.application.apps.AppsApi
		import foundation.e.apps.data.application.category.CategoryApi
		import foundation.e.apps.data.enums.FilterLevel
		import foundation.e.apps.data.enums.Origin
		import foundation.e.apps.data.enums.ResultStatus
		import foundation.e.apps.data.enums.Source
		import foundation.e.apps.data.enums.Status
		@@ -62,9 +61,9 @@ class ApplicationRepository @Inject constructor(

		suspend fun getApplicationDetails(
		packageNameList: List<String>,
		origin: Origin
		source: Source
		): Pair<List<Application>, ResultStatus> {
		return appsApi.getApplicationDetails(packageNameList, origin)
		return appsApi.getApplicationDetails(packageNameList, source)
		}

		suspend fun getAppFilterLevel(application: Application): FilterLevel {
		@@ -74,9 +73,9 @@ class ApplicationRepository @Inject constructor(
		suspend fun getApplicationDetails(
		id: String,
		packageName: String,
		origin: Origin
		source: Source
		): Pair<Application, ResultStatus> {
		return appsApi.getApplicationDetails(id, packageName, origin)
		return appsApi.getApplicationDetails(id, packageName, source)
		}

		suspend fun getCleanapkAppDetails(packageName: String): Pair<Application, ResultStatus> {
		@@ -84,11 +83,11 @@ class ApplicationRepository @Inject constructor(
		}

		suspend fun updateFusedDownloadWithDownloadingInfo(
		origin: Origin,
		source: Source,
		appInstall: AppInstall
		) {
		downloadInfoApi.updateFusedDownloadWithDownloadingInfo(
		origin,
		source,
		appInstall
		)
		}
		@@ -116,10 +115,9 @@ class ApplicationRepository @Inject constructor(
		}

		suspend fun getCleanApkSearchResults(
		query: String,
		authData: AuthData
		query: String
		): SearchResult {
		return searchAPIImpl.getCleanApkSearchResults(query, authData)
		return searchAPIImpl.getCleanApkSearchResults(query)
		}

		suspend fun getGplaySearchResults(
		@@ -136,7 +134,7 @@ class ApplicationRepository @Inject constructor(
		source: Source
		): ResultSupreme<Pair<List<Application>, String>> {
		return when (source) {
		Source.OPEN -> categoryApi.getCleanApkAppsByCategory(category, Source.OPEN)
		Source.OPEN_SOURCE -> categoryApi.getCleanApkAppsByCategory(category, Source.OPEN_SOURCE)
		Source.PWA -> categoryApi.getCleanApkAppsByCategory(category, Source.PWA)
		else -> categoryApi.getGplayAppsByCategory(authData, category, pageUrl)
		}

app/src/main/java/foundation/e/apps/data/application/apps/AppsApi.kt

+3 −5

Original line number	Diff line number	Diff line
		@@ -18,12 +18,10 @@

		package foundation.e.apps.data.application.apps

		import com.aurora.gplayapi.data.models.AuthData
		import com.aurora.gplayapi.data.models.ContentRating
		import foundation.e.apps.data.application.data.Application
		import foundation.e.apps.data.enums.FilterLevel
		import foundation.e.apps.data.enums.Origin
		import foundation.e.apps.data.enums.ResultStatus
		import foundation.e.apps.data.enums.Source
		import foundation.e.apps.data.enums.Status

		interface AppsApi {
		@@ -36,13 +34,13 @@ interface AppsApi {

		suspend fun getApplicationDetails(
		packageNameList: List<String>,
		origin: Origin
		source: Source
		): Pair<List<Application>, ResultStatus>

		suspend fun getApplicationDetails(
		id: String,
		packageName: String,
		origin: Origin
		source: Source
		): Pair<Application, ResultStatus>

		/**