Browse Source

clear code

Marino Faggiana 7 years ago
parent
commit
3294c77807

+ 10 - 0
Nextcloud.xcodeproj/project.pbxproj

@@ -241,6 +241,9 @@
 		F743448C1E128010001CC831 /* CCCrypto.m in Sources */ = {isa = PBXBuildFile; fileRef = F7FE125F1BAC03FB0041924B /* CCCrypto.m */; };
 		F74344921E128EB0001CC831 /* Picker.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = F74344901E128E8F001CC831 /* Picker.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		F74344931E128EB4001CC831 /* PickerFileProvider.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = F74344911E128E96001CC831 /* PickerFileProvider.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		F743A65D1ECDD57F0092249E /* CCMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = F743A65C1ECDD57F0092249E /* CCMetadata.m */; };
+		F743A65E1ECDD57F0092249E /* CCMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = F743A65C1ECDD57F0092249E /* CCMetadata.m */; };
+		F743A65F1ECDD57F0092249E /* CCMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = F743A65C1ECDD57F0092249E /* CCMetadata.m */; };
 		F749E4E91DC1FB38009BA2FD /* Share.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = F7CE8AFB1DC1F8D8009CAE48 /* Share.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		F750374D1DBFA91A008FB480 /* ALView+PureLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = F75037441DBFA91A008FB480 /* ALView+PureLayout.m */; };
 		F750374F1DBFA91A008FB480 /* NSArray+PureLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = F75037461DBFA91A008FB480 /* NSArray+PureLayout.m */; };
@@ -1144,6 +1147,8 @@
 		F74344521E126D06001CC831 /* Picker-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Picker-Bridging-Header.h"; sourceTree = "<group>"; };
 		F74344901E128E8F001CC831 /* Picker.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = Picker.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		F74344911E128E96001CC831 /* PickerFileProvider.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = PickerFileProvider.appex; sourceTree = BUILT_PRODUCTS_DIR; };
+		F743A65B1ECDD57F0092249E /* CCMetadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCMetadata.h; sourceTree = "<group>"; };
+		F743A65C1ECDD57F0092249E /* CCMetadata.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCMetadata.m; sourceTree = "<group>"; };
 		F743B2C31C95BBE8006F5B4A /* CCShareInfoCMOC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCShareInfoCMOC.h; sourceTree = "<group>"; };
 		F743B2C41C95BBE8006F5B4A /* CCShareInfoCMOC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCShareInfoCMOC.m; sourceTree = "<group>"; };
 		F744BE921BEBB2EE004FFF66 /* CCIntro.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCIntro.h; sourceTree = "<group>"; };
@@ -3394,6 +3399,8 @@
 				F77F86401B4ABF6D009F0A10 /* Table */,
 				F7B81D7F1C64E77F006D02DF /* CCCoreData.h */,
 				F7B81D801C64E77F006D02DF /* CCCoreData.m */,
+				F743A65B1ECDD57F0092249E /* CCMetadata.h */,
+				F743A65C1ECDD57F0092249E /* CCMetadata.m */,
 				F786AC9B1EBDC88B0055AE9D /* NCDatabase.swift */,
 				F786ACA91EBDCCE60055AE9D /* NCManageDatabase.swift */,
 			);
@@ -4254,6 +4261,7 @@
 				F70022371EC49BBE0080073F /* TableCertificates+CoreDataClass.m in Sources */,
 				F71459D31D12E3B700CAFEEC /* CCBKPasscode.m in Sources */,
 				F700223A1EC49BBE0080073F /* TableCertificates+CoreDataProperties.m in Sources */,
+				F743A65E1ECDD57F0092249E /* CCMetadata.m in Sources */,
 				F71459D51D12E3B700CAFEEC /* MBProgressHUD.m in Sources */,
 				F708CF801E56E8CC00271D8B /* TableDirectory+CoreDataClass.m in Sources */,
 				F71459D91D12E3B700CAFEEC /* CCCrypto.m in Sources */,
@@ -4332,6 +4340,7 @@
 				F74344821E127F68001CC831 /* MBProgressHUD.m in Sources */,
 				F70022E21EC4C9100080073F /* OCXMLListParser.m in Sources */,
 				F743447D1E127ECB001CC831 /* AESCrypt.m in Sources */,
+				F743A65F1ECDD57F0092249E /* CCMetadata.m in Sources */,
 				F743447E1E127ECE001CC831 /* NSData+Base64.m in Sources */,
 				F70022A61EC4C9100080073F /* AFNetworkReachabilityManager.m in Sources */,
 				F70022E51EC4C9100080073F /* OCXMLParser.m in Sources */,
@@ -4419,6 +4428,7 @@
 				F7F06EA91DBFACC600099AE9 /* CTAssetScrollView.m in Sources */,
 				F762CB771EACB7D400B38484 /* ReaderViewController.m in Sources */,
 				F7F06E931DBFACC600099AE9 /* NSNumberFormatter+CTAssetsPickerController.m in Sources */,
