Loading app/src/main/java/foundation/e/apps/MainActivity.kt +2 −2 Original line number Diff line number Diff line Loading @@ -42,12 +42,12 @@ import foundation.e.apps.data.fusedDownload.models.FusedDownload import foundation.e.apps.data.login.LoginSourceGPlay import foundation.e.apps.data.preference.PreferenceManagerModule import foundation.e.apps.databinding.ActivityMainBinding import foundation.e.apps.ui.errors.CentralErrorHandler import foundation.e.apps.domain.errors.RetryMechanism import foundation.e.apps.install.updates.UpdatesNotifier import foundation.e.apps.presentation.login.LoginViewModel import foundation.e.apps.ui.MainActivityViewModel import foundation.e.apps.ui.application.subFrags.ApplicationDialogFragment import foundation.e.apps.ui.errors.CentralErrorHandler import foundation.e.apps.ui.purchase.AppPurchaseFragmentDirections import foundation.e.apps.ui.settings.SettingsFragment import foundation.e.apps.ui.setup.signin.SignInViewModel Loading Loading @@ -307,7 +307,7 @@ class MainActivity : AppCompatActivity() { ceh.getDialogForDataLoadError( context = this@MainActivity, result = it.data as ResultSupreme<*>, retryAction = { loginViewModel.checkLogin() }, retryAction = { loginViewModel.checkLogin() } )?.run { ceh.dismissAllAndShow(this) } } ) Loading app/src/main/java/foundation/e/apps/data/fused/FusedApiImpl.kt +0 −3 Original line number Diff line number Diff line Loading @@ -32,7 +32,6 @@ import com.aurora.gplayapi.data.models.SearchBundle import com.aurora.gplayapi.data.models.StreamCluster import dagger.hilt.android.qualifiers.ApplicationContext import foundation.e.apps.R import foundation.e.apps.data.Constants.timeoutDurationInMillis import foundation.e.apps.data.ResultSupreme import foundation.e.apps.data.cleanapk.CleanApkDownloadInfoFetcher import foundation.e.apps.data.cleanapk.CleanApkRetrofit Loading Loading @@ -68,10 +67,8 @@ import foundation.e.apps.install.pkg.PWAManagerModule import foundation.e.apps.install.pkg.PkgManagerModule import foundation.e.apps.ui.home.model.HomeChildFusedAppDiffUtil import kotlinx.coroutines.Deferred import kotlinx.coroutines.TimeoutCancellationException import kotlinx.coroutines.async import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.withTimeout import retrofit2.Response import timber.log.Timber import javax.inject.Inject Loading app/src/main/java/foundation/e/apps/domain/errors/RetryMechanism.kt +3 −4 Original line number Diff line number Diff line Loading @@ -27,7 +27,7 @@ class RetryMechanism { */ fun wrapWithRetry( retryBlock: () -> Unit, retryFailureBlock: () -> Unit, retryFailureBlock: () -> Unit ) { if (!retryEvaluator(retryBlock)) { retryFailureBlock() Loading @@ -49,7 +49,7 @@ class RetryMechanism { * @return true if retry conditions have not expired, false otherwise. */ private fun retryEvaluator( retryBlock: () -> Unit, retryBlock: () -> Unit ): Boolean { if (shouldFailRetry()) return false retryBlock() Loading @@ -64,5 +64,4 @@ class RetryMechanism { private fun shouldFailRetry(): Boolean { return autoRetryCount > 0 } } app/src/main/java/foundation/e/apps/receivers/DumpAuthData.kt +0 −1 Original line number Diff line number Diff line Loading @@ -24,7 +24,6 @@ import com.aurora.gplayapi.data.models.AuthData import com.google.gson.Gson import foundation.e.apps.data.Constants.ACTION_AUTHDATA_DUMP import foundation.e.apps.data.Constants.TAG_AUTHDATA_DUMP import foundation.e.apps.data.preference.DataStoreModule import org.json.JSONObject import timber.log.Timber Loading app/src/main/java/foundation/e/apps/ui/errors/CentralErrorHandler.kt +6 −6 Original line number Diff line number Diff line Loading @@ -38,7 +38,7 @@ class CentralErrorHandler { fun <T> getDialogForDataLoadError( context: Activity, result: ResultSupreme<T>, retryAction: () -> Unit, retryAction: () -> Unit ): AlertDialog.Builder? { return when (result) { is ResultSupreme.Timeout -> { Loading @@ -64,7 +64,7 @@ class CentralErrorHandler { logToDisplay: String = "", user: User, retryAction: () -> Unit, logoutAction: () -> Unit, logoutAction: () -> Unit ): AlertDialog.Builder { val customDialogView = getDialogCustomView(context, logToDisplay) val dialog = AlertDialog.Builder(context).apply { Loading Loading @@ -92,7 +92,7 @@ class CentralErrorHandler { private fun getDialogForTimeout( context: Activity, logToDisplay: String = "", retryAction: () -> Unit, retryAction: () -> Unit ): AlertDialog.Builder { val customDialogView = getDialogCustomView(context, logToDisplay) val dialog = AlertDialog.Builder(context).apply { Loading @@ -111,7 +111,7 @@ class CentralErrorHandler { private fun getDialogForOtherErrors( context: Activity, logToDisplay: String = "", retryAction: () -> Unit, retryAction: () -> Unit ): AlertDialog.Builder { val customDialogView = getDialogCustomView(context, logToDisplay) val dialog = AlertDialog.Builder(context).apply { Loading @@ -129,7 +129,7 @@ class CentralErrorHandler { private fun getDialogCustomView( context: Activity, logToDisplay: String, logToDisplay: String ): View { val dialogLayout = DialogErrorLogBinding.inflate(context.layoutInflater) dialogLayout.apply { Loading Loading
app/src/main/java/foundation/e/apps/MainActivity.kt +2 −2 Original line number Diff line number Diff line Loading @@ -42,12 +42,12 @@ import foundation.e.apps.data.fusedDownload.models.FusedDownload import foundation.e.apps.data.login.LoginSourceGPlay import foundation.e.apps.data.preference.PreferenceManagerModule import foundation.e.apps.databinding.ActivityMainBinding import foundation.e.apps.ui.errors.CentralErrorHandler import foundation.e.apps.domain.errors.RetryMechanism import foundation.e.apps.install.updates.UpdatesNotifier import foundation.e.apps.presentation.login.LoginViewModel import foundation.e.apps.ui.MainActivityViewModel import foundation.e.apps.ui.application.subFrags.ApplicationDialogFragment import foundation.e.apps.ui.errors.CentralErrorHandler import foundation.e.apps.ui.purchase.AppPurchaseFragmentDirections import foundation.e.apps.ui.settings.SettingsFragment import foundation.e.apps.ui.setup.signin.SignInViewModel Loading Loading @@ -307,7 +307,7 @@ class MainActivity : AppCompatActivity() { ceh.getDialogForDataLoadError( context = this@MainActivity, result = it.data as ResultSupreme<*>, retryAction = { loginViewModel.checkLogin() }, retryAction = { loginViewModel.checkLogin() } )?.run { ceh.dismissAllAndShow(this) } } ) Loading
app/src/main/java/foundation/e/apps/data/fused/FusedApiImpl.kt +0 −3 Original line number Diff line number Diff line Loading @@ -32,7 +32,6 @@ import com.aurora.gplayapi.data.models.SearchBundle import com.aurora.gplayapi.data.models.StreamCluster import dagger.hilt.android.qualifiers.ApplicationContext import foundation.e.apps.R import foundation.e.apps.data.Constants.timeoutDurationInMillis import foundation.e.apps.data.ResultSupreme import foundation.e.apps.data.cleanapk.CleanApkDownloadInfoFetcher import foundation.e.apps.data.cleanapk.CleanApkRetrofit Loading Loading @@ -68,10 +67,8 @@ import foundation.e.apps.install.pkg.PWAManagerModule import foundation.e.apps.install.pkg.PkgManagerModule import foundation.e.apps.ui.home.model.HomeChildFusedAppDiffUtil import kotlinx.coroutines.Deferred import kotlinx.coroutines.TimeoutCancellationException import kotlinx.coroutines.async import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.withTimeout import retrofit2.Response import timber.log.Timber import javax.inject.Inject Loading
app/src/main/java/foundation/e/apps/domain/errors/RetryMechanism.kt +3 −4 Original line number Diff line number Diff line Loading @@ -27,7 +27,7 @@ class RetryMechanism { */ fun wrapWithRetry( retryBlock: () -> Unit, retryFailureBlock: () -> Unit, retryFailureBlock: () -> Unit ) { if (!retryEvaluator(retryBlock)) { retryFailureBlock() Loading @@ -49,7 +49,7 @@ class RetryMechanism { * @return true if retry conditions have not expired, false otherwise. */ private fun retryEvaluator( retryBlock: () -> Unit, retryBlock: () -> Unit ): Boolean { if (shouldFailRetry()) return false retryBlock() Loading @@ -64,5 +64,4 @@ class RetryMechanism { private fun shouldFailRetry(): Boolean { return autoRetryCount > 0 } }
app/src/main/java/foundation/e/apps/receivers/DumpAuthData.kt +0 −1 Original line number Diff line number Diff line Loading @@ -24,7 +24,6 @@ import com.aurora.gplayapi.data.models.AuthData import com.google.gson.Gson import foundation.e.apps.data.Constants.ACTION_AUTHDATA_DUMP import foundation.e.apps.data.Constants.TAG_AUTHDATA_DUMP import foundation.e.apps.data.preference.DataStoreModule import org.json.JSONObject import timber.log.Timber Loading
app/src/main/java/foundation/e/apps/ui/errors/CentralErrorHandler.kt +6 −6 Original line number Diff line number Diff line Loading @@ -38,7 +38,7 @@ class CentralErrorHandler { fun <T> getDialogForDataLoadError( context: Activity, result: ResultSupreme<T>, retryAction: () -> Unit, retryAction: () -> Unit ): AlertDialog.Builder? { return when (result) { is ResultSupreme.Timeout -> { Loading @@ -64,7 +64,7 @@ class CentralErrorHandler { logToDisplay: String = "", user: User, retryAction: () -> Unit, logoutAction: () -> Unit, logoutAction: () -> Unit ): AlertDialog.Builder { val customDialogView = getDialogCustomView(context, logToDisplay) val dialog = AlertDialog.Builder(context).apply { Loading Loading @@ -92,7 +92,7 @@ class CentralErrorHandler { private fun getDialogForTimeout( context: Activity, logToDisplay: String = "", retryAction: () -> Unit, retryAction: () -> Unit ): AlertDialog.Builder { val customDialogView = getDialogCustomView(context, logToDisplay) val dialog = AlertDialog.Builder(context).apply { Loading @@ -111,7 +111,7 @@ class CentralErrorHandler { private fun getDialogForOtherErrors( context: Activity, logToDisplay: String = "", retryAction: () -> Unit, retryAction: () -> Unit ): AlertDialog.Builder { val customDialogView = getDialogCustomView(context, logToDisplay) val dialog = AlertDialog.Builder(context).apply { Loading @@ -129,7 +129,7 @@ class CentralErrorHandler { private fun getDialogCustomView( context: Activity, logToDisplay: String, logToDisplay: String ): View { val dialogLayout = DialogErrorLogBinding.inflate(context.layoutInflater) dialogLayout.apply { Loading