Browse Source

Managed parameterEncrypted

Marino Faggiana 8 years ago
parent
commit
e3bc9f5102

+ 7 - 3
Picker/Base.lproj/MainInterface.storyboard

@@ -30,7 +30,7 @@
                                         <rect key="frame" x="0.0" y="28" width="375" height="50"/>
                                         <rect key="frame" x="0.0" y="28" width="375" height="50"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0H6-U8-fd4" id="44X-Sr-gc0">
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0H6-U8-fd4" id="44X-Sr-gc0">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="49"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="49.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Wk9-rb-4yv">
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Wk9-rb-4yv">
@@ -69,7 +69,11 @@
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                 <items>
                                 <items>
                                     <barButtonItem style="plain" systemItem="flexibleSpace" id="Wcn-Rh-qba"/>
                                     <barButtonItem style="plain" systemItem="flexibleSpace" id="Wcn-Rh-qba"/>
-                                    <barButtonItem image="image_shareExtEncrypt" id="5yO-2s-n3Y" userLabel="Encrypt"/>
+                                    <barButtonItem image="image_shareExtEncrypt" id="5yO-2s-n3Y" userLabel="Encrypt">
+                                        <connections>
+                                            <action selector="encryptedButtonTapped:" destination="J6p-g8-CHO" id="OE7-j9-AIp"/>
+                                        </connections>
+                                    </barButtonItem>
                                     <barButtonItem title="title" id="LlY-NF-IiS" userLabel="Save">
                                     <barButtonItem title="title" id="LlY-NF-IiS" userLabel="Save">
                                         <connections>
                                         <connections>
                                             <action selector="saveButtonTapped:" destination="J6p-g8-CHO" id="oZp-Hv-neh"/>
                                             <action selector="saveButtonTapped:" destination="J6p-g8-CHO" id="oZp-Hv-neh"/>
@@ -88,7 +92,7 @@
                         </constraints>
                         </constraints>
                     </view>
                     </view>
                     <connections>
                     <connections>
-                        <outlet property="encryptButton" destination="5yO-2s-n3Y" id="oHZ-7B-nci"/>
+                        <outlet property="encryptedButton" destination="5yO-2s-n3Y" id="IQ2-oG-ATo"/>
                         <outlet property="saveButton" destination="LlY-NF-IiS" id="Vh2-iV-omb"/>
                         <outlet property="saveButton" destination="LlY-NF-IiS" id="Vh2-iV-omb"/>
                         <outlet property="tableView" destination="vA7-yc-aM1" id="nuO-LH-LFc"/>
                         <outlet property="tableView" destination="vA7-yc-aM1" id="nuO-LH-LFc"/>
                         <outlet property="toolBar" destination="kOP-Rg-Mvb" id="lu3-pV-yxw"/>
                         <outlet property="toolBar" destination="kOP-Rg-Mvb" id="lu3-pV-yxw"/>

+ 24 - 5
Picker/DocumentPickerViewController.swift

@@ -41,6 +41,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
     var parameterOriginalURL: URL?
     var parameterOriginalURL: URL?
     var parameterProviderIdentifier: String!
     var parameterProviderIdentifier: String!
     var parameterPasscodeCorrect: Bool? = false
     var parameterPasscodeCorrect: Bool? = false
+    var parameterEncrypted: Bool? = false
 
 
     var metadata : CCMetadata?
     var metadata : CCMetadata?
     var recordsTableMetadata : [TableMetadata]?
     var recordsTableMetadata : [TableMetadata]?
@@ -79,7 +80,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
     @IBOutlet weak var tableView: UITableView!
     @IBOutlet weak var tableView: UITableView!
     @IBOutlet weak var toolBar: UIToolbar!
     @IBOutlet weak var toolBar: UIToolbar!
     @IBOutlet weak var saveButton: UIBarButtonItem!
     @IBOutlet weak var saveButton: UIBarButtonItem!
