Merge pull request #8006 from vector-im/feature/mna/push-rules-api-order

[Push rules] Call /actions api before /enabled api (PSG-1099)

Author: mnaturel

changelog.d/8005.sdk

@@ -0,0 +1 @@
+[Push rules] Call /actions api before /enabled api

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt

@@ -34,22 +34,22 @@ 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,
                     params.ruleId,
                     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)
-            }
-        }
     }
 }