Release 1.6.21

sensorsdata · Oct 24, 2016 · 683f7e5 · 683f7e5
1 parent eeb49aa
commit 683f7e5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/SensorsAnalyticsSDK/SensorsAnalyticsSDK.podspec b/SensorsAnalyticsSDK/SensorsAnalyticsSDK.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SensorsAnalyticsSDK"
-  s.version      = "1.6.20"
+  s.version      = "1.6.21"
   s.summary      = "The offical iOS SDK of Sensors Analytics."
   s.homepage     = "http://www.sensorsdata.cn"
   s.source       = { :git => 'https://github.com/sensorsdata/sa-sdk-ios.git', :tag => "v#{s.version}" } 

diff --git a/SensorsAnalyticsSDK/SensorsAnalyticsSDK/MessageQueueBySqlite.m b/SensorsAnalyticsSDK/SensorsAnalyticsSDK/MessageQueueBySqlite.m
@@ -119,8 +119,13 @@ - (BOOL) removeFirstRecords:(NSUInteger)recordSize withType:(NSString *)type {
     NSUInteger removeSize = MIN(recordSize, _messageCount);
     NSString* query = [NSString stringWithFormat:@"DELETE FROM dataCache WHERE id IN (SELECT id FROM dataCache WHERE type = '%@' ORDER BY id ASC LIMIT %lu);", type, (unsigned long)removeSize];
     char* errMsg;
-    if (sqlite3_exec(_database, [query UTF8String], NULL, NULL, &errMsg) != SQLITE_OK) {
-        SAError(@"Failed to delete record msg=%s", errMsg);
+    @try {
+        if (sqlite3_exec(_database, [query UTF8String], NULL, NULL, &errMsg) != SQLITE_OK) {
+            SAError(@"Failed to delete record msg=%s", errMsg);
+            return NO;
+        }
+    } @catch (NSException *exception) {
+        SAError(@"Failed to delete record exception=%@",exception);
         return NO;
     }
     _messageCount = [self sqliteCount];
@@ -149,13 +154,17 @@ - (NSInteger) sqliteCount {
 }
 
 - (BOOL) vacuum {
-    NSString* query = @"VACUUM";
-    char* errMsg;
-    if (sqlite3_exec(_database, [query UTF8String], NULL, NULL, &errMsg) != SQLITE_OK) {
-        SAError(@"Failed to delete record msg=%s", errMsg);
+    @try {
+        NSString* query = @"VACUUM";
+        char* errMsg;
+        if (sqlite3_exec(_database, [query UTF8String], NULL, NULL, &errMsg) != SQLITE_OK) {
+            SAError(@"Failed to delete record msg=%s", errMsg);
+            return NO;
+        }
+        return YES;
+    } @catch (NSException *exception) {
         return NO;
     }
-    return YES;
 }
 
 

diff --git a/SensorsAnalyticsSDK/SensorsAnalyticsSDK/SensorsAnalyticsSDK.m b/SensorsAnalyticsSDK/SensorsAnalyticsSDK/SensorsAnalyticsSDK.m
@@ -35,7 +35,7 @@
 #import <WebKit/WebKit.h>
 #endif
 
-#define VERSION @"1.6.20"
+#define VERSION @"1.6.21"
 
 #define PROPERTY_LENGTH_LIMITATION 8191