+				F743A65D1ECDD57F0092249E /* CCMetadata.m in Sources */,
 				F72AAECC1E5C60C700BB17E1 /* UIImage+AHKAdditions.m in Sources */,
 				F762CB071EACB66200B38484 /* XLFormOptionsObject.m in Sources */,
 				F7C525A01E3B48B700FFE02C /* CCNotification.swift in Sources */,

+ 4 - 5
iOSClient/FileSystem/CCMetadata.h

@@ -23,8 +23,7 @@
 
 #import <UIKit/UIKit.h>
 #import <Photos/Photos.h>
-
-@class tableMetadata;
+#import "NCBridgeSwift.h"
 
 /*
 @interface CCMetadata : NSObject //<NSCopying, NSCoding>
@@ -67,7 +66,7 @@
 @end
 */
 
-@interface CCMetadataNet : NSObject <NSCopying>
+@interface CCMetadataNet : NSObject //<NSCopying>
 
 @property (nonatomic, strong) NSString *account;
 @property (nonatomic, strong) NSString *action;
@@ -88,7 +87,7 @@
 @property (nonatomic, strong) NSString *fileNameLocal;
 @property (nonatomic, strong) NSString *fileNamePrint;
 @property (nonatomic, strong) NSString *assetLocalIdentifier;
-@property (nonatomic, strong) tableMetadata *metadata;
+@property (nonatomic, strong)  *metadata;
 @property (nonatomic, strong) id options;
 @property (nonatomic, strong) NSString *password;
 @property (nonatomic, strong) NSString *pathFolder;
@@ -108,6 +107,6 @@
 @property NSInteger taskStatus;
 
 - (id)initWithAccount:(NSString *)withAccount;
-- (id)copyWithZone:(NSZone *)zone;
+//- (id)copyWithZone:(NSZone *)zone;
 
 @end

+ 2 - 134
iOSClient/FileSystem/CCMetadata.m

@@ -23,140 +23,6 @@
 
 #import "CCMetadata.h"
 
