From 2756877d5b1d67b574caea5bbae4b303f899558d Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Wed, 5 Apr 2023 11:15:39 +0200
Subject: [PATCH] Revert "[TMP] Get widgets / stickers working again"

This reverts commit c47b9ee64d1d760703ade0e5612dfb2c817fd58e.
---
 .../im/vector/app/core/platform/VectorBaseFragment.kt | 11 -----------
 .../im/vector/app/features/widgets/WidgetFragment.kt  |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
index a74f480810..0c41673dd4 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
@@ -291,17 +291,6 @@ abstract class VectorBaseFragment<VB : ViewBinding> : Fragment(), MavericksView
         }
     }
 
-    // SC-TODO: this is the pre-v1.5.18 implementation of observeViewEvents, to fix custom widgets. Revert me once upstream implements a fix.
-    protected fun <T : VectorViewEvents> VectorViewModel<*, *, T>.oldObserveViewEvents(observer: (T) -> Unit) {
-        val tag = this@VectorBaseFragment::class.simpleName.toString()
-        viewEvents
-                .stream(tag)
-                .onEach {
-                    observer(it)
-                }
-                .launchIn(viewLifecycleOwner.lifecycleScope)
-    }
-
     /* ==========================================================================================
      * Views
      * ========================================================================================== */
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
index b68daa8635..944ee627d7 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
@@ -92,7 +92,7 @@ class WidgetFragment :
         if (fragmentArgs.kind.isAdmin()) {
             viewModel.getPostAPIMediator().setWebView(views.widgetWebView)
         }
-        viewModel.oldObserveViewEvents {
+        viewModel.observeViewEvents {
             Timber.v("Observed view events: $it")
             when (it) {
                 is WidgetViewEvents.DisplayTerms -> displayTerms(it)