Build 00003

Nextcloud.xcodeproj/project.pbxproj

@@ -10,6 +10,12 @@
 		F700222C1EC479840080073F /* Custom.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F700222B1EC479840080073F /* Custom.xcassets */; };
 		F700222D1EC479840080073F /* Custom.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F700222B1EC479840080073F /* Custom.xcassets */; };
 		F700222E1EC479840080073F /* Custom.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F700222B1EC479840080073F /* Custom.xcassets */; };
+		F70022361EC49BBE0080073F /* TableCertificates+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = F70022331EC49BBE0080073F /* TableCertificates+CoreDataClass.m */; };
+		F70022371EC49BBE0080073F /* TableCertificates+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = F70022331EC49BBE0080073F /* TableCertificates+CoreDataClass.m */; };
+		F70022381EC49BBE0080073F /* TableCertificates+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = F70022331EC49BBE0080073F /* TableCertificates+CoreDataClass.m */; };
+		F70022391EC49BBE0080073F /* TableCertificates+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = F70022351EC49BBE0080073F /* TableCertificates+CoreDataProperties.m */; };
+		F700223A1EC49BBE0080073F /* TableCertificates+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = F70022351EC49BBE0080073F /* TableCertificates+CoreDataProperties.m */; };
+		F700223B1EC49BBE0080073F /* TableCertificates+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = F70022351EC49BBE0080073F /* TableCertificates+CoreDataProperties.m */; };
 		F708CF6D1E56E8CC00271D8B /* TableMetadata+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = F708CF4E1E56E8CB00271D8B /* TableMetadata+CoreDataClass.m */; };
 		F708CF6E1E56E8CC00271D8B /* TableMetadata+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = F708CF4E1E56E8CB00271D8B /* TableMetadata+CoreDataClass.m */; };
 		F708CF6F1E56E8CC00271D8B /* TableMetadata+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = F708CF4E1E56E8CB00271D8B /* TableMetadata+CoreDataClass.m */; };