-/*
-@implementation CCMetadata
-
-// override del metodo init
-//
-- (id)init {
-    self = [super init];
-    return self;
-}
-
-
-- (id)initWithCCMetadata:(CCMetadata *)metadata {
-    self = [self init];
-    return [metadata copy];
-}
-
-- (id)copyWithZone: (NSZone *) zone
-{
-    CCMetadata *metadata = [[CCMetadata allocWithZone: zone] init];
-    
-    [metadata setAccount: self.account];
-    [metadata setCryptated: self.cryptated];
-    [metadata setDate: self.date];
-    [metadata setDirectory: self.directory];
-    [metadata setDirectoryID: self.directoryID];
-    [metadata setErrorPasscode: self.errorPasscode];
-    [metadata setFavorite: self.favorite];
-    [metadata setFileID: self.fileID];
-    [metadata setFileName: self.fileName];
-    [metadata setFileNameData: self.fileNameData];
-    [metadata setFileNamePrint: self.fileNamePrint];
-    [metadata setIconName: self.iconName];
-    [metadata setAssetLocalIdentifier: self.assetLocalIdentifier];
-    [metadata setModel: self.model];
-    [metadata setNameCurrentDevice: self.nameCurrentDevice];
-    [metadata setPermissions: self.permissions];
-    [metadata setProtocol: self.protocol];
-    [metadata setRev: self.rev];
-    [metadata setSession: self.session];
-    [metadata setSessionError: self.sessionError];
-    [metadata setSessionID: self.sessionID];
-    [metadata setSessionSelector: self.sessionSelector];
-    [metadata setSessionSelectorPost: self.sessionSelectorPost];
-    [metadata setSessionTaskIdentifier: self.sessionTaskIdentifier];
-    [metadata setSessionTaskIdentifierPlist: self.sessionTaskIdentifierPlist];
-    [metadata setSize: self.size];
-    [metadata setThumbnailExists: self.thumbnailExists];
-    [metadata setTitle: self.title];
-    [metadata setType: self.type];
-    [metadata setTypeFile: self.typeFile];
-    [metadata setUuid: self.uuid];
-    
-    return metadata;
-}
-
-// Implentation of the NSCoding protocol.
-
--(id)initWithCoder:(NSCoder *)decoder
-{
-    if (self = [self init]) {
-        
-        _account = [decoder decodeObjectForKey:@"account"];
-        _cryptated = [decoder decodeBoolForKey:@"cryptated"];
-        _date = [decoder decodeObjectForKey:@"date"];
-        _directory = [decoder decodeBoolForKey:@"directory"];
-        _directoryID = [decoder decodeObjectForKey:@"directoryID"];
-        _errorPasscode = [decoder decodeBoolForKey:@"errorPasscode"];
-        _favorite = [decoder decodeBoolForKey:@"favorite"];
-        _fileID = [decoder decodeObjectForKey:@"fileID"];
-        _fileName = [decoder decodeObjectForKey:@"fileName"];
-        _fileNameData = [decoder decodeObjectForKey:@"fileNameData"];
-        _fileNamePrint = [decoder decodeObjectForKey:@"fileNamePrint"];
-        _iconName = [decoder decodeObjectForKey:@"iconName"];
-        _assetLocalIdentifier = [decoder decodeObjectForKey:@"assetLocalIdentifier"];
-        _model = [decoder decodeObjectForKey:@"model"];
-        _nameCurrentDevice = [decoder decodeObjectForKey:@"nameCurrentDevice"];
-        _permissions = [decoder decodeObjectForKey:@"permissions"];
-        _protocol = [decoder decodeObjectForKey:@"protocol"];
-        _rev = [decoder decodeObjectForKey:@"rev"];
-        _session = [decoder decodeObjectForKey:@"session"];
-        _sessionError = [decoder decodeObjectForKey:@"sessionError"];
-        _sessionID = [decoder decodeObjectForKey:@"sessionID"];
-        _sessionSelector = [decoder decodeObjectForKey:@"sessionSelector"];
-        _sessionSelectorPost = [decoder decodeObjectForKey:@"sessionSelectorPost"];
-        _sessionTaskIdentifier = [decoder decodeInt32ForKey:@"sessionTaskIdentifier"];
-        _sessionTaskIdentifierPlist = [decoder decodeInt32ForKey:@"sessionTaskIdentifierPlist"];
-        _size = [decoder decodeDoubleForKey:@"size"];
-        _thumbnailExists = [decoder decodeBoolForKey:@"thumbnailExists"];
-        _title = [decoder decodeObjectForKey:@"title"];
-        _type = [decoder decodeObjectForKey:@"type"];
-        _typeFile = [decoder decodeObjectForKey:@"typeFile"];
-        _uuid = [decoder decodeObjectForKey:@"uuid"];
-    };
-    
-    return self;
-}
-
-- (void)encodeWithCoder:(NSCoder *)encoder
-{
-    [encoder encodeObject:_account forKey:@"account"];
-    [encoder encodeBool:_cryptated forKey:@"cryptated"];
-    [encoder encodeObject:_date forKey:@"date"];
-    [encoder encodeBool:_directory forKey:@"directory"];
-    [encoder encodeObject:_directoryID forKey:@"directoryID"];
-    [encoder encodeBool:_errorPasscode forKey:@"errorPasscode"];
-    [encoder encodeBool:_directory forKey:@"favorite"];
-    [encoder encodeObject:_fileID forKey:@"fileID"];
-    [encoder encodeObject:_fileName forKey:@"fileName"];
-    [encoder encodeObject:_fileNameData forKey:@"fileNameData"];
-    [encoder encodeObject:_fileNamePrint forKey:@"fileNamePrint"];
-    [encoder encodeObject:_iconName forKey:@"iconName"];
-    [encoder encodeObject:_assetLocalIdentifier forKey:@"assetLocalIdentifier"];
-    [encoder encodeObject:_model forKey:@"model"];
-    [encoder encodeObject:_nameCurrentDevice forKey:@"nameCurrentDevice"];
-    [encoder encodeObject:_permissions forKey:@"permissions"];
-    [encoder encodeObject:_protocol forKey:@"protocol"];
-    [encoder encodeObject:_rev forKey:@"rev"];
-    [encoder encodeObject:_session forKey:@"session"];
-    [encoder encodeObject:_sessionError forKey:@"sessionError"];
-    [encoder encodeObject:_sessionID forKey:@"sessionID"];
-    [encoder encodeObject:_sessionSelector forKey:@"sessionSelector"];
-    [encoder encodeObject:_sessionSelectorPost forKey:@"sessionSelectorPost"];
-    [encoder encodeInt32:_sessionTaskIdentifier forKey:@"sessionTaskIdentifier"];
-    [encoder encodeInt32:_sessionTaskIdentifierPlist forKey:@"sessionTaskIdentifierPlist"];
-    [encoder encodeDouble:_size forKey:@"size"];
-    [encoder encodeBool:_thumbnailExists forKey:@"thumbnailExists"];
-    [encoder encodeObject:_title forKey:@"title"];
-    [encoder encodeObject:_type forKey:@"type"];
-    [encoder encodeObject:_typeFile forKey:@"typeFile"];
-    [encoder encodeObject:_uuid forKey:@"uuid"];
-}
-@end
-*/
-
 @implementation CCMetadataNet
 
 - (id)init
@@ -179,6 +45,7 @@
     return self;
 }
 
+/*
 - (id)copyWithZone: (NSZone *) zone
 {
     CCMetadataNet *metadataNet = [[CCMetadataNet allocWithZone: zone] init];
@@ -223,5 +90,6 @@
     
     return metadataNet;
 }
+*/
 
 @end