Add new action to block subscription requests, fixes #1320

monal-im · Jan 4, 2025 · c8f504b · c8f504b
1 parent c8e488f
commit c8f504b
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/Monal/Classes/ContactRequestsMenu.swift b/Monal/Classes/ContactRequestsMenu.swift
@@ -28,6 +28,17 @@ struct ContactRequestsMenuEntry: View {
                 //see https://www.hackingwithswift.com/forums/swiftui/tap-button-in-hstack-activates-all-button-actions-ios-14-swiftui-2/2952
                 .buttonStyle(BorderlessButtonStyle())
 
+                Button {
+                    // deny request
+                    MLXMPPManager.sharedInstance().remove(contact)
+                    MLXMPPManager.sharedInstance().block(true, contact:contact)
+                } label: {
+                    Image(systemName: "xmark.circle")
+                        .foregroundStyle(Color.red)
+                }
+                //see https://www.hackingwithswift.com/forums/swiftui/tap-button-in-hstack-activates-all-button-actions-ios-14-swiftui-2/2952
+                .buttonStyle(BorderlessButtonStyle())
+
                 Button {
                     // deny request
                     MLXMPPManager.sharedInstance().remove(contact)

diff --git a/Monal/Classes/MonalAppDelegate.m b/Monal/Classes/MonalAppDelegate.m
@@ -452,6 +452,12 @@ -(BOOL) application:(UIApplication*) application didFinishLaunchingWithOptions:(
         actionWithIdentifier:@"DENY_SUBSCRIPTION_ACTION"
         title:NSLocalizedString(@"Deny new contact", @"")
         options:UNNotificationActionOptionNone
+        icon:[UNNotificationActionIcon iconWithSystemImageName:@"person.crop.circle.badge.minus"]
+    ];
+    UNNotificationAction* blockSubscriptionAction = [UNNotificationAction
+        actionWithIdentifier:@"BLOCK_SUBSCRIPTION_ACTION"
+        title:NSLocalizedString(@"Block new contact", @"")
+        options:UNNotificationActionOptionNone
         icon:[UNNotificationActionIcon iconWithSystemImageName:@"person.crop.circle.badge.xmark"]
     ];
 
@@ -467,7 +473,7 @@ -(BOOL) application:(UIApplication*) application didFinishLaunchingWithOptions:(
     ];
     UNNotificationCategory* subscriptionCategory = [UNNotificationCategory
         categoryWithIdentifier:@"subscription"
-        actions:@[approveSubscriptionAction, denySubscriptionAction]
+        actions:@[approveSubscriptionAction, denySubscriptionAction, blockSubscriptionAction]
         intentIdentifiers:@[]
         options:UNNotificationCategoryOptionCustomDismissAction
     ];
@@ -998,6 +1004,12 @@ -(void) userNotificationCenter:(UNUserNotificationCenter*) center didReceiveNoti
             DDLogInfo(@"DENY_SUBSCRIPTION_ACTION triggered...");
             [[MLXMPPManager sharedInstance] removeContact:fromContact];
         }
+        else if([response.actionIdentifier isEqualToString:@"BLOCK_SUBSCRIPTION_ACTION"])
+        {
+            DDLogInfo(@"BLOCK_SUBSCRIPTION_ACTION triggered...");
+            [[MLXMPPManager sharedInstance] removeContact:fromContact];
+            [[MLXMPPManager sharedInstance] block:YES contact:fromContact];
+        }
         else if([response.actionIdentifier isEqualToString:@"com.apple.UNNotificationDefaultActionIdentifier"])     //open chat of this contact
             dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), ^{
                 while(self.activeChats == nil)