@@ -743,6 +749,10 @@
 		08EA97471E6554FC004C83FA /* GoogleToolboxForMac.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = GoogleToolboxForMac.framework; sourceTree = "<group>"; };
 		F70022201EC46E660080073F /* NCBridgeSwift.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NCBridgeSwift.h; sourceTree = "<group>"; };
 		F700222B1EC479840080073F /* Custom.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Custom.xcassets; sourceTree = "<group>"; };
+		F70022321EC49BBE0080073F /* TableCertificates+CoreDataClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TableCertificates+CoreDataClass.h"; sourceTree = "<group>"; };
+		F70022331EC49BBE0080073F /* TableCertificates+CoreDataClass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "TableCertificates+CoreDataClass.m"; sourceTree = "<group>"; };
+		F70022341EC49BBE0080073F /* TableCertificates+CoreDataProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TableCertificates+CoreDataProperties.h"; sourceTree = "<group>"; };
+		F70022351EC49BBE0080073F /* TableCertificates+CoreDataProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "TableCertificates+CoreDataProperties.m"; sourceTree = "<group>"; };
 		F70211F41BAC56E9003FC03E /* CCCellMain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCCellMain.h; sourceTree = "<group>"; };
 		F70211F51BAC56E9003FC03E /* CCCellMain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCCellMain.m; sourceTree = "<group>"; };
 		F70211F61BAC56E9003FC03E /* CCCellMain.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CCCellMain.xib; sourceTree = "<group>"; };
@@ -2789,6 +2799,10 @@
 		F77F86401B4ABF6D009F0A10 /* Table */ = {
 			isa = PBXGroup;
 			children = (
+				F70022321EC49BBE0080073F /* TableCertificates+CoreDataClass.h */,
+				F70022331EC49BBE0080073F /* TableCertificates+CoreDataClass.m */,
+				F70022341EC49BBE0080073F /* TableCertificates+CoreDataProperties.h */,
+				F70022351EC49BBE0080073F /* TableCertificates+CoreDataProperties.m */,
 				F708CF4D1E56E8CB00271D8B /* TableMetadata+CoreDataClass.h */,
 				F708CF4E1E56E8CB00271D8B /* TableMetadata+CoreDataClass.m */,
 				F708CF4F1E56E8CB00271D8B /* TableMetadata+CoreDataProperties.h */,
@@ -3910,7 +3924,9 @@
 				F708CF741E56E8CC00271D8B /* TableLocalFile+CoreDataClass.m in Sources */,
 				F73CC0791E813DFF006E3047 /* BKShiftingView.m in Sources */,
 				F71459D21D12E3B700CAFEEC /* CCUtility.m in Sources */,
+				F70022371EC49BBE0080073F /* TableCertificates+CoreDataClass.m in Sources */,
 				F71459D31D12E3B700CAFEEC /* CCBKPasscode.m in Sources */,
+				F700223A1EC49BBE0080073F /* TableCertificates+CoreDataProperties.m in Sources */,
 				F71459D51D12E3B700CAFEEC /* MBProgressHUD.m in Sources */,
 				F708CF801E56E8CC00271D8B /* TableDirectory+CoreDataClass.m in Sources */,
 				F71459D91D12E3B700CAFEEC /* CCCrypto.m in Sources */,
@@ -3976,6 +3992,7 @@
 				F708CF6F1E56E8CC00271D8B /* TableMetadata+CoreDataClass.m in Sources */,
 				F743447B1E127EAC001CC831 /* CCUtility.m in Sources */,
 				F77EB6291EC08037003F814F /* CCExifGeo.m in Sources */,
+				F700223B1EC49BBE0080073F /* TableCertificates+CoreDataProperties.m in Sources */,
 				F74344871E127F95001CC831 /* UICKeyChainStore.m in Sources */,
 				F73CC0711E813DFF006E3047 /* BKPasscodeInputView.m in Sources */,
 				F73CC07D1E813DFF006E3047 /* BKTouchIDManager.m in Sources */,
@@ -3996,6 +4013,7 @@
 				F786AC9E1EBDC88B0055AE9D /* NCDatabase.swift in Sources */,
 				F74344661E127E35001CC831 /* CCCoreData.m in Sources */,
 				F76B3CD01EAE01BD00921AC9 /* NCBrand.swift in Sources */,
+				F70022381EC49BBE0080073F /* TableCertificates+CoreDataClass.m in Sources */,
 				F73CC0801E813DFF006E3047 /* BKTouchIDSwitchView.m in Sources */,
 				F743447C1E127EB2001CC831 /* NSString+TruncateToWidth.m in Sources */,
 				F708CF751E56E8CC00271D8B /* TableLocalFile+CoreDataClass.m in Sources */,
@@ -4169,6 +4187,8 @@
 				F762CB781EACB7D400B38484 /* ThumbsMainToolbar.m in Sources */,
 				F708CF731E56E8CC00271D8B /* TableLocalFile+CoreDataClass.m in Sources */,
 				F77B0E661D118A16002130FE /* NSString+Base64.m in Sources */,
+				F70022361EC49BBE0080073F /* TableCertificates+CoreDataClass.m in Sources */,
+				F70022391EC49BBE0080073F /* TableCertificates+CoreDataProperties.m in Sources */,
 				F77B0E671D118A16002130FE /* Reachability.m in Sources */,
 				F762CB121EACB66200B38484 /* UIView+XLFormAdditions.m in Sources */,
 				F73CC06F1E813DFF006E3047 /* BKPasscodeInputView.m in Sources */,

iOSClient/AppDelegate.m

@@ -1611,6 +1611,12 @@
     
     if (([actualVersion compare:@"2.17.3" options:NSNumericSearch] == NSOrderedAscending)) {
     
+        // Migrate Certificates Table
+        
+        NSArray *listCertificateLocation = [CCCoreData getAllCertificatesLocationOldDB];
+        
+        for (NSString *certificateLocation in listCertificateLocation)
+            [[NCManageDatabase sharedInstance] addCertificates:certificateLocation];
     }
 }
 

iOSClient/Brand/Picker.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.17.3</string>
 	<key>CFBundleVersion</key>
-	<string>00002</string>
+	<string>00003</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

iOSClient/Brand/PickerFileProvider.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.17.3</string>
 	<key>CFBundleVersion</key>
-	<string>00002</string>
+	<string>00003</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionFileProviderDocumentGroup</key>

iOSClient/Brand/Share.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.17.3</string>
 	<key>CFBundleVersion</key>
-	<string>00002</string>
+	<string>00003</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

iOSClient/Brand/iOSClient.plist

@@ -69,7 +69,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>00002</string>
+	<string>00003</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

iOSClient/FileSystem/CCCoreData.h

@@ -36,6 +36,7 @@
 #import "OCExternalSites.h"
 #import "OCCapabilities.h"
 #import "TableAccount+CoreDataClass.h"
+#import "TableCertificates+CoreDataClass.h"
 #import "TableMetadata+CoreDataClass.h"
 #import "TableDirectory+CoreDataClass.h"
 #import "TableLocalFile+CoreDataClass.h"
@@ -169,6 +170,10 @@
 + (void)setGeoInformationLocalFromFileID:(NSString *)fileID exifDate:(NSDate *)exifDate exifLatitude:(NSString *)exifLatitude exifLongitude:(NSString *)exifLongitude activeAccount:(NSString *)activeAccount;
 + (void)setGeoInformationLocalNull;
 
+// ===== Certificates =====
+
++ (NSMutableArray *)getAllCertificatesLocationOldDB;
+
 // ===== Offline =====
 
 + (NSArray *)getHomeOfflineActiveAccount:(NSString *)activeAccount directoryUser:(NSString *)directoryUser fieldOrder:(NSString *)fieldOrder ascending:(BOOL)ascending;

iOSClient/FileSystem/CCCoreData.m

@@ -1411,6 +1411,27 @@
     }];
 }
 
