Merge branch '5720-improve_filtering' into 'main' (325d9c6a) · Commits · e / os / App Lounge

app/src/main/java/foundation/e/apps/MainActivityViewModel.kt

+23 −1

Original line number	Diff line number	Diff line
		@@ -49,6 +49,8 @@ import foundation.e.apps.utils.enums.Origin
		import foundation.e.apps.utils.enums.Status
		import foundation.e.apps.utils.enums.Type
		import foundation.e.apps.utils.enums.User
		import foundation.e.apps.utils.enums.isInitialized
		import foundation.e.apps.utils.enums.isUnFiltered
		import foundation.e.apps.utils.modules.CommonUtilsModule.timeoutDurationInMillis
		import foundation.e.apps.utils.modules.DataStoreModule
		import kotlinx.coroutines.Dispatchers
		@@ -361,7 +363,7 @@ class MainActivityViewModel @Inject constructor(
		fusedApp: FusedApp,
		alertDialogContext: Context? = null
		): Boolean {
		if (!fusedApp.isFree && fusedApp.price.isBlank()) {
		if (!fusedApp.filterLevel.isUnFiltered()) {
		alertDialogContext?.let { context ->
		AlertDialog.Builder(context).apply {
		setTitle(R.string.unsupported_app_title)
		@@ -379,6 +381,26 @@ class MainActivityViewModel @Inject constructor(
		return false
		}

		/**
		* Fetch the filter level of an app and perform some action.
		* Issue: https://gitlab.e.foundation/e/backlog/-/issues/5720
		*/
		fun verifyUiFilter(fusedApp: FusedApp, method: () -> Unit) {
		viewModelScope.launch {
		val authData = authData.value
		if (fusedApp.filterLevel.isInitialized()) {
		method()
		} else {
		fusedAPIRepository.getAppFilterLevel(fusedApp, authData).run {
		if (isInitialized()) {
		fusedApp.filterLevel = this
		method()
		}
		}
		}
		}
		}

		fun getApplication(app: FusedApp, imageView: ImageView?) {
		if (shouldShowPaidAppsSnackBar(app)) {
		return

app/src/main/java/foundation/e/apps/api/fused/FusedAPIImpl.kt

+93 −22

Original line number	Diff line number	Diff line
		@@ -53,6 +53,8 @@ import foundation.e.apps.utils.enums.Origin
		import foundation.e.apps.utils.enums.ResultStatus
		import foundation.e.apps.utils.enums.Status
		import foundation.e.apps.utils.enums.Type
		import foundation.e.apps.utils.enums.FilterLevel
		import foundation.e.apps.utils.enums.isUnFiltered
		import foundation.e.apps.utils.modules.CommonUtilsModule.timeoutDurationInMillis
		import foundation.e.apps.utils.modules.PWAManagerModule
		import foundation.e.apps.utils.modules.PreferenceManagerModule
		@@ -410,6 +412,7 @@ class FusedAPIImpl @Inject constructor(
		response?.apps?.forEach {
		it.updateStatus()
		it.updateType()
		it.updateFilterLevel(null)
		list.add(it)
		}
		})
		@@ -423,6 +426,7 @@ class FusedAPIImpl @Inject constructor(
		response?.apps?.forEach {
		it.updateStatus()
		it.updateType()
		it.updateFilterLevel(null)
		list.add(it)
		}
		})
		@@ -494,6 +498,7 @@ class FusedAPIImpl @Inject constructor(
		cleanAPKRepository.getAppOrPWADetailsByID(result.apps[0]._id).body()?.app
		?: FusedApp()
		}
		fusedApp.updateFilterLevel(null)
		})
		return Pair(fusedApp, status)
		}
		@@ -545,7 +550,9 @@ class FusedAPIImpl @Inject constructor(
		by = "package_name"
		).body()?.run {
		if (apps.isNotEmpty() && numberOfResults == 1) {
		fusedAppList.add(apps[0])
		fusedAppList.add(apps[0].apply {
		updateFilterLevel(null)
		})
		}
		}
		})
		@@ -569,28 +576,24 @@ class FusedAPIImpl @Inject constructor(
		packageNameList: List<String>,
		authData: AuthData,
		): Pair<List<FusedApp>, ResultStatus> {
		var fusedAppList = listOf<FusedApp>()
		val fusedAppList = mutableListOf<FusedApp>()

		/*
		* Old code moved from getApplicationDetails()
		*/
		val status = runCodeBlockWithTimeout({
		fusedAppList = gPlayAPIRepository.getAppDetails(packageNameList, authData).map { app ->
		gPlayAPIRepository.getAppDetails(packageNameList, authData).forEach { app ->
		/*
		* Some apps are restricted to locations. Example "com.skype.m2".
		* For restricted apps, check if it is possible to get their specific app info.
		*
		* Issue: https://gitlab.e.foundation/e/backlog/-/issues/5174
		*/
		if (app.restriction != Constants.Restriction.NOT_RESTRICTED) {
		try {
		gPlayAPIRepository.getAppDetails(app.packageName, authData)
		?.transformToFusedApp() ?: FusedApp()
		} catch (e: Exception) {
		FusedApp()
		}
		} else {
		app.transformToFusedApp()
		val filter = getAppFilterLevel(app, authData)
		if (filter.isUnFiltered()) {
		fusedAppList.add(app.transformToFusedApp().apply {
		filterLevel = filter
		})
		}
		}
		})
		@@ -616,19 +619,77 @@ class FusedAPIImpl @Inject constructor(
		val filteredFusedApps = mutableListOf<FusedApp>()
		val status = runCodeBlockWithTimeout({
		appList.forEach {
		if (it.restriction != Constants.Restriction.NOT_RESTRICTED) {
		val filter = getAppFilterLevel(it, authData)
		if (filter.isUnFiltered()) {
		filteredFusedApps.add(it.transformToFusedApp().apply {
		this.filterLevel = filter
		})
		}
		}
		})

		return ResultSupreme.create(status, filteredFusedApps)
		}

		/**
		* Get different filter levels.
		* Issue: https://gitlab.e.foundation/e/backlog/-/issues/5720
		*/
		suspend fun getAppFilterLevel(fusedApp: FusedApp, authData: AuthData?): FilterLevel {
		if (fusedApp.package_name.isBlank()) {
		return FilterLevel.UNKNOWN
		}
		if (authData == null) {
		return if (fusedApp.origin == Origin.GPLAY) FilterLevel.UNKNOWN
		else FilterLevel.NONE
		}
		if (fusedApp.restriction != Constants.Restriction.NOT_RESTRICTED) {
		/*
		* Check if app details can be shown. If not then remove the app from lists.
		*/
		try {
		gPlayAPIRepository.getAppDetails(it.packageName, authData)?.let { app ->
		filteredFusedApps.add(app.transformToFusedApp())
		gPlayAPIRepository.getAppDetails(fusedApp.package_name, authData)
		} catch (e: Exception) {
		return FilterLevel.DATA
		}

		/*
		* If the app can be shown, check if the app is downloadable.
		* If not then change "Install" button to "N/A"
		*/
		try {
		gPlayAPIRepository.getDownloadInfo(
		fusedApp.package_name,
		fusedApp.latest_version_code,
		fusedApp.offer_type,
		authData
		)
		} catch (e: Exception) {
		return FilterLevel.UI
		}
		} catch (e: Exception) {}
		} else {
		filteredFusedApps.add(it.transformToFusedApp())
		if (!fusedApp.isFree && fusedApp.price.isBlank()) {
		return FilterLevel.UI
		}
		if (fusedApp.originalSize == 0L) {
		return FilterLevel.UI
		}
		}
		return FilterLevel.NONE
		}
		})

		return ResultSupreme.create(status, filteredFusedApps)
		/*
		* Similar to above method but uses Aurora OSS data class "App".
		*/
		suspend fun getAppFilterLevel(app: App, authData: AuthData): FilterLevel {
		return getAppFilterLevel(app.transformToFusedApp(), authData)
		}

		/*
		* Handy method to run on an instance of FusedApp to update its filter level.
		*/
		private suspend fun FusedApp.updateFilterLevel(authData: AuthData?) {
		this.filterLevel = getAppFilterLevel(this, authData)
		}

		suspend fun getApplicationDetails(
		@@ -650,6 +711,7 @@ class FusedAPIImpl @Inject constructor(
		response?.let {
		it.updateStatus()
		it.updateType()
		it.updateFilterLevel(authData)
		}
		})

		@@ -990,7 +1052,7 @@ class FusedAPIImpl @Inject constructor(
		* Home screen-related internal functions
		*/

		private fun generateCleanAPKHome(home: Home, prefType: String): List<FusedHome> {
		private suspend fun generateCleanAPKHome(home: Home, prefType: String): List<FusedHome> {
		val list = mutableListOf<FusedHome>()
		val headings = if (prefType == APP_TYPE_OPEN) {
		mapOf(
		@@ -1014,6 +1076,7 @@ class FusedAPIImpl @Inject constructor(
		home.top_updated_apps.forEach {
		it.updateStatus()
		it.updateType()
		it.updateFilterLevel(null)
		}
		list.add(FusedHome(value, home.top_updated_apps))
		}
		@@ -1023,6 +1086,7 @@ class FusedAPIImpl @Inject constructor(
		home.top_updated_games.forEach {
		it.updateStatus()
		it.updateType()
		it.updateFilterLevel(null)
		}
		list.add(FusedHome(value, home.top_updated_games))
		}
		@@ -1032,6 +1096,7 @@ class FusedAPIImpl @Inject constructor(
		home.popular_apps.forEach {
		it.updateStatus()
		it.updateType()
		it.updateFilterLevel(null)
		}
		list.add(FusedHome(value, home.popular_apps))
		}
		@@ -1041,6 +1106,7 @@ class FusedAPIImpl @Inject constructor(
		home.popular_games.forEach {
		it.updateStatus()
		it.updateType()
		it.updateFilterLevel(null)
		}
		list.add(FusedHome(value, home.popular_games))
		}
		@@ -1050,6 +1116,7 @@ class FusedAPIImpl @Inject constructor(
		home.popular_apps_in_last_24_hours.forEach {
		it.updateStatus()
		it.updateType()
		it.updateFilterLevel(null)
		}
		list.add(FusedHome(value, home.popular_apps_in_last_24_hours))
		}
		@@ -1059,6 +1126,7 @@ class FusedAPIImpl @Inject constructor(
		home.popular_games_in_last_24_hours.forEach {
		it.updateStatus()
		it.updateType()
		it.updateFilterLevel(null)
		}
		list.add(FusedHome(value, home.popular_games_in_last_24_hours))
		}
		@@ -1068,6 +1136,7 @@ class FusedAPIImpl @Inject constructor(
		home.discover.forEach {
		it.updateStatus()
		it.updateType()
		it.updateFilterLevel(null)
		}
		list.add(FusedHome(value, home.discover))
		}
		@@ -1091,7 +1160,9 @@ class FusedAPIImpl @Inject constructor(
		val chart = it.value.keys.iterator().next()
		val type = it.value.values.iterator().next()
		val result = gPlayAPIRepository.getTopApps(type, chart, authData).map { app ->
		app.transformToFusedApp()
		app.transformToFusedApp().apply {
		updateFilterLevel(authData)
		}
		}
		list.add(FusedHome(it.key, result))
		}

app/src/main/java/foundation/e/apps/api/fused/FusedAPIRepository.kt

+5 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import foundation.e.apps.api.fused.data.FusedApp
		import foundation.e.apps.api.fused.data.FusedCategory
		import foundation.e.apps.api.fused.data.FusedHome
		import foundation.e.apps.manager.database.fusedDownload.FusedDownload
		import foundation.e.apps.utils.enums.FilterLevel
		import foundation.e.apps.utils.enums.Origin
		import foundation.e.apps.utils.enums.ResultStatus
		import foundation.e.apps.utils.enums.Status
		@@ -73,6 +74,10 @@ class FusedAPIRepository @Inject constructor(
		return fusedAPIImpl.filterRestrictedGPlayApps(authData, appList)
		}

		suspend fun getAppFilterLevel(fusedApp: FusedApp, authData: AuthData?): FilterLevel {
		return fusedAPIImpl.getAppFilterLevel(fusedApp, authData)
		}

		suspend fun getApplicationDetails(
		id: String,
		packageName: String,

app/src/main/java/foundation/e/apps/api/fused/data/FusedApp.kt

+11 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		package foundation.e.apps.api.fused.data

		import com.aurora.gplayapi.Constants.Restriction
		import foundation.e.apps.utils.enums.FilterLevel
		import foundation.e.apps.utils.enums.Origin
		import foundation.e.apps.utils.enums.Status
		import foundation.e.apps.utils.enums.Type
		@@ -80,4 +81,14 @@ data class FusedApp(
		* Issue: https://gitlab.e.foundation/e/backlog/-/issues/5131 [2]
		*/
		var isPlaceHolder: Boolean = false,

		/*
		* Store the filter/restriction level.
		* If it is not NONE, then the app cannot be downloaded.
		* If it is FilterLevel.UI, then we should show "N/A" on install button.
		* If it is FilterLevel.DATA, then this app should not be displayed.
		*
		* Issue: https://gitlab.e.foundation/e/backlog/-/issues/5720
		*/
		var filterLevel: FilterLevel = FilterLevel.UNKNOWN
		)

app/src/main/java/foundation/e/apps/application/ApplicationFragment.kt

+48 −42

Original line number	Diff line number	Diff line
		@@ -59,6 +59,7 @@ import foundation.e.apps.utils.enums.Origin
		import foundation.e.apps.utils.enums.ResultStatus
		import foundation.e.apps.utils.enums.Status
		import foundation.e.apps.utils.enums.User
		import foundation.e.apps.utils.enums.isInitialized
		import foundation.e.apps.utils.modules.CommonUtilsModule.LIST_OF_NULL
		import foundation.e.apps.utils.modules.PWAManagerModule
		import foundation.e.apps.utils.parentFragment.TimeoutFragment
		@@ -360,6 +361,10 @@ class ApplicationFragment : TimeoutFragment(R.layout.fragment_application) {
		val appSize = binding.downloadInclude.appSize
		val fusedApp = applicationViewModel.fusedApp.value?.first ?: FusedApp()

		mainActivityViewModel.verifyUiFilter(fusedApp) {
		if (!fusedApp.filterLevel.isInitialized()) {
		return@verifyUiFilter
		}
		when (status) {
		Status.INSTALLED -> handleInstalled(
		installButton,
		@@ -406,6 +411,7 @@ class ApplicationFragment : TimeoutFragment(R.layout.fragment_application) {
		}
		}
		}
		}

		override fun onResume() {
		super.onResume()