coding

iOSClient/Settings/NCEndToEndInitialize.swift

@@ -28,7 +28,7 @@ import NCCommunication
     
     func endToEndInitializeSuccess()
 }
-/*
+
 class NCEndToEndInitialize : NSObject  {
 
     @objc weak var delegate: NCEndToEndInitializeDelegate?
@@ -287,8 +287,8 @@ class NCEndToEndInitialize : NSObject  {
     }
     
 }
-*/
 
+/*
  class NCEndToEndInitialize : NSObject  {
 
      @objc weak var delegate: NCEndToEndInitializeDelegate?
@@ -559,4 +559,4 @@ class NCEndToEndInitialize : NSObject  {
      }
      
  }
-
+*/

iOSClient/Settings/NCManageEndToEndEncryption.m

@@ -263,7 +263,7 @@
         }
     
         passcodeViewController.delegate = self;
-        passcodeViewController.allowCancel = false;
+        passcodeViewController.allowCancel = true;
         passcodeViewController.keypadButtonShowLettering = false;
         
         if ([laContext canEvaluatePolicy:LAPolicyDeviceOwnerAuthenticationWithBiometrics error:&error]) {
@@ -312,6 +312,7 @@
     [[LAContext new] evaluatePolicy:LAPolicyDeviceOwnerAuthenticationWithBiometrics localizedReason:[[NCBrandOptions sharedInstance] brand] reply:^(BOOL success, NSError * _Nullable error) {
         if (success) {
             dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.5 * NSEC_PER_SEC), dispatch_get_main_queue(), ^(void) {
+                [passcodeViewController dismissViewControllerAnimated:YES completion:nil];
                 [self passcodeCorrectCode];
             });
         }