new strings

Picker/DocumentPickerViewController.swift

@@ -613,7 +613,7 @@ extension DocumentPickerViewController {
             viewController.passcodeInputView.maximumLength = 64
         }
         
-        let touchIDManager = BKTouchIDManager.init(keychainServiceName: BKPasscodeKeychainServiceName)
+        let touchIDManager = BKTouchIDManager.init(keychainServiceName: k_serviceShareKeyChain)
         touchIDManager?.promptText = NSLocalizedString("_scan_fingerprint_", comment: "")
         viewController.touchIDManager = touchIDManager
         viewController.title = title

Share Ext/ShareViewController.m

@@ -370,7 +370,7 @@
         viewController.passcodeInputView.maximumLength = 64;
     }
     
-    BKTouchIDManager *touchIDManager = [[BKTouchIDManager alloc] initWithKeychainServiceName:BKPasscodeKeychainServiceName];
+    BKTouchIDManager *touchIDManager = [[BKTouchIDManager alloc] initWithKeychainServiceName:k_serviceShareKeyChain];
     touchIDManager.promptText = NSLocalizedString(@"_scan_fingerprint_", nil);
     viewController.touchIDManager = touchIDManager;
     viewController.title = k_brand;

iOSClient/AppDelegate.m

@@ -431,7 +431,7 @@
     NSString *pushToken = [[[[deviceToken description] stringByReplacingOccurrencesOfString: @"<" withString: @""] stringByReplacingOccurrencesOfString: @">" withString: @""] stringByReplacingOccurrencesOfString: @" " withString: @""];
     NSString *pushTokenHash = [[CCCrypto sharedManager] createSHA512:pushToken];
     
-    NSDictionary *devicePushKey = [NSDictionary dictionaryWithContentsOfFile:[[NSBundle mainBundle] pathForResource:k_nextcloudDevicePushKey ofType:@"plist"]];
+    NSDictionary *devicePushKey = [NSDictionary dictionaryWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"DevicePushKey-Info" ofType:@"plist"]];
     
 #ifdef DEBUG
     NSString *devicePublicKey = [devicePushKey objectForKey:@"devicePublicKeyDevelopment"];
@@ -970,7 +970,7 @@
         viewController.passcodeInputView.maximumLength = 64;
     }
 
-    viewController.touchIDManager = [[BKTouchIDManager alloc] initWithKeychainServiceName:BKPasscodeKeychainServiceName];
+    viewController.touchIDManager = [[BKTouchIDManager alloc] initWithKeychainServiceName: k_serviceShareKeyChain];
     viewController.touchIDManager.promptText = [CCUtility localizableBrand:@"_scan_fingerprint_" table:nil];
 
     UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:viewController];

iOSClient/Brand/CCNextcloudConstant.h

@@ -33,6 +33,21 @@
 #define k_serviceShareKeyChain          @"Crypto Cloud"
 #define k_metadataKeyedUnarchiver       @"it.twsweb.Crypto-Cloud.metadata"
 
