Browse Source

clear code

marinofaggiana 4 years ago
parent
commit
05713b2c59
3 changed files with 3 additions and 12 deletions
  1. 1 1
      iOSClient/Brand/NCBrand.swift
  2. 0 9
      iOSClient/CCGlobal.h
  3. 2 2
      iOSClient/Login/NCLoginWeb.swift

+ 1 - 1
iOSClient/Brand/NCBrand.swift

@@ -228,6 +228,7 @@ class NCBrandColor: NSObject {
     
     // E2EE
     let e2eeMaxFileSize: UInt64                     = 524288000   // 500 MB
+    let e2eePassphraseTest                          = "more over television factory tendency independence international intellectual impress interest sentence pony"
     @objc let e2eeVersion                           = "1.1"
     
     // Max Size Upload
@@ -267,5 +268,4 @@ class NCBrandColor: NSObject {
     
     @objc let dismissAfterSecond: TimeInterval      = 4
     @objc let dismissAfterSecondLong: TimeInterval  = 10
-
 }

+ 0 - 9
iOSClient/CCGlobal.h

@@ -57,15 +57,6 @@
 #define k_appScan                                       @"Library/Application Support/Scan"
 #define k_DirectoryProviderStorage                      @"File Provider Storage"
 
-// Server Status
-#define k_serverStatus                                  @"/status.php"
-
-// Login Flow
-#define k_flowEndpoint                                  @"/index.php/login/flow"
-
-// Passphrase test EndToEnd Encryption
-#define k_passphrase_test                               @"more over television factory tendency independence international intellectual impress interest sentence pony"
-
 #define k_sizePreview                                   1024
 #define k_sizeIcon                                      512
 

+ 2 - 2
iOSClient/Login/NCLoginWeb.swift

@@ -62,12 +62,12 @@ class NCLoginWeb: UIViewController {
         webView!.topAnchor.constraint(equalTo: view.topAnchor, constant: 0).isActive = true
         webView!.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: 0).isActive = true
         
-        // ADD k_flowEndpoint for Web Flow
+        // ADD end point for Web Flow
         if urlBase != NCBrandOptions.shared.linkloginPreferredProviders {
             if loginFlowV2Available {
                 urlBase = loginFlowV2Login
             } else {
-                urlBase = urlBase + k_flowEndpoint
+                urlBase = urlBase + "/index.php/login/flow"
             }
         }