live photo

iOSClient/Data/NCManageDatabase+Metadata.swift

@@ -1057,7 +1057,7 @@ extension NCManageDatabase {
         var classFile = metadata.classFile
         var fileName = (metadata.fileNameView as NSString).deletingPathExtension
 
-        if !metadata.livePhoto || !CCUtility.getLivePhoto() {
+        if !metadata.livePhoto || !NCKeychain().livePhoto {
             return nil
         }
 

iOSClient/Main/Create cloud/NCUploadAssets.swift

@@ -230,7 +230,7 @@ struct UploadAssetsView: View {
                                        forcedNewFileName: false)!
             : (previewStore.fileName + "." + ext)
 
-            if previewStore.assetType == .livePhoto && CCUtility.getLivePhoto() && previewStore.data == nil {
+            if previewStore.assetType == .livePhoto && NCKeychain().livePhoto && previewStore.data == nil {
                 livePhoto = true
             }
 

iOSClient/Media/NCMediaCache.swift

@@ -136,7 +136,7 @@ import NextcloudKit
 
         guard let predicate = predicate else { return }
 
-        livePhoto = CCUtility.getLivePhoto()
+        livePhoto = NCKeychain().livePhoto
         metadatas = NCManageDatabase.shared.getMetadatasMedia(predicate: predicate, livePhoto: livePhoto)
 
         switch CCUtility.getMediaSortDate() {

iOSClient/Networking/NCAutoUpload.swift

@@ -117,7 +117,7 @@ class NCAutoUpload: NSObject {
                 var serverUrl: String = ""
                 let fileName = CCUtility.createFileName(asset.originalFilename as String, fileDate: assetDate, fileType: assetMediaType, keyFileName: NCGlobal.shared.keyFileNameAutoUploadMask, keyFileNameType: NCGlobal.shared.keyFileNameAutoUploadType, keyFileNameOriginal: NCGlobal.shared.keyFileNameOriginalAutoUpload, forcedNewFileName: false)!
 
-                if asset.mediaSubtypes.contains(.photoLive) && CCUtility.getLivePhoto() {
+                if asset.mediaSubtypes.contains(.photoLive), NCKeychain().livePhoto {
                     livePhoto = true
                 }
 

iOSClient/Settings/CCAdvanced.m

@@ -70,7 +70,7 @@
     
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"livePhoto" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_upload_mov_livephoto_", nil)];
     row.cellConfigAtConfigure[@"backgroundColor"] = UIColor.secondarySystemGroupedBackgroundColor;
-    if ([CCUtility getLivePhoto]) row.value = @"1";
+    if ([[[NCKeychain alloc] init] livePhoto]) row.value = @"1";
     else row.value = @"0";
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
     [row.cellConfig setObject:UIColor.labelColor forKey:@"textLabel.textColor"];
@@ -323,7 +323,7 @@
     
     if ([rowDescriptor.tag isEqualToString:@"livePhoto"]) {
         
-        [CCUtility setLivePhoto:[[rowDescriptor.value valueData] boolValue]];
+        [[NCKeychain alloc] init].livePhoto = [[rowDescriptor.value valueData] boolValue];
     }
 
     if ([rowDescriptor.tag isEqualToString:@"removePhotoCameraRoll"]) {

iOSClient/Utility/CCUtility.h

@@ -61,14 +61,6 @@
 + (BOOL)getDisableCrashservice;
 + (void)setDisableCrashservice:(BOOL)disable;
 
-+ (void)setHCBusinessType:(NSString *)professions;
-+ (NSString *)getHCBusinessType;
-
-+ (NSData *)getDatabaseEncryptionKey;
-
-+ (BOOL)getLivePhoto;
-+ (void)setLivePhoto:(BOOL)set;
-
 + (NSString *)getMediaSortDate;
 + (void)setMediaSortDate:(NSString *)value;
 

iOSClient/Utility/CCUtility.m

@@ -160,53 +160,6 @@
     [UICKeyChainStore setString:sDisable forKey:@"crashservice" service:NCGlobal.shared.serviceShareKeyChain];
 }
 
-+ (void)setHCBusinessType:(NSString *)professions
-{
-    [UICKeyChainStore setString:professions forKey:@"businessType" service:NCGlobal.shared.serviceShareKeyChain];
-}
-
-+ (NSString *)getHCBusinessType
-{
-    return [UICKeyChainStore stringForKey:@"businessType" service:NCGlobal.shared.serviceShareKeyChain];
-}
-
-+ (NSData *)getDatabaseEncryptionKey
-{
-    NSData *key = [UICKeyChainStore dataForKey:@"databaseEncryptionKey" service:NCGlobal.shared.serviceShareKeyChain];
-    if (key == nil) {
-        NSMutableData *key = [NSMutableData dataWithLength:64];
-        (void)SecRandomCopyBytes(kSecRandomDefault, key.length, (uint8_t *)key.mutableBytes);
-        [UICKeyChainStore setData:key forKey:@"databaseEncryptionKey" service:NCGlobal.shared.serviceShareKeyChain];
-        return key;
-    } else {
-        return key;
-    }
-}
-
-+ (void)setDatabaseEncryptionKey:(NSData *)data
-{
-    [UICKeyChainStore setData:data forKey:@"databaseEncryptionKey" service:NCGlobal.shared.serviceShareKeyChain];
-}
-
-+ (BOOL)getLivePhoto
-{
-    NSString *valueString = [UICKeyChainStore stringForKey:@"livePhoto" service:NCGlobal.shared.serviceShareKeyChain];
-
-    // Default TRUE
-    if (valueString == nil) {
-        [self setLivePhoto:YES];
-        return true;
-    }
-
-    return [valueString boolValue];
-}
-
-+ (void)setLivePhoto:(BOOL)set
-{
-    NSString *sSet = (set) ? @"true" : @"false";
-    [UICKeyChainStore setString:sSet forKey:@"livePhoto" service:NCGlobal.shared.serviceShareKeyChain];
-}
-
 + (NSString *)getMediaSortDate
 {
     NSString *valueString = [UICKeyChainStore stringForKey:@"mediaSortDate" service:NCGlobal.shared.serviceShareKeyChain];

iOSClient/Utility/NCKeychain.swift

@@ -162,6 +162,19 @@ import KeychainAccess
         }
     }
 
+    @objc var livePhoto: Bool {
+        get {
+            migrate(key: "livePhoto")
+            if let value = try? keychain.get("livePhoto"), let result = Bool(value) {
+                return result
+            }
+            return true
+        }
+        set {
+            keychain["livePhoto"] = String(newValue)
+        }
+    }
+
     // MARK: -
 
     private func migrate(key: String) {