Merge branch '0000-u-improvements-jklee' into '0000-u-refacto' (ba635100) · Commits · e / os / App Lounge

app/src/main/AndroidManifest.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@
		</receiver>

		<!-- TODO: ExportedReceiver, suppressing because changes are needed in other apps -->
		<receiver android:name=".install.receiver.PWAPlayerStatusReceiver"
		<receiver android:name=".install.receiver.PwaPlayerStatusReceiver"
		tools:ignore="ExportedReceiver"
		android:exported="true">
		<intent-filter>

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -19,15 +19,15 @@

		package foundation.e.apps.data

		import foundation.e.apps.data.cleanapk.repositories.CleanApkRepository
		import foundation.e.apps.data.cleanapk.repositories.CleanApkAppsRepository
		import foundation.e.apps.data.cleanapk.repositories.CleanApkPwaRepository
		import foundation.e.apps.data.playstore.PlayStoreRepository
		import javax.inject.Inject
		import javax.inject.Named
		import javax.inject.Singleton

		@Singleton
		class AppSourcesContainer @Inject constructor(
		@Named("gplayRepository") val gplayRepo: PlayStoreRepository,
		@Named("cleanApkAppsRepository") val cleanApkAppsRepo: CleanApkRepository,
		@Named("cleanApkPWARepository") val cleanApkPWARepo: CleanApkRepository
		val gplayRepo: PlayStoreRepository,
		val cleanApkAppsRepo: CleanApkAppsRepository,
		val cleanApkPWARepo: CleanApkPwaRepository
		)

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

+5 −6

Original line number	Diff line number	Diff line
		@@ -26,17 +26,16 @@ import foundation.e.apps.data.enums.FilterLevel
		import foundation.e.apps.data.enums.Origin
		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.PwaManager
		import foundation.e.apps.install.pkg.AppLoungePackageManager
		import javax.inject.Inject
		import javax.inject.Named
		import javax.inject.Singleton

		@Singleton
		class ApplicationDataManager @Inject constructor(
		@Named("gplayRepository") private val gplayRepository: PlayStoreRepository,
		private val gPlayRepository: PlayStoreRepository,
		private val appLoungePackageManager: AppLoungePackageManager,
		private val pwaManager: PWAManager
		private val pwaManager: PwaManager
		) {
		suspend fun updateFilterLevel(authData: AuthData?, application: Application) {
		application.filterLevel = getAppFilterLevel(application, authData)
		@@ -81,7 +80,7 @@ class ApplicationDataManager @Inject constructor(
		* Example: com.skype.m2
		*/
		private suspend fun isApplicationVisible(application: Application): Boolean {
		return kotlin.runCatching { gplayRepository.getAppDetails(application.package_name) }.isSuccess
		return kotlin.runCatching { gPlayRepository.getAppDetails(application.package_name) }.isSuccess
		}

		/*
		@@ -90,7 +89,7 @@ class ApplicationDataManager @Inject constructor(
		*/
		private suspend fun isDownloadable(application: Application): Boolean {
		return kotlin.runCatching {
		gplayRepository.getDownloadInfo(
		gPlayRepository.getDownloadInfo(
		application.package_name,
		application.latest_version_code,
		application.offer_type,

app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkAppDetailsRetrofit.kt

deleted100644 → 0

+0 −36

Original line number	Diff line number	Diff line
		/*
		*
		* * Copyright ECORP SAS 2022
		* * Apps Quickly and easily install Android apps onto your device!
		* *
		* * This program is free software: you can redistribute it and/or modify
		* * it under the terms of the GNU General Public License as published by
		* * the Free Software Foundation, either version 3 of the License, or
		* * (at your option) any later version.
		* *
		* * This program is distributed in the hope that it will be useful,
		* * but WITHOUT ANY WARRANTY; without even the implied warranty of
		* * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* * GNU General Public License for more details.
		* *
		* * You should have received a copy of the GNU General Public License
		* * along with this program. If not, see <https://www.gnu.org/licenses/>.
		*
		*/

		package foundation.e.apps.data.cleanapk

		import foundation.e.apps.data.cleanapk.data.app.Application
		import retrofit2.Response
		import retrofit2.http.GET
		import retrofit2.http.Query

		interface CleanApkAppDetailsRetrofit {

		@GET("apps?action=app_detail")
		suspend fun getAppOrPWADetailsByID(
		@Query("id") id: String,
		@Query("architectures") architectures: List<String>? = null,
		@Query("type") type: String? = null
		): Response<Application>
		}

app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanApkAppsRepositoryImpl.kt→app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanApkAppsRepository.kt

+4 −5

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@

		package foundation.e.apps.data.cleanapk.repositories

		import foundation.e.apps.data.cleanapk.CleanApkAppDetailsRetrofit
		import foundation.e.apps.data.cleanapk.CleanApkDownloadInfoFetcher
		import foundation.e.apps.data.cleanapk.CleanApkRetrofit
		import foundation.e.apps.data.cleanapk.data.app.Application
		@@ -27,10 +26,10 @@ import foundation.e.apps.data.cleanapk.data.download.Download
		import foundation.e.apps.data.cleanapk.data.home.HomeScreen
		import foundation.e.apps.data.cleanapk.data.search.Search
		import retrofit2.Response
		import javax.inject.Inject

		class CleanApkAppsRepositoryImpl(
		private val cleanApkRetrofit: CleanApkRetrofit,
		private val cleanApkAppDetailsRetrofit: CleanApkAppDetailsRetrofit
		class CleanApkAppsRepository @Inject constructor(
		private val cleanApkRetrofit: CleanApkRetrofit
		) : CleanApkRepository, CleanApkDownloadInfoFetcher {

		override suspend fun getHomeScreenData(): Response<HomeScreen> {
		@@ -76,7 +75,7 @@ class CleanApkAppsRepositoryImpl(
		}

		override suspend fun getAppDetails(packageNameOrId: String): Response<Application> {
		return cleanApkAppDetailsRetrofit.getAppOrPWADetailsByID(packageNameOrId, null, null)
		return cleanApkRetrofit.getAppOrPWADetailsByID(packageNameOrId, null, null)
		}

		override suspend fun getDownloadInfo(idOrPackageName: String, versionCode: Any?): Response<Download> {