Преглед на файлове

fix

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
Marino Faggiana преди 1 година
родител
ревизия
4c1ae8bbbb
променени са 2 файла, в които са добавени 7 реда и са изтрити 10 реда
  1. 1 4
      iOSClient/Main/NCActionCenter.swift
  2. 6 6
      iOSClient/Settings/NCManageE2EE.swift

+ 1 - 4
iOSClient/Main/NCActionCenter.swift

@@ -209,15 +209,12 @@ class NCActionCenter: NSObject, UIDocumentInteractionControllerDelegate, NCSelec
                     pages.append(value)
                 }
 
-                if !NCGlobal.shared.capabilityActivity.isEmpty, let idx = pages.firstIndex(of: .activity) {
+                if NCGlobal.shared.capabilityActivity.isEmpty, let idx = pages.firstIndex(of: .activity) {
                     pages.remove(at: idx)
                 }
                 if !metadata.isSharable(), let idx = pages.firstIndex(of: .sharing) {
                     pages.remove(at: idx)
                 }
-                if pages.isEmpty {
-                    return
-                }
 
                 (pages, page) = NCApplicationHandle().filterPages(pages: pages, page: page, metadata: metadata)
 

+ 6 - 6
iOSClient/Settings/NCManageE2EE.swift

@@ -194,10 +194,10 @@ struct NCViewE2EE: View {
                     }
                     .contentShape(Rectangle())
                     .onTapGesture {
-                        if CCUtility.getPasscode().isEmpty {
-                            NCContentPresenter.shared.showInfo(error: NKError(errorCode: 0, errorDescription: "_e2e_settings_lock_not_active_"))
-                        } else {
+                        if let passcode = CCUtility.getPasscode(), !passcode.isEmpty {
                             manageE2EE.requestPasscodeType("readPassphrase")
+                        } else {
+                            NCContentPresenter.shared.showInfo(error: NKError(errorCode: 0, errorDescription: "_e2e_settings_lock_not_active_"))
                         }
                     }
 
@@ -214,10 +214,10 @@ struct NCViewE2EE: View {
                     }
                     .contentShape(Rectangle())
                     .onTapGesture {
-                        if CCUtility.getPasscode().isEmpty {
-                            NCContentPresenter.shared.showInfo(error: NKError(errorCode: 0, errorDescription: "_e2e_settings_lock_not_active_"))
-                        } else {
+                        if let passcode = CCUtility.getPasscode(), !passcode.isEmpty {
                             manageE2EE.requestPasscodeType("removeLocallyEncryption")
+                        } else {
+                            NCContentPresenter.shared.showInfo(error: NKError(errorCode: 0, errorDescription: "_e2e_settings_lock_not_active_"))
                         }
                     }