Marino Faggiana 8 жил өмнө
parent
commit
b915e8f0cf

+ 2 - 1
Share Ext/ShareViewController.h

@@ -27,6 +27,7 @@
 #import "AFURLSessionManager.h"
 #import "MBProgressHUD.h"
 #import "CCNetworking.h"
+#import "OCNetworking.h"
 #import "CCBKPasscode.h"
 #import "CCGlobal.h"
 #import "CCGraphics.h"
@@ -38,7 +39,7 @@
 
 #import "TableAccount.h"
 
-@interface ShareViewController : UIViewController <UITableViewDelegate, CCMoveDelegate, OCNetworkingDelegate, MBProgressHUDDelegate, BKPasscodeViewControllerDelegate, CCNetworkingDelegate>
+@interface ShareViewController : UIViewController <UITableViewDelegate, OCNetworkingDelegate, MBProgressHUDDelegate, BKPasscodeViewControllerDelegate, CCNetworkingDelegate, CCMoveDelegate>
 
 @property (nonatomic, strong) NSOperationQueue *networkingOperationQueue;
 

+ 1 - 1
Share Ext/ShareViewController.m

@@ -193,7 +193,7 @@
     self.navigationItem.hidesBackButton = YES;
 }
 
-- (void)move:(NSString *)serverUrlTo title:(NSString *)title selectedMetadatas:(NSArray *)selectedMetadatas
+- (void)moveServerUrlTo:(NSString *)serverUrlTo title:(NSString *)title selectedMetadatas:(NSArray *)selectedMetadatas
 {
     if (serverUrlTo)
         _serverUrl = serverUrlTo;

+ 1 - 1
iOSClient/Create/CCCreateCloud.swift

@@ -427,7 +427,7 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
 
     // MARK: - Action
 
-    func move(_ serverUrlTo: String!, title: String!, selectedMetadatas: [Any]!) {
+    func moveServerUrl(to serverUrlTo: String!, title: String!, selectedMetadatas: [Any]!) {
         
         self.serverUrl = serverUrlTo
         

+ 2 - 2
iOSClient/Main/CCMain.m

@@ -466,7 +466,7 @@
 
     } else {
         
-        // we are in home
+        // we are in home : LOGO BRAND
         if ([_serverUrl isEqualToString:[CCUtility getHomeServerUrlActiveUrl:app.activeUrl typeCloud:app.typeCloud]]) {
             
             self.navigationItem.title = nil;
@@ -2131,7 +2131,7 @@
     }
 }
 
-- (void)move:(NSString *)serverUrlTo title:(NSString *)title selectedMetadatas:(NSArray *)selectedMetadatas
+- (void)moveServerUrlTo:(NSString *)serverUrlTo title:(NSString *)title selectedMetadatas:(NSArray *)selectedMetadatas
 {
     // Test
     if ([_serverUrl isEqualToString:serverUrlTo]) {

+ 1 - 3
iOSClient/Move/CCMove.h

@@ -59,8 +59,6 @@
 
 @protocol CCMoveDelegate <NSObject>
 
-@optional
-
-- (void)move:(NSString *)serverUrlTo title:(NSString *)title selectedMetadatas:(NSArray *)selectedMetadatas;
+- (void)moveServerUrlTo:(NSString *)serverUrlTo title:(NSString *)title selectedMetadatas:(NSArray *)selectedMetadatas;
 
 @end

+ 1 - 1
iOSClient/Move/CCMove.m

@@ -135,7 +135,7 @@
 {
     [_networkingOperationQueue cancelAllOperations];
     
-    [self.delegate move:_serverUrl title:self.passMetadata.fileNamePrint selectedMetadatas:self.selectedMetadatas];
+    [self.delegate moveServerUrlTo:_serverUrl title:self.passMetadata.fileNamePrint selectedMetadatas:self.selectedMetadatas];
         
     [self dismissViewControllerAnimated:YES completion:nil];
 }

+ 1 - 1
iOSClient/QuickActions/CCQuickActions.m

@@ -169,7 +169,7 @@
 #pragma mark ===== Move =====
 #pragma --------------------------------------------------------------------------------------------
 
-- (void)move:(NSString *)serverUrlTo title:(NSString *)title selectedMetadatas:(NSArray *)selectedMetadatas
+- (void)moveServerUrlTo:(NSString *)serverUrlTo title:(NSString *)title selectedMetadatas:(NSArray *)selectedMetadatas
 {    
     [_mainVC uploadFileAsset:_assets serverUrl:serverUrlTo cryptated:_cryptated useSubFolder:NO session:upload_session];
 }

+ 1 - 1
iOSClient/UploadFromOtherUpp/CCUploadFromOtherUpp.m

@@ -144,7 +144,7 @@
 #pragma mark == IBAction ==
 #pragma --------------------------------------------------------------------------------------------
 
-- (void)move:(NSString *)serverUrlTo title:(NSString *)title selectedMetadatas:(NSArray *)selectedMetadatas
+- (void)moveServerUrlTo:(NSString *)serverUrlTo title:(NSString *)title selectedMetadatas:(NSArray *)selectedMetadatas
 {
     if (serverUrlTo) {
         serverUrlLocal = serverUrlTo;