From ed822becc68c16e03330b0139a7287861ccf72de Mon Sep 17 00:00:00 2001
From: aqulu <dev@aqu.lu>
Date: Wed, 9 Dec 2020 08:39:00 +0900
Subject: [PATCH] Fix try-catch behavior of sendStateEvent actions

Signed-off-by: aqulu <dev@aqu.lu>
---
 .../features/widgets/WidgetPostAPIHandler.kt  | 52 +++++++++++--------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
index fbd08b0c9f..3906ea687c 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
@@ -22,6 +22,7 @@ import com.squareup.inject.assisted.AssistedInject
 import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
 import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
@@ -312,18 +313,12 @@ class WidgetPostAPIHandler @AssistedInject constructor(@Assisted private val roo
 
         val params = HashMap<String, Any>()
         params["status"] = status
-
-        GlobalScope.launch {
-            try {
-                room.sendStateEvent(
-                        eventType = EventType.PLUMBING,
-                        stateKey = null,
-                        body = params
-                )
-                widgetPostAPIMediator.sendSuccess(eventData)
-            } catch (failure: Exception) {
-                widgetPostAPIMediator.sendError(stringProvider.getString(R.string.widget_integration_failed_to_send_request), eventData)
-            }
+        launchWidgetAPIAction(widgetPostAPIMediator, eventData) {
+            room.sendStateEvent(
+                    eventType = EventType.PLUMBING,
+                    stateKey = null,
+                    body = params
+            )
         }
     }
 
@@ -342,17 +337,13 @@ class WidgetPostAPIHandler @AssistedInject constructor(@Assisted private val roo
         Timber.d(description)
         val content = eventData["content"] as JsonDict
         val stateKey = "_$userId"
-        GlobalScope.launch {
-            try {
-                room.sendStateEvent(
-                        eventType = EventType.BOT_OPTIONS,
-                        stateKey = stateKey,
-                        body = content
-                )
-                widgetPostAPIMediator.sendSuccess(eventData)
-            } catch (failure: Exception) {
-                widgetPostAPIMediator.sendError(stringProvider.getString(R.string.widget_integration_failed_to_send_request), eventData)
-            }
+
+        launchWidgetAPIAction(widgetPostAPIMediator, eventData) {
+            room.sendStateEvent(
+                    eventType = EventType.BOT_OPTIONS,
+                    stateKey = stateKey,
+                    body = content
+            )
         }
     }
 
@@ -471,4 +462,19 @@ class WidgetPostAPIHandler @AssistedInject constructor(@Assisted private val roo
     private fun createWidgetAPICallback(widgetPostAPIMediator: WidgetPostAPIMediator, eventData: JsonDict): WidgetAPICallback {
         return WidgetAPICallback(widgetPostAPIMediator, eventData, stringProvider)
     }
+
+    private fun launchWidgetAPIAction(widgetPostAPIMediator: WidgetPostAPIMediator, eventData: JsonDict, block: suspend () -> Unit): Job {
+        return GlobalScope.launch {
+            kotlin.runCatching {
+                block()
+            }.fold(
+                    onSuccess = {
+                        widgetPostAPIMediator.sendSuccess(eventData)
+                    },
+                    onFailure = {
+                        widgetPostAPIMediator.sendError(stringProvider.getString(R.string.widget_integration_failed_to_send_request), eventData)
+                    }
+            )
+        }
+    }
 }