-    @IBOutlet weak var encryptButton: UIBarButtonItem!
+    @IBOutlet weak var encryptedButton: UIBarButtonItem!
 
 
     
     
     // MARK: - View Life Cycle
     // MARK: - View Life Cycle
@@ -136,9 +137,14 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
             prepareForPresentation(in: parameterMode!)
             prepareForPresentation(in: parameterMode!)
         }
         }
         
         
-        //
-        //UIImage *icon = [[UIImage imageNamed:image_shareExtEncrypt] imageWithRenderingMode:UIImageRenderingModeAutomatic];
-        encryptButton.image = UIImage(named:image_shareExtEncrypt)?.withRenderingMode(.automatic)
+        // Encrypted mode
+        encryptedButton.image = UIImage(named:image_shareExtEncrypt)?.withRenderingMode(.automatic)
+        
+        if parameterEncrypted == true {
+            encryptedButton.tintColor = UIColor(colorLiteralRed: 241.0/255.0, green: 90.0/255.0, blue: 34.0/255.0, alpha: 1)
+        } else {
+            encryptedButton.tintColor = self.view.tintColor
+        }
         
         
         readFolder()
         readFolder()
     }
     }
@@ -430,6 +436,18 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
 
 
 extension DocumentPickerViewController {
 extension DocumentPickerViewController {
     
     
+    @IBAction func encryptedButtonTapped(_ sender: AnyObject) {
+
+        parameterEncrypted = !parameterEncrypted!
+        
+        if parameterEncrypted == true {
+            encryptedButton.tintColor = UIColor(colorLiteralRed: 241.0/255.0, green: 90.0/255.0, blue: 34.0/255.0, alpha: 1)
+        } else {
+            encryptedButton.tintColor = self.view.tintColor
+        }
+
+    }
+    
     @IBAction func saveButtonTapped(_ sender: AnyObject) {
     @IBAction func saveButtonTapped(_ sender: AnyObject) {
         
         
         guard let sourceURL = parameterOriginalURL else {
         guard let sourceURL = parameterOriginalURL else {
@@ -479,7 +497,7 @@ extension DocumentPickerViewController {
                     let metadataNet = CCMetadataNet.init(account: self!.activeAccount)!
                     let metadataNet = CCMetadataNet.init(account: self!.activeAccount)!
                     
                     
                     metadataNet.action = actionUploadFile
                     metadataNet.action = actionUploadFile
-                    metadataNet.cryptated = false
+                    metadataNet.cryptated = self!.parameterEncrypted!
                     metadataNet.fileName = fileName
                     metadataNet.fileName = fileName
                     metadataNet.fileNamePrint = fileName
                     metadataNet.fileNamePrint = fileName
                     metadataNet.serverUrl = self!.localServerUrl
                     metadataNet.serverUrl = self!.localServerUrl
@@ -701,6 +719,7 @@ extension DocumentPickerViewController: UITableViewDataSource {
             nextViewController.parameterOriginalURL = parameterOriginalURL
             nextViewController.parameterOriginalURL = parameterOriginalURL
             nextViewController.parameterProviderIdentifier = parameterProviderIdentifier
             nextViewController.parameterProviderIdentifier = parameterProviderIdentifier
             nextViewController.parameterPasscodeCorrect = parameterPasscodeCorrect
             nextViewController.parameterPasscodeCorrect = parameterPasscodeCorrect
+            nextViewController.parameterEncrypted = parameterEncrypted
             nextViewController.localServerUrl = CCUtility.stringAppendServerUrl(localServerUrl!, addServerUrl: dir)
             nextViewController.localServerUrl = CCUtility.stringAppendServerUrl(localServerUrl!, addServerUrl: dir)
             nextViewController.titleFolder = recordTableMetadata?.fileNamePrint
             nextViewController.titleFolder = recordTableMetadata?.fileNamePrint