浏览代码

small fix

Marino Faggiana 8 年之前
父节点
当前提交
89d18f6eca
共有 2 个文件被更改,包括 6 次插入4 次删除
  1. 5 3
      iOSClient/Main/CCMain.m
  2. 1 1
      iOSClient/Settings/CCSettings.m

+ 5 - 3
iOSClient/Main/CCMain.m

@@ -376,7 +376,9 @@
         app.homeMain = self;
         app.homeMain = self;
         
         
         // Initializations
         // Initializations
-        [app applicationInitialized];
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 1 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+            [app applicationInitialized];
+        });
         
         
     } else {
     } else {
         
         
@@ -4191,7 +4193,8 @@
         
         
         UIImage *iconHeader;
         UIImage *iconHeader;
         BOOL lockDirectory = NO;
         BOOL lockDirectory = NO;
-        
+        NSString *dirServerUrl = [CCUtility stringAppendServerUrl:serverUrl addFileName:_metadata.fileNameData];
+
         // Directory bloccata ?
         // Directory bloccata ?
         if ([CCCoreData isDirectoryLock:dirServerUrl activeAccount:app.activeAccount] && [[CCUtility getBlockCode] length] && app.sessionePasscodeLock == nil) lockDirectory = YES;
         if ([CCCoreData isDirectoryLock:dirServerUrl activeAccount:app.activeAccount] && [[CCUtility getBlockCode] length] && app.sessionePasscodeLock == nil) lockDirectory = YES;
         
         
@@ -4329,7 +4332,6 @@
         
         
 #ifndef NO_OFFLINE
 #ifndef NO_OFFLINE
         
         
-        NSString *dirServerUrl = [CCUtility stringAppendServerUrl:serverUrl addFileName:_metadata.fileNameData];
         NSString *upDir = [CCUtility deletingLastPathComponentFromServerUrl:dirServerUrl];
         NSString *upDir = [CCUtility deletingLastPathComponentFromServerUrl:dirServerUrl];
         NSString *homeDir = [CCUtility getHomeServerUrlActiveUrl:app.activeUrl];
         NSString *homeDir = [CCUtility getHomeServerUrlActiveUrl:app.activeUrl];
         
         

+ 1 - 1
iOSClient/Settings/CCSettings.m

@@ -429,7 +429,7 @@
     
     
     _tableAccount = [CCCoreData getActiveAccount];
     _tableAccount = [CCCoreData getActiveAccount];
     
     
-    rowVersionServer.value = [NSString stringWithFormat:@"%lu.%lu.%lu", [_tableAccount.versionMajor integerValue], [_tableAccount.versionMinor integerValue], [_tableAccount.versionMicro integerValue]];
+    rowVersionServer.value = [NSString stringWithFormat:@"%lu.%lu.%lu",(unsigned long)[_tableAccount.versionMajor integerValue], (unsigned long)[_tableAccount.versionMinor integerValue], (unsigned long)[_tableAccount.versionMicro integerValue]];
     rowUrlCloud.value = app.activeUrl;
     rowUrlCloud.value = app.activeUrl;
     rowUserNameCloud.value = app.activeUser;
     rowUserNameCloud.value = app.activeUser;
     NSString *quota = [CCUtility transformedSize:[_tableAccount.quotaTotal doubleValue]];
     NSString *quota = [CCUtility transformedSize:[_tableAccount.quotaTotal doubleValue]];