removed animation logo a

Picker/DocumentPickerViewController.swift

@@ -252,7 +252,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         metadataNet.serverUrl = self.serverUrl
         metadataNet.selector = selectorReadFolder
         
-        let ocNetworking : OCnetworking = OCnetworking.init(delegate: self, metadataNet: metadataNet, withUser: activeUser, withPassword: activePassword, withUrl: activeUrl, activityIndicator: false, isCryptoCloudMode: isCryptoCloudMode!)
+        let ocNetworking : OCnetworking = OCnetworking.init(delegate: self, metadataNet: metadataNet, withUser: activeUser, withPassword: activePassword, withUrl: activeUrl, isCryptoCloudMode: isCryptoCloudMode!)
         networkingOperationQueue.addOperation(ocNetworking)
         
         hud.visibleIndeterminateHud()
@@ -326,7 +326,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
                 metadataNet.session = k_download_session_foreground
                 metadataNet.taskStatus = Int(k_taskStatusResume)
                 
-                let ocNetworking : OCnetworking = OCnetworking.init(delegate: self, metadataNet: metadataNet, withUser: activeUser, withPassword: activePassword, withUrl: activeUrl, activityIndicator: false, isCryptoCloudMode: isCryptoCloudMode!)
+                let ocNetworking : OCnetworking = OCnetworking.init(delegate: self, metadataNet: metadataNet, withUser: activeUser, withPassword: activePassword, withUrl: activeUrl, isCryptoCloudMode: isCryptoCloudMode!)
                 networkingOperationQueue.addOperation(ocNetworking)
             }
         }
@@ -375,7 +375,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         metadataNet.selector = selectorDownloadThumbnail;
         metadataNet.serverUrl = self.serverUrl
         
-        let ocNetworking : OCnetworking = OCnetworking.init(delegate: self, metadataNet: metadataNet, withUser: activeUser, withPassword: activePassword, withUrl: activeUrl, activityIndicator: false, isCryptoCloudMode: isCryptoCloudMode!)
+        let ocNetworking : OCnetworking = OCnetworking.init(delegate: self, metadataNet: metadataNet, withUser: activeUser, withPassword: activePassword, withUrl: activeUrl, isCryptoCloudMode: isCryptoCloudMode!)
         networkingOperationQueue.addOperation(ocNetworking)
     }
 
