Explorar o código

Fix sorting

Signed-off-by: Philippe Weidmann <philippe.weidmann@infomaniak.com>
Philippe Weidmann %!s(int64=5) %!d(string=hai) anos
pai
achega
a046efd623
Modificáronse 1 ficheiros con 4 adicións e 7 borrados
  1. 4 7
      iOSClient/Main/Menu/CCMain+Menu.swift

+ 4 - 7
iOSClient/Main/Menu/CCMain+Menu.swift

@@ -39,11 +39,10 @@ extension CCMain {
                 selected: CCUtility.getOrderSettings() == "fileName",
                 on: CCUtility.getAscendingSettings(),
                 action: { menuAction in
-                    if (CCUtility.getOrderSettings() == "fileName" && CCUtility.getAscendingSettings()) {
+                    if(CCUtility.getOrderSettings() == "fileName") {
                         CCUtility.setAscendingSettings(!CCUtility.getAscendingSettings())
                     } else {
                         CCUtility.setOrderSettings("fileName")
-                        CCUtility.setAscendingSettings(true)
                     }
 
                     NotificationCenter.default.post(name: Notification.Name.init(rawValue: "clearDateReadDataSource"), object: nil)
@@ -60,11 +59,10 @@ extension CCMain {
                 selected: CCUtility.getOrderSettings() == "date",
                 on: CCUtility.getAscendingSettings(),
                 action: { menuAction in
-                    if(CCUtility.getOrderSettings() == "date" && CCUtility.getAscendingSettings()) {
+                    if(CCUtility.getOrderSettings() == "date") {
                         CCUtility.setAscendingSettings(!CCUtility.getAscendingSettings())
                     } else {
                         CCUtility.setOrderSettings("date")
-                        CCUtility.setAscendingSettings(true)
                     }
 
                     NotificationCenter.default.post(name: Notification.Name.init(rawValue: "clearDateReadDataSource"), object: nil)
@@ -81,13 +79,12 @@ extension CCMain {
                 selected: CCUtility.getOrderSettings() == "size",
                 on: CCUtility.getAscendingSettings(),
                 action: { menuAction in
-                    if(CCUtility.getOrderSettings() == "size" && CCUtility.getAscendingSettings()) {
+                    if(CCUtility.getOrderSettings() == "size") {
                         CCUtility.setAscendingSettings(!CCUtility.getAscendingSettings())
                     } else {
                         CCUtility.setOrderSettings("size")
-                        CCUtility.setAscendingSettings(true)
                     }
-
+                    
                     NotificationCenter.default.post(name: Notification.Name.init(rawValue: "clearDateReadDataSource"), object: nil)
                 }
             )