+#pragma --------------------------------------------------------------------------------------------
+#pragma mark ===== Certificates =====
+#pragma --------------------------------------------------------------------------------------------
+
++ (NSMutableArray *)getAllCertificatesLocationOldDB
+{
+    NSManagedObjectContext *context = [NSManagedObjectContext MR_defaultContext];
+    NSMutableArray *output = [NSMutableArray new];
+    
+    NSArray *records = [TableCertificates MR_findAllInContext:context];
+    
+    for (TableCertificates *record in records) {
+        
+        if (record.certificateLocation && record.certificateLocation.length > 0)
+            [output addObject:record.certificateLocation];
+        
+    }
+    
+    return output;
+}
+
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== Share =====
 #pragma --------------------------------------------------------------------------------------------

iOSClient/FileSystem/TableCertificates+CoreDataClass.h

@@ -0,0 +1,20 @@
+//
+//  TableCertificates+CoreDataClass.h
+//  Nextcloud
+//
+//  Created by Marino Faggiana on 17/02/17.
+//  Copyright © 2017 TWS. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface TableCertificates : NSManagedObject
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#import "TableCertificates+CoreDataProperties.h"

iOSClient/FileSystem/TableCertificates+CoreDataClass.m

@@ -0,0 +1,13 @@
+//
+//  TableCertificates+CoreDataClass.m
+//  Nextcloud
+//
+//  Created by Marino Faggiana on 17/02/17.
+//  Copyright © 2017 TWS. All rights reserved.
+//
+
+#import "TableCertificates+CoreDataClass.h"
+
+@implementation TableCertificates
+
+@end

iOSClient/FileSystem/TableCertificates+CoreDataProperties.h

@@ -0,0 +1,22 @@
+//
+//  TableCertificates+CoreDataProperties.h
+//  Nextcloud
+//
+//  Created by Marino Faggiana on 17/02/17.
+//  Copyright © 2017 TWS. All rights reserved.
+//
+
+#import "TableCertificates+CoreDataClass.h"
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface TableCertificates (CoreDataProperties)
+
++ (NSFetchRequest<TableCertificates *> *)fetchRequest;
+
+@property (nullable, nonatomic, copy) NSString *certificateLocation;
+
+@end
+
+NS_ASSUME_NONNULL_END

iOSClient/FileSystem/TableCertificates+CoreDataProperties.m

@@ -0,0 +1,19 @@
+//
+//  TableCertificates+CoreDataProperties.m
+//  Nextcloud
+//
+//  Created by Marino Faggiana on 17/02/17.
+//  Copyright © 2017 TWS. All rights reserved.
+//
+
+#import "TableCertificates+CoreDataProperties.h"
+
+@implementation TableCertificates (CoreDataProperties)
+
++ (NSFetchRequest<TableCertificates *> *)fetchRequest {
+	return [[NSFetchRequest alloc] initWithEntityName:@"TableCertificates"];
+}
+
+@dynamic certificateLocation;
+
+@end

iOSClient/cryptocloud.xcdatamodeld/cryptocloud 9.xcdatamodel/contents

@@ -33,6 +33,9 @@
         <attribute name="user" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="webpage" optional="YES" attributeType="String" syncable="YES"/>
     </entity>
+    <entity name="TableCertificates" syncable="YES">
+        <attribute name="certificateLocation" optional="YES" attributeType="String" syncable="YES"/>
+    </entity>
     <entity name="TableDirectory" representedClassName="TableDirectory" syncable="YES">
         <attribute name="account" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="dateReadDirectory" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
@@ -98,5 +101,6 @@
         <element name="TableDirectory" positionX="-6372" positionY="111" width="162" height="210"/>
         <element name="TableLocalFile" positionX="-6138" positionY="111" width="162" height="225"/>
         <element name="TableMetadata" positionX="-6138" positionY="402" width="162" height="510"/>
+        <element name="TableCertificates" positionX="-6399" positionY="252" width="128" height="60"/>
     </elements>
 </model>