@@ -551,7 +551,7 @@ extension DocumentPickerViewController {
                     metadataNet.session = k_upload_session_foreground
                     metadataNet.taskStatus = Int(k_taskStatusResume)
                     
-                    let ocNetworking : OCnetworking = OCnetworking.init(delegate: self!, metadataNet: metadataNet, withUser: self!.activeUser, withPassword: self!.activePassword, withUrl: self!.activeUrl, activityIndicator: false, isCryptoCloudMode: self!.isCryptoCloudMode!)
+                    let ocNetworking : OCnetworking = OCnetworking.init(delegate: self!, metadataNet: metadataNet, withUser: self!.activeUser, withPassword: self!.activePassword, withUrl: self!.activeUrl, isCryptoCloudMode: self!.isCryptoCloudMode!)
                     self!.networkingOperationQueue.addOperation(ocNetworking)
                     
                     self!.hud.visibleHudTitle(NSLocalizedString("_uploading_", comment: ""), mode: MBProgressHUDMode.determinateHorizontalBar, color: self!.navigationController?.view.tintColor)
@@ -785,7 +785,7 @@ extension DocumentPickerViewController: UITableViewDataSource {
                 metadataNet.session = k_download_session_foreground
                 metadataNet.taskStatus = Int(k_taskStatusResume)
             
-                let ocNetworking : OCnetworking = OCnetworking.init(delegate: self, metadataNet: metadataNet, withUser: activeUser, withPassword: activePassword, withUrl: activeUrl, activityIndicator: false, isCryptoCloudMode: self.isCryptoCloudMode!)
+                let ocNetworking : OCnetworking = OCnetworking.init(delegate: self, metadataNet: metadataNet, withUser: activeUser, withPassword: activePassword, withUrl: activeUrl, isCryptoCloudMode: self.isCryptoCloudMode!)
                 networkingOperationQueue.addOperation(ocNetworking)
                 
                 hud.visibleHudTitle(NSLocalizedString("_loading_", comment: ""), mode: MBProgressHUDMode.determinateHorizontalBar, color: self.navigationController?.view.tintColor)

Share Ext/ShareViewController.m

@@ -344,7 +344,7 @@
 {
     id operation;
    
-    operation = [[OCnetworking alloc] initWithDelegate:self metadataNet:metadataNet withUser:_activeUser withPassword:_activePassword withUrl:_activeUrl activityIndicator:NO isCryptoCloudMode:_isCryptoCloudMode];
+    operation = [[OCnetworking alloc] initWithDelegate:self metadataNet:metadataNet withUser:_activeUser withPassword:_activePassword withUrl:_activeUrl isCryptoCloudMode:_isCryptoCloudMode];
     
     [operation setQueuePriority:metadataNet.priority];
     

iOSClient/AppDelegate.h

@@ -141,9 +141,6 @@
 // check isDeviceJailbroken
 @property BOOL isDeviceJailbroken;
 
-// Animated title _brand_
-@property BOOL isTitleBrandAnimated;
-
 // Is in Crypto Mode
 @property BOOL isCryptoCloudMode;
 

iOSClient/AppDelegate.m

@@ -1089,13 +1089,8 @@
 - (void)addNetworkingOperationQueue:(NSOperationQueue *)netQueue delegate:(id)delegate metadataNet:(CCMetadataNet *)metadataNet
 {
     id operation;
-    BOOL activityIndicator = NO;
     
-    // Activity Indicator
-    if (netQueue == _netQueue)
-        activityIndicator = YES;
-    
-    operation = [[OCnetworking alloc] initWithDelegate:delegate metadataNet:metadataNet withUser:_activeUser withPassword:_activePassword withUrl:_activeUrl activityIndicator:activityIndicator isCryptoCloudMode:_isCryptoCloudMode];
+    operation = [[OCnetworking alloc] initWithDelegate:delegate metadataNet:metadataNet withUser:_activeUser withPassword:_activePassword withUrl:_activeUrl isCryptoCloudMode:_isCryptoCloudMode];
     
     [operation setQueuePriority:metadataNet.priority];
     

iOSClient/Login/CCLogin.m

@@ -206,7 +206,7 @@
     if ([[self.baseUrl.text substringFromIndex:[self.baseUrl.text length] - 1] isEqualToString:@"/"])
         self.baseUrl.text = [self.baseUrl.text substringToIndex:[self.baseUrl.text length] - 1];
     
-    OCnetworking *ocNet = [[OCnetworking alloc] initWithDelegate:self metadataNet:nil withUser:self.user.text withPassword:self.password.text withUrl:nil activityIndicator:NO isCryptoCloudMode:NO];
+    OCnetworking *ocNet = [[OCnetworking alloc] initWithDelegate:self metadataNet:nil withUser:self.user.text withPassword:self.password.text withUrl:nil isCryptoCloudMode:NO];
     NSError *error = [ocNet readFileSync:[NSString stringWithFormat:@"%@%@", self.baseUrl.text, webDAV]];
     
     if (!error) {

iOSClient/Main/CCMain.m

@@ -177,7 +177,7 @@
     }
 
     // Title
-    [self setTitleNOAnimation];
+    [self setTitle];
         
     // List Transfers
     app.controlCenter = (CCControlCenter *)self.navigationController;
@@ -460,20 +460,6 @@
     [_ImageTitleHomeCryptoCloud setUserInteractionEnabled:NO];
 }
 
-- (void)setTitleNOAnimation
-{
-    app.isTitleBrandAnimated = NO;
-
-    [self setTitle];
-}
-
-- (void)setTitleYESAnimation
-{
-    app.isTitleBrandAnimated = YES;
-    
-    [self setTitle];
-}
-
 - (void)setTitle
 {
     // PopGesture in progress [swipe gesture to switch between views]
@@ -498,21 +484,8 @@
             
             self.navigationItem.title = nil;
             
-            if (app.isTitleBrandAnimated) {
-                
-                NSArray *animationArray = [NSArray arrayWithObjects:[UIImage imageNamed:image_brandNavigationController1],[UIImage imageNamed:image_brandNavigationController2],[UIImage imageNamed:image_brandNavigationController3],[UIImage imageNamed:image_brandNavigationController2],nil];
-
-                _ImageTitleHomeCryptoCloud.animationImages = animationArray;
-                _ImageTitleHomeCryptoCloud.animationDuration = 0.9;
-                _ImageTitleHomeCryptoCloud.animationRepeatCount = -1;
-                
-                [_ImageTitleHomeCryptoCloud startAnimating];
-                
-            } else {
-                
-                if ([app.reachability isReachable] == NO) _ImageTitleHomeCryptoCloud = [[UIImageView alloc] initWithImage:[UIImage imageNamed:image_brandNavigationControllerOffline]];
-                else _ImageTitleHomeCryptoCloud = [[UIImageView alloc] initWithImage:[UIImage imageNamed:image_brandNavigationController]];
-            }
+            if ([app.reachability isReachable] == NO) _ImageTitleHomeCryptoCloud = [[UIImageView alloc] initWithImage:[UIImage imageNamed:image_brandNavigationControllerOffline]];
+            else _ImageTitleHomeCryptoCloud = [[UIImageView alloc] initWithImage:[UIImage imageNamed:image_brandNavigationController]];
             
             [_ImageTitleHomeCryptoCloud setUserInteractionEnabled:YES];
             UITapGestureRecognizer *singleTap =  [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(menuChangeUser)];
@@ -4782,7 +4755,7 @@
     else
         [self setUINavigationBarDefault];
     
-    [self setTitleNOAnimation];
+    [self setTitle];
 }
 
 - (void)tableViewReload
@@ -4797,7 +4770,7 @@
     [self setTableViewFooter];
     
     if (self.tableView.editing)
-        [self setTitleNOAnimation];
+        [self setTitle];
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
@@ -5369,7 +5342,7 @@
     // se siamo in modalità editing impostiamo il titolo dei selezioati e usciamo subito
     if (self.tableView.editing) {
         
-        [self setTitleNOAnimation];
+        [self setTitle];
         return;
     }
     
@@ -5473,7 +5446,7 @@
 
 - (void)tableView:(UITableView *)tableView didDeselectRowAtIndexPath:(nonnull NSIndexPath *)indexPath
 {
-    [self setTitleNOAnimation];
+    [self setTitle];
 }
 
 #pragma --------------------------------------------------------------------------------------------

iOSClient/Move/CCMove.m

@@ -228,7 +228,7 @@
 
 - (void)addNetworkingQueue:(CCMetadataNet *)metadataNet
 {
-    OCnetworking *operation = [[OCnetworking alloc] initWithDelegate:self metadataNet:metadataNet withUser:activeUser withPassword:activePassword withUrl:activeUrl activityIndicator:NO isCryptoCloudMode:_isCryptoCloudMode];
+    OCnetworking *operation = [[OCnetworking alloc] initWithDelegate:self metadataNet:metadataNet withUser:activeUser withPassword:activePassword withUrl:activeUrl isCryptoCloudMode:_isCryptoCloudMode];
         
     _networkingOperationQueue.maxConcurrentOperationCount = k_maxConcurrentOperation;
     [_networkingOperationQueue addOperation:operation];

iOSClient/Networking/OCNetworking.h

@@ -35,7 +35,7 @@
 
 @interface OCnetworking : NSOperation <CCNetworkingDelegate>
 
-- (id)initWithDelegate:(id <OCNetworkingDelegate>)delegate metadataNet:(CCMetadataNet *)metadataNet withUser:(NSString *)withUser withPassword:(NSString *)withPassword withUrl:(NSString *)withUrl activityIndicator:(BOOL)activityIndicator isCryptoCloudMode:(BOOL)isCryptoCloudMode;
+- (id)initWithDelegate:(id <OCNetworkingDelegate>)delegate metadataNet:(CCMetadataNet *)metadataNet withUser:(NSString *)withUser withPassword:(NSString *)withPassword withUrl:(NSString *)withUrl isCryptoCloudMode:(BOOL)isCryptoCloudMode;
 
 @property (nonatomic, weak) id <OCNetworkingDelegate> delegate;
 

iOSClient/Networking/OCNetworking.m

@@ -40,14 +40,13 @@
     NSURLSessionUploadTask *_uploadTask;
     
     BOOL _isCryptoCloudMode;
-    BOOL _activityIndicator;
     BOOL _hasServerForbiddenCharactersSupport;
 }
 @end
 
 @implementation OCnetworking
 
-- (id)initWithDelegate:(id <OCNetworkingDelegate>)delegate metadataNet:(CCMetadataNet *)metadataNet withUser:(NSString *)withUser withPassword:(NSString *)withPassword withUrl:(NSString *)withUrl activityIndicator:(BOOL)activityIndicator isCryptoCloudMode:(BOOL)isCryptoCloudMode
+- (id)initWithDelegate:(id <OCNetworkingDelegate>)delegate metadataNet:(CCMetadataNet *)metadataNet withUser:(NSString *)withUser withPassword:(NSString *)withPassword withUrl:(NSString *)withUrl isCryptoCloudMode:(BOOL)isCryptoCloudMode
 {
     self = [super init];
     
@@ -63,7 +62,6 @@
         _activeUrl = withUrl;
         
         _isCryptoCloudMode = isCryptoCloudMode;
-        _activityIndicator = activityIndicator;
     }
     
     return self;
@@ -121,14 +119,6 @@
 - (void)poolNetworking
 {
 #ifndef EXTENSION
-    // Animation network
-    if (_activityIndicator) {
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES];
-            [[NSNotificationCenter defaultCenter] postNotificationName:@"setTitleCCMainYESAnimation" object:nil];
-        });
-    }
-    
     _hasServerForbiddenCharactersSupport = app.hasServerForbiddenCharactersSupport;
 #else
     _hasServerForbiddenCharactersSupport = YES;
@@ -143,17 +133,7 @@
 #pragma --------------------------------------------------------------------------------------------
 
 - (void)complete
-{
-#ifndef EXTENSION
-    // Animation network
-    if (_activityIndicator) {
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.5 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
-            [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
-            [[NSNotificationCenter defaultCenter] postNotificationName:@"setTitleCCMainNOAnimation" object:nil];
-        });
-    }
-#endif
-    
+{    
     [self finish];
 }
 

iOSClient/Nextcloud.xcassets/nextcloud_navigationcontroller.imageset/Contents.json

@@ -2,8 +2,8 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "nextcloud_navigationcontroller.png"
+      "filename" : "nextcloud_navigationcontroller.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
@@ -12,8 +12,8 @@
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "nextcloud_navigationcontroller@3x.png"
+      "filename" : "nextcloud_navigationcontroller@3x copia.png",
+      "scale" : "3x"
     }
   ],
   "info" : {

iOSClient/Nextcloud.xcassets/nextcloud_navigationcontroller1.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "nextcloud_navigationcontroller1.png"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "nextcloud_navigationcontroller1@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "nextcloud_navigationcontroller1@3x.png"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iOSClient/Nextcloud.xcassets/nextcloud_navigationcontroller2.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "nextcloud_navigationcontroller2.png"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "nextcloud_navigationcontroller2@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "nextcloud_navigationcontroller2@3x.png"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iOSClient/Nextcloud.xcassets/nextcloud_navigationcontroller3.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "nextcloud_navigationcontroller3.png"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "nextcloud_navigationcontroller3@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "nextcloud_navigationcontroller3@3x.png"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}