+// Session
+#define k_download_session              @"it.twsweb.download.session"
+#define k_download_session_foreground   @"it.twsweb.download.sessionforeground"
+#define k_download_session_wwan         @"it.twsweb.download.sessionwwan"
+#define k_upload_session                @"it.twsweb.upload.session"
+#define k_upload_session_foreground     @"it.twsweb.upload.sessionforeground"
+#define k_upload_session_wwan           @"it.twsweb.upload.sessionwwan"
+
+// OperationQueue
+#define k_netQueueName                  @"it.twsweb.cryptocloud.queue"
+#define k_netQueueDownloadName          @"it.twsweb.cryptocloud.queueDownload"
+#define k_netQueueDownloadWWanName      @"it.twsweb.cryptocloud.queueDownloadWWan"
+#define k_netQueueUploadName            @"it.twsweb.cryptocloud.queueUpload"
+#define k_netQueueUploadWWanName        @"it.twsweb.cryptocloud.queueUploadWWan"
+
 /* Define option compiler */
 
 /*

iOSClient/CCGlobal.h

@@ -44,8 +44,6 @@ extern NSString *const appSecretCryptoCloud;
 extern NSString *const urlBaseDownloadDB;
 extern NSString *const urlBaseUploadDB;
 
-extern NSString *const BKPasscodeKeychainServiceName;
-
 #ifndef EXTENSION
 
 //AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
@@ -104,15 +102,6 @@ extern NSString *const BKPasscodeKeychainServiceName;
 #define k_permission_can_rename                         @"N"
 #define k_permission_can_move                           @"V"
 
-// Session
-#define k_download_session                              @"it.twsweb.download.session"
-#define k_download_session_foreground                   @"it.twsweb.download.sessionforeground"
-#define k_download_session_wwan                         @"it.twsweb.download.sessionwwan"
-
-#define k_upload_session                                @"it.twsweb.upload.session"
-#define k_upload_session_foreground                     @"it.twsweb.upload.sessionforeground"
-#define k_upload_session_wwan                           @"it.twsweb.upload.sessionwwan"
-
 #define k_networkingSessionNotification                 @"networkingSessionNotification"
 
 // TaskIdentifier
@@ -129,13 +118,6 @@ extern NSString *const BKPasscodeKeychainServiceName;
 
 #define k_timerVerifySession                            15.0
 
-// OperationQueue
-#define k_netQueueName                                  @"it.twsweb.cryptocloud.queue"
-#define k_netQueueDownloadName                          @"it.twsweb.cryptocloud.queueDownload"
-#define k_netQueueDownloadWWanName                      @"it.twsweb.cryptocloud.queueDownloadWWan"
-#define k_netQueueUploadName                            @"it.twsweb.cryptocloud.queueUpload"
-#define k_netQueueUploadWWanName                        @"it.twsweb.cryptocloud.queueUploadWWan"
-
 #define k_maxConcurrentOperation                        10
 #define k_maxConcurrentOperationDownloadUpload          10
 
@@ -262,9 +244,6 @@ extern NSString *const BKPasscodeKeychainServiceName;
 // Search
 #define k_minCharsSearch                                2
 
-// Nextcloud Plist Key Push Service
-#define k_nextcloudDevicePushKey                        @"DevicePushKey-Info"
-
 // -----------------------------------------------------------------------------------------------------------
 // -----------------------------------------------------------------------------------------------------------
 

iOSClient/CCGlobal.m

@@ -32,9 +32,6 @@ NSString *const appCertificates = @"Library/Application Support/Certificates";
 NSString *const webDAV = @"/remote.php/webdav";
 NSString *const dav = @"/remote.php/dav";
 
-// BKPasscode
-NSString *const BKPasscodeKeychainServiceName = @"Crypto Cloud";
-
 @implementation CCAspect
 
 + (void)aspectNavigationControllerBar:(UINavigationBar *)nav encrypted:(BOOL)encrypted online:(BOOL)online hidden:(BOOL)hidden

iOSClient/Main/CCMain.m

@@ -4238,7 +4238,7 @@
             viewController.passcodeInputView.maximumLength = 64;
         }
         
-        BKTouchIDManager *touchIDManager = [[BKTouchIDManager alloc] initWithKeychainServiceName:BKPasscodeKeychainServiceName];
+        BKTouchIDManager *touchIDManager = [[BKTouchIDManager alloc] initWithKeychainServiceName:k_serviceShareKeyChain];
         touchIDManager.promptText = NSLocalizedString(@"_scan_fingerprint_", nil);
         viewController.touchIDManager = touchIDManager;
 
@@ -5874,7 +5874,7 @@
                 viewController.passcodeInputView.maximumLength = 64;
             }
 
-            BKTouchIDManager *touchIDManager = [[BKTouchIDManager alloc] initWithKeychainServiceName:BKPasscodeKeychainServiceName];
+            BKTouchIDManager *touchIDManager = [[BKTouchIDManager alloc] initWithKeychainServiceName:k_serviceShareKeyChain];
             touchIDManager.promptText = NSLocalizedString(@"_scan_fingerprint_", nil);
             viewController.touchIDManager = touchIDManager;
             

iOSClient/Move/CCMove.m

@@ -480,7 +480,7 @@
                 viewController.passcodeInputView.maximumLength = 64;
             }
             
-            BKTouchIDManager *touchIDManager = [[BKTouchIDManager alloc] initWithKeychainServiceName:BKPasscodeKeychainServiceName];
+            BKTouchIDManager *touchIDManager = [[BKTouchIDManager alloc] initWithKeychainServiceName:k_serviceShareKeyChain];
             touchIDManager.promptText = NSLocalizedString(@"_scan_fingerprint_", nil);
             viewController.touchIDManager = touchIDManager;
             

iOSClient/Settings/CCSettings.m

@@ -567,7 +567,7 @@
         viewController.passcodeInputView.maximumLength = 64;
     }
     
-    BKTouchIDManager *touchIDManager = [[BKTouchIDManager alloc] initWithKeychainServiceName:BKPasscodeKeychainServiceName];
+    BKTouchIDManager *touchIDManager = [[BKTouchIDManager alloc] initWithKeychainServiceName:k_serviceShareKeyChain];
     touchIDManager.promptText = NSLocalizedString(@"_scan_fingerprint_", nil);
     viewController.touchIDManager = touchIDManager;
     
@@ -600,7 +600,7 @@
             viewController.passcodeInputView.maximumLength = 64;
         }
         
-        BKTouchIDManager *touchIDManager = [[BKTouchIDManager alloc] initWithKeychainServiceName:BKPasscodeKeychainServiceName];
+        BKTouchIDManager *touchIDManager = [[BKTouchIDManager alloc] initWithKeychainServiceName:k_serviceShareKeyChain];
         touchIDManager.promptText = NSLocalizedString(@"_scan_fingerprint_", nil);
         viewController.touchIDManager = touchIDManager;
 
@@ -632,7 +632,7 @@
             viewController.passcodeInputView.maximumLength = 64;
         }
         
-        BKTouchIDManager *touchIDManager = [[BKTouchIDManager alloc] initWithKeychainServiceName:BKPasscodeKeychainServiceName];
+        BKTouchIDManager *touchIDManager = [[BKTouchIDManager alloc] initWithKeychainServiceName:k_serviceShareKeyChain];
         touchIDManager.promptText = NSLocalizedString(@"_scan_fingerprint_", nil);
         viewController.touchIDManager = touchIDManager;