From 60a974f96b0eff12af5c4ae226589656bd6d6c11 Mon Sep 17 00:00:00 2001 From: Rahul Kumar Patel Date: Sat, 10 Apr 2021 02:32:26 +0530 Subject: [PATCH] Do not trigger redownload when exception is thrown while installation --- .../aurora/store/view/ui/details/AppDetailsActivity.kt | 8 +++++++- .../com/aurora/store/view/ui/updates/UpdatesFragment.kt | 9 ++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsActivity.kt b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsActivity.kt index 7f33e4044..453531c07 100644 --- a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsActivity.kt +++ b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsActivity.kt @@ -292,6 +292,8 @@ class AppDetailsActivity : BaseDetailsActivity() { app.packageName, apkFiles.map { it.file } ) + } fail { + Log.e(it.stackTraceToString()) } runOnUiThread { @@ -677,8 +679,12 @@ class AppDetailsActivity : BaseDetailsActivity() { if (groupId == app.id && fetchGroup.groupDownloadProgress == 100) { status = download.status flip(0) - verifyAndInstall(fetchGroup.downloads) updateProgress(fetchGroup, -1, -1) + try { + verifyAndInstall(fetchGroup.downloads) + } catch (e: Exception) { + Log.e(e.stackTraceToString()) + } } } diff --git a/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt b/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt index 2232c8260..4383dcbfa 100644 --- a/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt @@ -25,6 +25,7 @@ import android.view.View import android.view.ViewGroup import androidx.lifecycle.ViewModelProvider import com.aurora.Constants +import com.aurora.extensions.stackTraceToString import com.aurora.extensions.toast import com.aurora.gplayapi.data.models.App import com.aurora.gplayapi.data.models.AuthData @@ -105,7 +106,11 @@ class UpdatesFragment : BaseFragment() { override fun onCompleted(groupId: Int, download: Download, fetchGroup: FetchGroup) { if (fetchGroup.groupDownloadProgress == 100) { VM.updateDownload(groupId, fetchGroup, isComplete = true) - install(download.tag!!, fetchGroup.downloads) + try { + install(download.tag!!, fetchGroup.downloads) + } catch (e: Exception) { + Log.e(e.stackTraceToString()) + } } } @@ -275,6 +280,8 @@ class UpdatesFragment : BaseFragment() { .filter { it.file.endsWith(".apk") } .map { it.file }.toList() ) + } fail { + Log.e(it.stackTraceToString()) } } }