use status

iOSClient/UserStatus/NCUserStatus.storyboard

@@ -329,11 +329,18 @@
                             <constraint firstItem="vDu-zF-Fre" firstAttribute="trailing" secondItem="ldK-hD-vsJ" secondAttribute="trailing" constant="5" id="yZf-48-jHR"/>
                         </constraints>
                     </view>
-                    <navigationItem key="navigationItem" id="jEA-I6-e1c"/>
+                    <navigationItem key="navigationItem" id="jEA-I6-e1c">
+                        <barButtonItem key="leftBarButtonItem" title="Cancel" id="ILZ-fb-noY">
+                            <connections>
+                                <action selector="actionCancel:" destination="Y6W-OH-hqX" id="Xb3-GT-3HC"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
                     <connections>
                         <outlet property="awayButton" destination="iqo-IM-261" id="iYQ-Pd-j9h"/>
                         <outlet property="awayImage" destination="4EB-gX-bxj" id="GCs-RA-aok"/>
                         <outlet property="awayLabel" destination="KUE-W1-haU" id="ujx-v9-M8H"/>
+                        <outlet property="buttonCancel" destination="ILZ-fb-noY" id="ZJF-IQ-FaX"/>
                         <outlet property="clearStatusMessageAfterLabel" destination="rha-b0-jMR" id="kg6-aA-tCj"/>
                         <outlet property="clearStatusMessageAfterText" destination="isA-Km-19L" id="mBu-6h-tLN"/>
                         <outlet property="clearStatusMessageButton" destination="3CT-dJ-sEj" id="wo5-XE-QgX"/>

iOSClient/UserStatus/NCUserStatus.swift

@@ -29,6 +29,8 @@ import NCCommunication
 @available(iOS 13.0, *)
 class NCUserStatus: UIViewController {
     
+    @IBOutlet weak var buttonCancel: UIBarButtonItem!
+
     @IBOutlet weak var onlineButton: UIButton!
     @IBOutlet weak var onlineImage: UIImageView!
     @IBOutlet weak var onlineLabel: UILabel!
@@ -69,6 +71,8 @@ class NCUserStatus: UIViewController {
         
         self.navigationItem.title = NSLocalizedString("_online_status_", comment: "")
 
+        buttonCancel.title = NSLocalizedString("_cancel_", comment: "")
+
         onlineButton.layer.cornerRadius = 10
         onlineButton.layer.masksToBounds = true
         onlineButton.backgroundColor = NCBrandColor.shared.systemGray5
@@ -165,6 +169,12 @@ class NCUserStatus: UIViewController {
         tableView.reloadData()
     }
     
+    // MARK: ACTION
+    
+    @IBAction func actionCancel(_ sender: UIBarButtonItem) {
+        self.dismiss(animated: true, completion: nil)
+    }
+    
     // MARK: - Networking
     
     func getStatus() {
@@ -330,7 +340,7 @@ extension NCUserStatus: UITableViewDataSource {
         }
         
         // Period
-        if clearAt == nil && clearAtType == "period" {
+        if clearAtTime != nil && clearAtType == "period" {
             
             switch clearAtTime {
             case "3600":
@@ -343,7 +353,7 @@ extension NCUserStatus: UITableViewDataSource {
         }
         
         // End of
-        if clearAt == nil && clearAtTime != nil && clearAtType == "end-of" {
+        if clearAtTime != nil && clearAtType == "end-of" {
             
             return NSLocalizedString(clearAtTime!, comment: "")
         }