From bb4ec4f5422384a0655baf73aaddcbc13204373b Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date: Wed, 25 Jan 2023 14:45:17 +0100
Subject: [PATCH 1/2] Call push rule /actions api before the /enabled api

---
 .../session/pushers/UpdatePushRuleActionsTask.kt   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt
index 454b9cdd80..ec6b5d5268 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt
@@ -34,10 +34,16 @@ internal interface UpdatePushRuleActionsTask : Task<UpdatePushRuleActionsTask.Pa
 
 internal class DefaultUpdatePushRuleActionsTask @Inject constructor(
         private val pushRulesApi: PushRulesApi,
-        private val globalErrorReceiver: GlobalErrorReceiver
+        private val globalErrorReceiver: GlobalErrorReceiver,
 ) : UpdatePushRuleActionsTask {
 
     override suspend fun execute(params: UpdatePushRuleActionsTask.Params) {
+        if (params.actions != null) {
+            val body = mapOf("actions" to params.actions.toJson())
+            executeRequest(globalErrorReceiver) {
+                pushRulesApi.updateRuleActions(params.kind.value, params.ruleId, body)
+            }
+        }
         executeRequest(globalErrorReceiver) {
             pushRulesApi.updateEnableRuleStatus(
                     params.kind.value,
@@ -45,11 +51,5 @@ internal class DefaultUpdatePushRuleActionsTask @Inject constructor(
                     EnabledBody(params.enable)
             )
         }
-        if (params.actions != null) {
-            val body = mapOf("actions" to params.actions.toJson())
-            executeRequest(globalErrorReceiver) {
-                pushRulesApi.updateRuleActions(params.kind.value, params.ruleId, body)
-            }
-        }
     }
 }

From 18f1360ffa5ad10ae4775439759d10b3c7b50279 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date: Wed, 25 Jan 2023 14:52:30 +0100
Subject: [PATCH 2/2] Adding changelog entry

---
 changelog.d/8005.sdk | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/8005.sdk

diff --git a/changelog.d/8005.sdk b/changelog.d/8005.sdk
new file mode 100644
index 0000000000..1849776d50
--- /dev/null
+++ b/changelog.d/8005.sdk
@@ -0,0 +1 @@
+[Push rules] Call /actions api before /enabled api