Marino Faggiana 8 жил өмнө
parent
commit
27f8cc1ba3

+ 0 - 3
iOSClient/AppDelegate.h

@@ -83,9 +83,6 @@
 @property (nonatomic, strong) NSMutableDictionary *sharesLink;
 @property (nonatomic, strong) NSMutableDictionary *sharesLink;
 @property (nonatomic, strong) NSMutableDictionary *sharesUserAndGroup;
 @property (nonatomic, strong) NSMutableDictionary *sharesUserAndGroup;
 
 
-// Check new Asset Photos/Video in progress 
-@property BOOL automaticCheckAssetInProgress;
-
 // UploadFromOtherUpp
 // UploadFromOtherUpp
 @property (nonatomic, strong) NSString *fileNameUpload;
 @property (nonatomic, strong) NSString *fileNameUpload;
 
 

+ 0 - 7
iOSClient/AppDelegate.m

@@ -179,9 +179,6 @@
     _netQueueUploadWWan.name = k_upload_queuewwan;
     _netQueueUploadWWan.name = k_upload_queuewwan;
     _netQueueUploadWWan.maxConcurrentOperationCount = k_maxConcurrentOperationDownloadUpload;
     _netQueueUploadWWan.maxConcurrentOperationCount = k_maxConcurrentOperationDownloadUpload;
     
     
-    // Check new Asset Photos/Video in progress  
-    _automaticCheckAssetInProgress = NO;
-    
     // Add notification change session
     // Add notification change session
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(sessionChanged:) name:k_networkingSessionNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(sessionChanged:) name:k_networkingSessionNotification object:nil];
         
         
@@ -1344,10 +1341,6 @@
     CCMetadataNet *metadataNet;
     CCMetadataNet *metadataNet;
     NSInteger counterUpload = 0;
     NSInteger counterUpload = 0;
     
     
-    // Is loading new Asset or this  ?
-    if (_automaticCheckAssetInProgress)
-        return;
-        
     NSArray *uploadInQueue = [[NCManageDatabase sharedInstance] getTableMetadataUpload];
     NSArray *uploadInQueue = [[NCManageDatabase sharedInstance] getTableMetadataUpload];
     
     
     NSArray *recordAutomaticUploadInLock =  [[NCManageDatabase sharedInstance] getLockAutomaticUpload];
     NSArray *recordAutomaticUploadInLock =  [[NCManageDatabase sharedInstance] getLockAutomaticUpload];

+ 0 - 13
iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -1058,10 +1058,6 @@
     NSMutableArray *newItemsToUpload;
     NSMutableArray *newItemsToUpload;
     tableAccount *tableAccount = [[NCManageDatabase sharedInstance] getAccountActive];
     tableAccount *tableAccount = [[NCManageDatabase sharedInstance] getAccountActive];
     
     
-    // Is loading new Asset ?
-    if (app.automaticCheckAssetInProgress)
-        return;
-    
     // Check Asset : NEW or FULL
     // Check Asset : NEW or FULL
     if (assetsFull) {
     if (assetsFull) {
         
         
@@ -1079,9 +1075,6 @@
     if ([newItemsToUpload count] == 0)
     if ([newItemsToUpload count] == 0)
         return;
         return;
     
     
-    // STOP
-    app.automaticCheckAssetInProgress = YES;
-    
     // Disable idle timer
     // Disable idle timer
     [[UIApplication sharedApplication] setIdleTimerDisabled: YES];
     [[UIApplication sharedApplication] setIdleTimerDisabled: YES];
     
     
@@ -1136,9 +1129,6 @@
         // end loading
         // end loading
         [_hud hideHud];
         [_hud hideHud];
         
         
-        // START
-        app.automaticCheckAssetInProgress = NO;
-        
         // Enable idle timer
         // Enable idle timer
         [[UIApplication sharedApplication] setIdleTimerDisabled:NO];
         [[UIApplication sharedApplication] setIdleTimerDisabled:NO];
         
         
@@ -1200,9 +1190,6 @@
     // end loading
     // end loading
     [_hud hideHud];
     [_hud hideHud];
     
     
-    // START
-    app.automaticCheckAssetInProgress = NO;
-    
     // Enable idle timer
     // Enable idle timer
     [[UIApplication sharedApplication] setIdleTimerDisabled:NO];
     [[UIApplication sharedApplication] setIdleTimerDisabled:NO];
 }
 }