Marino Faggiana 8 лет назад
Родитель
Сommit
9fed9c517d

+ 1 - 0
Libraries external/OCCommunicationLib/OCCommunicationLib/OCCommunication.m

@@ -1680,6 +1680,7 @@
                     if ([data valueForKey:@"lang"] && ![[data valueForKey:@"lang"] isEqual:[NSNull null]]) externalSites.lang = [data valueForKey:@"lang"];
                     if ([data valueForKey:@"name"] && ![[data valueForKey:@"name"] isEqual:[NSNull null]]) externalSites.name = [data valueForKey:@"name"];
                     if ([data valueForKey:@"url"]  && ![[data valueForKey:@"url"]  isEqual:[NSNull null]]) externalSites.url  = [data valueForKey:@"url"];
+                    if ([data valueForKey:@"type"] && ![[data valueForKey:@"type"] isEqual:[NSNull null]]) externalSites.type = [data valueForKey:@"type"];
                     
                     [listOfExternalSites addObject:externalSites];
                 }

+ 2 - 0
Libraries external/OCCommunicationLib/OCCommunicationLib/OCExternalSites.h

@@ -30,5 +30,7 @@
 @property (nonatomic, strong) NSString *url;
 @property (nonatomic, strong) NSString *lang;
 @property (nonatomic, strong) NSString *icon;
+@property (nonatomic, strong) NSString *type;
+
 
 @end

+ 1 - 0
Libraries external/OCCommunicationLib/OCCommunicationLib/OCExternalSites.m

@@ -36,6 +36,7 @@
         self.url = @"";
         self.lang = @"";
         self.icon = @"";
+        self.type = @"";
     }
     
     return self;

+ 1 - 0
iOSClient/FileSystem/CCCoreData.m

@@ -1977,6 +1977,7 @@
         record.lang = externalSites.lang;
         record.name = externalSites.name;
         record.url = externalSites.url;
+        record.type = externalSites.type;
     }];
 }
 

+ 1 - 0
iOSClient/FileSystem/TableExternalSites+CoreDataProperties.h

@@ -21,6 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nullable, nonatomic, copy) NSString *url;
 @property (nullable, nonatomic, copy) NSString *lang;
 @property (nullable, nonatomic, copy) NSString *icon;
+@property (nullable, nonatomic, copy) NSString *type;
 
 @end
 

+ 1 - 0
iOSClient/FileSystem/TableExternalSites+CoreDataProperties.m

@@ -20,5 +20,6 @@
 @dynamic url;
 @dynamic lang;
 @dynamic icon;
+@dynamic type;
 
 @end

+ 2 - 0
iOSClient/Main/CCMore.swift

@@ -33,6 +33,8 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
     @IBOutlet weak var labelQuota: UILabel!
     @IBOutlet weak var progressQuota: UIProgressView!
 
+    
+    
     let itemsMenuLabelText = [["_transfers_","_activity_","_local_storage_"], ["_settings_"]]
     let itemsMenuImage = [["moreTransfers","moreActivity","moreLocalStorage"], ["moreSettings"]]
     

+ 2 - 1
iOSClient/cryptocloud.xcdatamodeld/cryptocloud 7.xcdatamodel/contents

@@ -85,6 +85,7 @@
         <attribute name="idExternalSite" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="lang" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="type" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="url" optional="YES" attributeType="String" syncable="YES"/>
     </entity>
     <entity name="TableGPS" representedClassName="TableGPS" syncable="YES">
@@ -157,7 +158,7 @@
         <element name="TableAutomaticUpload" positionX="-6597" positionY="801" width="128" height="195"/>
         <element name="TableCertificates" positionX="-6597" positionY="711" width="128" height="60"/>
         <element name="TableDirectory" positionX="-6372" positionY="111" width="162" height="210"/>
-        <element name="TableExternalSites" positionX="-6399" positionY="252" width="128" height="135"/>
+        <element name="TableExternalSites" positionX="-6399" positionY="252" width="128" height="150"/>
         <element name="TableGPS" positionX="-6597" positionY="990" width="128" height="165"/>
         <element name="TableLocalFile" positionX="-6138" positionY="111" width="162" height="225"/>
         <element name="TableMetadata" positionX="-6138" positionY="402" width="162" height="510"/>