From 02d54878c315e765d0264d951caedf1752d3a012 Mon Sep 17 00:00:00 2001
From: sim <git@sgougeon.fr>
Date: Wed, 24 Aug 2022 22:50:08 +0200
Subject: [PATCH] Set distributor dialog always cancelable

ATM, it uses the default fallback if cancelled
---
 .../java/im/vector/app/core/pushers/UnifiedPushHelper.kt   | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt b/vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt
index 0993485471..de5b881029 100644
--- a/vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt
@@ -104,8 +104,7 @@ class UnifiedPushHelper @Inject constructor(
                         pushersManager = pushersManager,
                         onDoneRunnable = onDoneRunnable,
                         distributors = distributors,
-                        unregisterFirst = force,
-                        cancellable = !force
+                        unregisterFirst = force
                 )
             }
         }
@@ -122,7 +121,6 @@ class UnifiedPushHelper @Inject constructor(
                 pushersManager,
                 onDoneRunnable, distributors,
                 unregisterFirst = true,
-                cancellable = true,
         )
     }
 
@@ -132,7 +130,6 @@ class UnifiedPushHelper @Inject constructor(
             onDoneRunnable: Runnable?,
             distributors: List<String>,
             unregisterFirst: Boolean,
-            cancellable: Boolean,
     ) {
         val internalDistributorName = stringProvider.getString(
                 if (fcmHelper.isFirebaseAvailable()) {
@@ -176,7 +173,7 @@ class UnifiedPushHelper @Inject constructor(
                     UnifiedPush.registerApp(context)
                     onDoneRunnable?.run()
                 }
-                .setCancelable(cancellable)
+                .setCancelable(true)
                 .show()
     }