Marino Faggiana пре 7 година
родитељ
комит
da943fc821
3 измењених фајлова са 3 додато и 6 уклоњено
  1. 0 2
      iOSClient/AppDelegate.h
  2. 3 3
      iOSClient/AppDelegate.m
  3. 0 1
      iOSClient/CCGlobal.h

+ 0 - 2
iOSClient/AppDelegate.h

@@ -47,8 +47,6 @@
 // Timer Process
 @property (nonatomic, strong) NSTimer *timerProcessAutoDownloadUpload;
 @property (nonatomic, strong) NSTimer *timerUpdateApplicationIconBadgeNumber;
-@property (nonatomic, strong) NSTimer *timerUnlockEncryptedFolder;
-
 
 // For LMMediaPlayerView
 @property (strong, nonatomic) UIWindow *window;

+ 3 - 3
iOSClient/AppDelegate.m

@@ -217,7 +217,6 @@
     
     // Start Timer
     self.timerProcessAutoDownloadUpload = [NSTimer scheduledTimerWithTimeInterval:2.0 target:self selector:@selector(processAutoDownloadUpload) userInfo:nil repeats:YES];
-    self.timerUnlockEncryptedFolder = [NSTimer scheduledTimerWithTimeInterval:k_timerUnlockEncryptedFolder target:self selector:@selector(unlockEncryptedFolder) userInfo:nil repeats:YES];
     self.timerUpdateApplicationIconBadgeNumber = [NSTimer scheduledTimerWithTimeInterval:k_timerUpdateApplicationIconBadgeNumber target:self selector:@selector(updateApplicationIconBadgeNumber) userInfo:nil repeats:YES];
 
     // Registration Push Notification
@@ -1538,11 +1537,11 @@
     _timerProcessAutoDownloadUpload = [NSTimer scheduledTimerWithTimeInterval:k_timerProcessAutoDownloadUpload target:self selector:@selector(processAutoDownloadUpload) userInfo:nil repeats:YES];
 }
 
-
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== E2E Encryption verify unlock < k_timerUnlockEncryptedFolder seconds > =====
 #pragma --------------------------------------------------------------------------------------------
 
+/*
 // E2E
 - (void)unlockEncryptedFolder
 {
@@ -1560,7 +1559,7 @@
         
         endStartTimer = false;
         
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 10 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, k_timerUnlockEncryptedFolder/2 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
             
             // Is locked ?
             tableDirectory *directoryLock= [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND e2eTokenLock = %@", self.activeAccount, directory.e2eTokenLock]];
@@ -1597,6 +1596,7 @@
     if (errorCode == 404)
          [[NCManageDatabase sharedInstance] setDirectoryE2ETokenLockWithFileID:metadataNet.fileID token:@""];
 }
+*/
 
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== Open CCUploadFromOtherUpp  =====

+ 0 - 1
iOSClient/CCGlobal.h

@@ -119,7 +119,6 @@ extern NSString *const dav;
 #define k_timerVerifySession                            10
 #define k_timerProcessAutoDownloadUpload                5
 #define k_timerUpdateApplicationIconBadgeNumber         3
-#define k_timerUnlockEncryptedFolder                    5
 
 #define k_maxConcurrentOperation                         10
 #define k_maxConcurrentOperationDownloadUpload           10