clear code + (k_trash_version_available_more_fix)

iOSClient/AppDelegate.m

@@ -152,24 +152,11 @@
         NSLog(@"[LOG] Something went wrong while configuring Firebase");
     }
     
-    if (floor(NSFoundationVersionNumber) <= NSFoundationVersionNumber_iOS_9_x_Max) {
-        
-        UIUserNotificationType allNotificationTypes =(UIUserNotificationTypeSound | UIUserNotificationTypeAlert | UIUserNotificationTypeBadge);
-        UIUserNotificationSettings *settings = [UIUserNotificationSettings settingsForTypes:allNotificationTypes categories:nil];
-        
-        [[UIApplication sharedApplication] registerUserNotificationSettings:settings];
-        
-    } else {
-        
-        // iOS 10 or later
-#if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
-        // For iOS 10 display notification (sent via APNS)
-        [UNUserNotificationCenter currentNotificationCenter].delegate = self;
-        UNAuthorizationOptions authOptions = UNAuthorizationOptionAlert | UNAuthorizationOptionSound | UNAuthorizationOptionBadge;
-        [[UNUserNotificationCenter currentNotificationCenter] requestAuthorizationWithOptions:authOptions completionHandler:^(BOOL granted, NSError * _Nullable error) {
-        }];
-#endif
-    }
+    // Display notification (sent via APNS)
+    [UNUserNotificationCenter currentNotificationCenter].delegate = self;
+    UNAuthorizationOptions authOptions = UNAuthorizationOptionAlert | UNAuthorizationOptionSound | UNAuthorizationOptionBadge;
+    [[UNUserNotificationCenter currentNotificationCenter] requestAuthorizationWithOptions:authOptions completionHandler:^(BOOL granted, NSError * _Nullable error) {
+    }];
     
     [application registerForRemoteNotifications];
     [FIRMessaging messaging].delegate = self;

iOSClient/CCGlobal.h

@@ -302,6 +302,7 @@
 
 // Trash Version
 #define k_trash_version_available                       14
+#define k_trash_version_available_more_fix              15
 
 // Cell Reload Data Source
 #define k_action_NULL                                   0

iOSClient/Trash/Section/NCTrashSectionHeaderFooter.swift

@@ -36,6 +36,14 @@ class NCTrashSectionHeaderMenu: UICollectionReusableView {
     override func awakeFromNib() {
         super.awakeFromNib()
         
+        // Button More
+        let capabilities = NCManageDatabase.sharedInstance.getCapabilites()
+        if capabilities != nil && capabilities!.versionMajor >= Int(k_trash_version_available_more_fix) {
+            buttonMore.isHidden = false
+        } else {
+            buttonMore.isHidden = true
+        }
+        
         buttonSwitch.setImage(CCGraphics.changeThemingColorImage(UIImage.init(named: "switchList"), multiplier: 2, color: NCBrandColor.sharedInstance.icon), for: .normal)
         
         buttonOrder.setTitle("", for: .normal)

iOSClient/Trash/Section/NCTrashSectionHeaderMenu.xib

@@ -35,7 +35,7 @@
                         <action selector="touchUpInsideSwitch:" destination="tys-A2-nDX" eventType="touchUpInside" id="iT8-1j-fib"/>
                     </connections>
                 </button>
-                <button hidden="YES" opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="D0O-wK-14O" userLabel="buttonSwitch">
+                <button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="D0O-wK-14O" userLabel="buttonMore">
                     <rect key="frame" x="338" y="12.5" width="25" height="25"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="25" id="aEr-j8-JDO"/>