From 1ad7a6fe934bc2796cbbd7c7e74517877451a7da Mon Sep 17 00:00:00 2001
From: vvb2060 <vvb2060@gmail.com>
Date: Thu, 15 Oct 2020 02:10:17 +0800
Subject: [PATCH] Update activity display when download fails

---
 .../magisk/core/download/BaseDownloader.kt      |  2 +-
 .../magisk/ui/install/InstallViewModel.kt       |  2 ++
 .../main/res/layout/fragment_install_md2.xml    | 17 +++++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/core/download/BaseDownloader.kt b/app/src/main/java/com/topjohnwu/magisk/core/download/BaseDownloader.kt
index b0394b8ec..7e20d0bef 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/download/BaseDownloader.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/download/BaseDownloader.kt
@@ -117,7 +117,7 @@ abstract class BaseDownloader : BaseService(), KoinComponent {
     fun Subject.notifyID() = hashCode()
 
     private fun notifyFail(subject: Subject) = lastNotify(subject.notifyID()) {
-        broadcast(-1f, subject)
+        broadcast(-2f, subject)
         it.setContentText(getString(R.string.download_file_error))
             .setSmallIcon(android.R.drawable.stat_notify_error)
             .setOngoing(false)
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
index e5b3cc1aa..3c04bfa52 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
@@ -75,6 +75,8 @@ class InstallViewModel(
         this.progress = progress.times(100).roundToInt()
         if (this.progress >= 100) {
             state = State.LOADED
+        } else if (this.progress < -150) {
+            state = State.LOADING_FAILED
         }
     }
 
diff --git a/app/src/main/res/layout/fragment_install_md2.xml b/app/src/main/res/layout/fragment_install_md2.xml
index 74728c388..50f23597b 100644
--- a/app/src/main/res/layout/fragment_install_md2.xml
+++ b/app/src/main/res/layout/fragment_install_md2.xml
@@ -306,6 +306,23 @@
 
             </LinearLayout>
 
+            <LinearLayout
+                goneUnless="@{viewModel.loadFailed}"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="@string/download_file_error"
+                    android:textAppearance="@style/AppearanceFoundation.Title" />
+
+            </LinearLayout>
+
         </FrameLayout>
 
     </androidx.core.widget.NestedScrollView>