Merge branch '0000-main-3.6.2_rebase' into 'main' (3ee82898) · Commits · e / os / App Lounge

app/src/main/java/foundation/e/apps/data/install/core/helper/DownloadUrlRefresher.kt

+2 −2

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

		package foundation.e.apps.data.install.core.helper

		import com.aurora.gplayapi.exceptions.InternalException
		import com.aurora.gplayapi.exceptions.GooglePlayException
		import foundation.e.apps.data.ResultSupreme
		import foundation.e.apps.data.application.AppManager
		import foundation.e.apps.data.application.ApplicationRepository
		@@ -64,7 +64,7 @@ class DownloadUrlRefresher @Inject constructor(
		): Boolean {
		return when (throwable) {
		is CancellationException -> throw throwable
		is InternalException.AppNotPurchased -> {
		is GooglePlayException.AppNotPurchased -> {
		handleAppNotPurchased(appInstall)
		false
		}

app/src/main/java/foundation/e/apps/data/playstore/PlayStoreRepository.kt

+5 −5

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ import com.aurora.gplayapi.data.models.Category
		import com.aurora.gplayapi.data.models.ContentRating
		import com.aurora.gplayapi.data.models.PlayFile
		import com.aurora.gplayapi.data.models.StreamCluster
		import com.aurora.gplayapi.exceptions.InternalException
		import com.aurora.gplayapi.exceptions.GooglePlayException
		import com.aurora.gplayapi.helpers.AppDetailsHelper
		import com.aurora.gplayapi.helpers.ContentRatingHelper
		import com.aurora.gplayapi.helpers.PurchaseHelper
		@@ -137,7 +137,7 @@ class PlayStoreRepository @Inject constructor(
		val subCategoryHelper = WebCategoryStreamHelper().using(gPlayHttpClient)

		if (!pageUrl.isNullOrEmpty()) {
		return subCategoryHelper.nextStreamCluster(pageUrl)
		return subCategoryHelper.nextStreamCluster(id = -1, nextPageUrl = pageUrl)
		}

		val bundle = subCategoryHelper.fetch(upperCaseCategory(category))
		@@ -226,7 +226,7 @@ class PlayStoreRepository @Inject constructor(
		exception = exception,
		request = request
		)
		} catch (exception: InternalException) {
		} catch (exception: GooglePlayException) {
		recoverFromPlayRequestFailure(
		operationName = operationName,
		status = exception.gplayInternalExceptionHttpStatus(),
		@@ -269,7 +269,7 @@ class PlayStoreRepository @Inject constructor(
		} catch (exception: GplayHttpRequestException) {
		Timber.w(exception, "Couldn't fetch %s.", operationName)
		emptyList()
		} catch (exception: InternalException) {
		} catch (exception: GooglePlayException) {
		Timber.w(exception, "Couldn't fetch %s.", operationName)
		emptyList()
		}
		@@ -325,7 +325,7 @@ class PlayStoreRepository @Inject constructor(

		private fun GplayHttpRequestException.toAppDetailsLookupFailure(): Exception {
		return if (status == HttpURLConnection.HTTP_NOT_FOUND) {
		InternalException.AppNotFound()
		GooglePlayException.NotFound()
		} else {
		this
		}

app/src/main/java/foundation/e/apps/domain/ValidateAppAgeLimitUseCase.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@
		package foundation.e.apps.domain

		import com.aurora.gplayapi.data.models.ContentRating
		import com.aurora.gplayapi.exceptions.InternalException
		import com.aurora.gplayapi.exceptions.GooglePlayException
		import foundation.e.apps.contract.ParentalControlContract.Age
		import foundation.e.apps.data.ResultSupreme
		import foundation.e.apps.data.application.apps.AppsApi
		@@ -163,7 +163,7 @@ class ValidateAppAgeLimitUseCase @Inject constructor(
		if (app.contentRating.id.isEmpty()) {
		val fetchedContentRating = try {
		gPlayContentRatingRepository.getEnglishContentRating(app.packageName)
		} catch (exception: InternalException.AppNotFound) {
		} catch (exception: GooglePlayException.NotFound) {
		Timber.w(exception, "Error fetching age ratings for the package : ${app.packageName}")
		return false
		}

app/src/main/java/foundation/e/apps/domain/install/GetAppDetailsUseCase.kt

+2 −2

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

		package foundation.e.apps.domain.install

		import com.aurora.gplayapi.exceptions.InternalException
		import com.aurora.gplayapi.exceptions.GooglePlayException
		import foundation.e.apps.data.application.data.Application
		import foundation.e.apps.data.blockedApps.BlockedAppRepository
		import foundation.e.apps.data.cleanapk.repositories.CleanApkAppsRepository
		@@ -130,7 +130,7 @@ class GetAppDetailsUseCase @Inject constructor(
		private suspend fun getPlayStoreAppDetails(packageName: String): Application {
		return try {
		playStoreRepository.getAppDetails(packageName)
		} catch (e: InternalException.AppNotFound) {
		} catch (e: GooglePlayException.NotFound) {
		throw UnavailableAppException(
		"$packageName wasn't found in PlayStore",
		cause = e

app/src/main/java/foundation/e/apps/ui/application/ApplicationViewModel.kt

+3 −3

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ package foundation.e.apps.ui.application
		import androidx.lifecycle.MutableLiveData
		import androidx.lifecycle.viewModelScope
		import com.aurora.gplayapi.data.models.ContentRating
		import com.aurora.gplayapi.exceptions.InternalException
		import com.aurora.gplayapi.exceptions.GooglePlayException
		import dagger.hilt.android.lifecycle.HiltViewModel
		import foundation.e.apps.R
		import foundation.e.apps.data.application.ApplicationRepository
		@@ -109,10 +109,10 @@ class ApplicationViewModel @Inject constructor(

		updateShareVisibilityState(app.shareUri.toString())
		updateAppContentRatingState(app, result.second)
		} catch (e: InternalException.AppNotFound) {
		} catch (_: GooglePlayException.NotFound) {
		_errorMessageLiveData.postValue(R.string.app_not_found)
		scheduleAutoRedirect()
		} catch (e: Exception) {
		} catch (_: Exception) {
		_errorMessageLiveData.postValue(R.string.unknown_error)
		}
		}