From 796c16237d33d8085f718aeb889cdca7d754b550 Mon Sep 17 00:00:00 2001
From: Viktor De Pasquale <neytireyqa@gmail.com>
Date: Sun, 14 Apr 2019 12:21:04 +0200
Subject: [PATCH] Fixed same events not being able to propagate consecutively

---
 .../com/topjohnwu/magisk/model/events/ViewEvents.kt    | 10 +++++-----
 .../java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt | 10 +++++-----
 .../com/topjohnwu/magisk/ui/home/MagiskFragment.kt     |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt b/app/src/main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt
index bf405b0b3..fbb813c18 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt
@@ -5,10 +5,10 @@ import com.skoumal.teanity.viewevents.ViewEvent
 
 data class OpenLinkEvent(val url: String) : ViewEvent()
 
-object ManagerInstallEvent : ViewEvent()
-object MagiskInstallEvent : ViewEvent()
+class ManagerInstallEvent : ViewEvent()
+class MagiskInstallEvent : ViewEvent()
 
-object ManagerChangelogEvent : ViewEvent()
-object MagiskChangelogEvent : ViewEvent()
+class ManagerChangelogEvent : ViewEvent()
+class MagiskChangelogEvent : ViewEvent()
 
-object UninstallEvent : ViewEvent()
+class UninstallEvent : ViewEvent()
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
index 76fafc1d0..e257874b9 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
@@ -80,18 +80,18 @@ class HomeViewModel(
     fun twitterPressed() = OpenLinkEvent(Const.Url.TWITTER_URL).publish()
     fun githubPressed() = OpenLinkEvent(Const.Url.REPO_URL).publish()
     fun xdaPressed() = OpenLinkEvent(Const.Url.XDA_THREAD).publish()
-    fun uninstallPressed() = UninstallEvent.publish()
+    fun uninstallPressed() = UninstallEvent().publish()
 
     fun advancedPressed() = isAdvancedExpanded.toggle()
 
     fun installPressed(item: MagiskItem) = when (item) {
-        MagiskItem.MANAGER -> ManagerInstallEvent.publish()
-        MagiskItem.MAGISK -> MagiskInstallEvent.publish()
+        MagiskItem.MANAGER -> ManagerInstallEvent().publish()
+        MagiskItem.MAGISK -> MagiskInstallEvent().publish()
     }
 
     fun cardPressed(item: MagiskItem) = when (item) {
-        MagiskItem.MANAGER -> ManagerChangelogEvent.publish()
-        MagiskItem.MAGISK -> MagiskChangelogEvent.publish()
+        MagiskItem.MANAGER -> ManagerChangelogEvent().publish()
+        MagiskItem.MAGISK -> MagiskChangelogEvent().publish()
     }
 
     fun refresh() {
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/home/MagiskFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/home/MagiskFragment.kt
index 5f602cc1f..55f486503 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/home/MagiskFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/home/MagiskFragment.kt
@@ -67,7 +67,7 @@ class MagiskFragment : NewMagiskFragment<HomeViewModel, com.topjohnwu.magisk.dat
     private fun installMagisk() {
         // Show Manager update first
         if (Config.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
-            ManagerInstallDialog(requireActivity()).show()
+            installManager()
             return
         }
         //FIXME dialog requires old base