Merge pull request #1031 from nextcloud/fix-delete-notifications

Fix delete and delete-all notifications handling

.github/ISSUE_TEMPLATE.md

@@ -10,7 +10,7 @@
 
 ### Server configuration
 
-**Operating system**:
+**Operating system:**
 
 **Web server:**
 

CHANGELOG.md

@@ -6,6 +6,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.25.1] - 2019-12-08
+- See https://github.com/nextcloud/ios/milestone/59
+
+## [2.25.0] - 2019-11-20
+- See https://github.com/nextcloud/ios/milestone/58
+
+## [2.24.4] - 2019-11-03
+- See https://github.com/nextcloud/ios/milestone/57
+
 ## [2.24.3] - 2019-10-15
 - See https://github.com/nextcloud/ios/milestone/56
 

iOSClient/AppDelegate.m

@@ -569,13 +569,7 @@ PKPushRegistry *pushRegistry;
 
                     if (delete || deleteAll) {
                         
-                        if (deleteAll) {
-                            notificationId = 0;
-                        }
-                        
-                        [[OCNetworking sharedManager] deletingServerNotification:result.url notificationId:notificationId completion:^(NSString *message, NSInteger errorCode) {
-                            NSLog(@"Deleting Server Notification error: %ld", (long)errorCode);
-                        }];
+                        // TODO: Delete notifications locally
                         
                     } else {
                         

iOSClient/Main/CCSplit.m

@@ -276,6 +276,7 @@
     BOOL isRunningInFullScreen = CGRectEqualToRect([UIApplication sharedApplication].delegate.window.frame, [UIApplication sharedApplication].delegate.window.screen.bounds);
     
     // detect Dark Mode
+    /*
     if (@available(iOS 13.0, *)) {
         appDelegate.preferredUserInterfaceStyle = self.traitCollection.userInterfaceStyle;
         if ([CCUtility getDarkModeDetect]) {