Merge branch 'releases/7.x' into upload_gzip

Author: YangSen-qn

CHANGELOG.md

@@ -1,5 +1,9 @@
 #Changelog
 
+## 7.4.4 (2020-08-13)
+## 修正
+修复reporter的bug，增加NSHandle的异常捕获。
+
 ## 7.4.3 (2020-07-27)
 ## 优化
 优化Dns预取的缓存方案

Qiniu.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'Qiniu'
-  s.version      = '7.4.3'
+  s.version      = '7.4.4'
   s.summary      = 'Qiniu Resource Storage SDK for iOS and Mac'
   s.homepage     = 'https://github.com/qiniu/objc-sdk'
   s.social_media_url = 'http://weibo.com/qiniutek'

QiniuSDK/Storage/QNUploadInfoReporter.m

@@ -434,9 +434,7 @@ - (void)clean {
         NSError *error = nil;
         [_fileManager removeItemAtPath:_recorderFilePath error:&error];
         if (error) {
-            QNAsyncRunInMain(^{
-                NSLog(@"remove recorder file failed: %@", error);
-            });
+            NSLog(@"remove recorder file failed: %@", error);
             return;
         }
     }
@@ -446,9 +444,7 @@ - (BOOL)checkReportAvailable {
 
     if (!_config.isReportEnable) return NO;
     if (!(_config.maxRecordFileSize > _config.uploadThreshold)) {
-        QNAsyncRunInMain(^{
-            NSLog(@"maxRecordFileSize must be larger than uploadThreshold");
-        });
+        NSLog(@"maxRecordFileSize must be larger than uploadThreshold");
         return NO;
     }
     return YES;
@@ -471,9 +467,7 @@ - (void)innerReport:(NSString *)jsonString token:(NSString *)token {
     if (![_fileManager fileExistsAtPath:_config.recordDirectory]) {
         [_fileManager createDirectoryAtPath:_config.recordDirectory withIntermediateDirectories:YES attributes:nil error:&error];
         if (error) {
-            QNAsyncRunInMain(^{
-                NSLog(@"create record directory failed, please check record directory: %@", error.localizedDescription);
-            });
+            NSLog(@"create record directory failed, please check record directory: %@", error.localizedDescription);
             return;
         }
     }
@@ -487,19 +481,21 @@ - (void)innerReport:(NSString *)jsonString token:(NSString *)token {
         // recordFile存在，拼接文件内容、上传到服务器
         QNFile *file = [[QNFile alloc] init:_recorderFilePath error:&error];
         if (error) {
-            QNAsyncRunInMain(^{
-                NSLog(@"create QNFile with path failed: %@", error.localizedDescription);
-            });
+            NSLog(@"create QNFile with path failed: %@", error.localizedDescription);
             return;
         }
 
         // 判断recorder文件大小是否超过maxRecordFileSize
         if (file.size < _config.maxRecordFileSize) {
-            // 上传信息写入recorder文件
-            NSFileHandle *fileHandler = [NSFileHandle fileHandleForUpdatingAtPath:_recorderFilePath];
-            [fileHandler seekToEndOfFile];
-            [fileHandler writeData:[finalRecordInfo dataUsingEncoding:NSUTF8StringEncoding]];
-            [fileHandler closeFile];
+            @try {
+                // 上传信息写入recorder文件
+                NSFileHandle *fileHandler = [NSFileHandle fileHandleForUpdatingAtPath:_recorderFilePath];
+                [fileHandler seekToEndOfFile];
+                [fileHandler writeData: [finalRecordInfo dataUsingEncoding:NSUTF8StringEncoding]];
+                [fileHandler closeFile];
+            } @catch (NSException *exception) {
+                NSLog(@"NSFileHandle cannot write data: %@", exception.description);
+            }
         }
 
         // 判断是否满足上传条件：文件大于上报临界值 && (首次上传 || 距上次上传时间大于_config.interval)
@@ -530,9 +526,7 @@ - (void)innerReport:(NSString *)jsonString token:(NSString *)token {
                     }
                     [self clean];
                 } else {
-                    QNAsyncRunInMain(^{
-                        NSLog(@"upload info report failed: %@", error.localizedDescription);
-                    });
+                    NSLog(@"upload info report failed: %@", error.localizedDescription);
                 }
                 [session finishTasksAndInvalidate];
                 dispatch_semaphore_signal(self.semaphore);

QiniuSDK/Utils/QNVersion.h

@@ -11,4 +11,4 @@
 /**
  *    sdk 版本
  */
-static NSString *const kQiniuVersion = @"7.4.3";
+static NSString *const kQiniuVersion = @"7.4.4";