Revert "Add new action to block subscription requests, fixes #1320"

This reverts commit 733f7d5.
monal-im · Jan 4, 2025 · da51a6d · da51a6d
1 parent 17ca048
commit da51a6d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 29 deletions.
diff --git a/Monal/Classes/ContactRequestsMenu.swift b/Monal/Classes/ContactRequestsMenu.swift
@@ -28,17 +28,6 @@ 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
@@ -443,11 +443,6 @@ -(BOOL) application:(UIApplication*) application didFinishLaunchingWithOptions:(
         title:NSLocalizedString(@"Deny new contact", @"")
         options:UNNotificationActionOptionNone
     ];
-    UNNotificationAction* blockSubscriptionAction = [UNNotificationAction
-        actionWithIdentifier:@"BLOCK_SUBSCRIPTION_ACTION"
-        title:NSLocalizedString(@"Block new contact", @"")
-        options:UNNotificationActionOptionNone
-    ];
     if(@available(iOS 15.0, macCatalyst 15.0, *))
     {
         replyAction = [UNTextInputNotificationAction
@@ -474,12 +469,6 @@ -(BOOL) application:(UIApplication*) application didFinishLaunchingWithOptions:(
             actionWithIdentifier:@"DENY_SUBSCRIPTION_ACTION"
             title:NSLocalizedString(@"Deny new contact", @"")
             options:UNNotificationActionOptionNone
-            icon:[UNNotificationActionIcon iconWithSystemImageName:@"person.crop.circle.badge.minus"]
-        ];
-        blockSubscriptionAction = [UNNotificationAction
-            actionWithIdentifier:@"BLOCK_SUBSCRIPTION_ACTION"
-            title:NSLocalizedString(@"Block new contact", @"")
-            options:UNNotificationActionOptionNone
             icon:[UNNotificationActionIcon iconWithSystemImageName:@"person.crop.circle.badge.xmark"]
         ];
     }
@@ -495,7 +484,7 @@ -(BOOL) application:(UIApplication*) application didFinishLaunchingWithOptions:(
     ];
     UNNotificationCategory* subscriptionCategory = [UNNotificationCategory
         categoryWithIdentifier:@"subscription"
-        actions:@[approveSubscriptionAction, denySubscriptionAction, blockSubscriptionAction]
+        actions:@[approveSubscriptionAction, denySubscriptionAction]
         intentIdentifiers:@[]
         options:UNNotificationCategoryOptionCustomDismissAction
     ];
@@ -1023,12 +1012,6 @@ -(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)