Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc89ebd0 authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Use new InternalException exceptions

parent 59b4d21a

app/src/main/java/foundation/e/apps/install/workmanager/AppInstallProcessor.kt

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
package foundation.e.apps.install.workmanager



import android.content.Context

import com.aurora.gplayapi.exceptions.ApiException

import com.aurora.gplayapi.exceptions.InternalException

import dagger.hilt.android.qualifiers.ApplicationContext

import foundation.e.apps.R

import foundation.e.apps.data.ResultSupreme
@@ -174,7 +174,7 @@ class AppInstallProcessor @Inject constructor( 
    private suspend fun updateDownloadUrls(appInstall: AppInstall): Boolean {

        try {

            updateFusedDownloadWithAppDownloadLink(appInstall)

        } catch (e: ApiException.AppNotPurchased) {

        } catch (e: InternalException.AppNotPurchased) {

            appInstallComponents.appManagerWrapper.addFusedDownloadPurchaseNeeded(appInstall)

            EventBus.invokeEvent(AppEvent.AppPurchaseEvent(appInstall))

            return false

app/src/main/java/foundation/e/apps/ui/MainActivity.kt

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import androidx.navigation.fragment.NavHostFragment 
import androidx.navigation.ui.NavigationUI

import androidx.navigation.ui.setupWithNavController

import com.aurora.gplayapi.data.models.AuthData

import com.aurora.gplayapi.exceptions.ApiException

import com.aurora.gplayapi.exceptions.InternalException

import com.google.android.material.bottomnavigation.BottomNavigationView

import com.google.android.material.snackbar.Snackbar

import dagger.hilt.android.AndroidEntryPoint
@@ -285,7 +285,7 @@ class MainActivity : AppCompatActivity() { 
    private fun observeErrorMessage() {

        viewModel.errorMessage.observe(this) {

            when (it) {

                is ApiException.AppNotPurchased -> showSnackbarMessage(getString(R.string.message_app_available_later))

                is InternalException.AppNotPurchased -> showSnackbarMessage(getString(R.string.message_app_available_later))

                else -> showSnackbarMessage(

                    it.localizedMessage ?: getString(R.string.unknown_error)

                )

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

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import androidx.lifecycle.MutableLiveData 
import androidx.lifecycle.viewModelScope

import com.aurora.gplayapi.data.models.AuthData

import com.aurora.gplayapi.data.models.ContentRating

import com.aurora.gplayapi.exceptions.ApiException

import com.aurora.gplayapi.exceptions.InternalException

import dagger.hilt.android.lifecycle.HiltViewModel

import foundation.e.apps.R

import foundation.e.apps.data.application.ApplicationRepository
@@ -164,7 +164,7 @@ class ApplicationViewModel @Inject constructor( 
                    exceptionsList.add(exception)

                    exceptionsLiveData.postValue(exceptionsList)

                }

            } catch (e: ApiException.AppNotFound) {

            } catch (e: InternalException.AppNotFound) {

                _errorMessageLiveData.postValue(R.string.app_not_found)

            } catch (e: Exception) {

                _errorMessageLiveData.postValue(R.string.unknown_error)