Release 1.6.16

sensorsdata · Sep 30, 2016 · 031abb0 · 031abb0
1 parent 161dc77
commit 031abb0
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 28 deletions.
diff --git a/SensorsAnalyticsSDK/SensorsAnalyticsSDK/build.gradle b/SensorsAnalyticsSDK/SensorsAnalyticsSDK/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
-version = "1.6.15"
+version = "1.6.16"
 
 android {
     compileSdkVersion 21

diff --git a/...rsAnalyticsSDK/src/main/java/com/sensorsdata/analytics/android/sdk/AnalyticsMessages.java b/...rsAnalyticsSDK/src/main/java/com/sensorsdata/analytics/android/sdk/AnalyticsMessages.java
@@ -70,36 +70,40 @@ public static AnalyticsMessages getInstance(final Context messageContext, final
     }
 
     public void enqueueEventMessage(final String type, final JSONObject eventJson) {
-        synchronized (mDbAdapter) {
-            int ret = mDbAdapter.addJSON(eventJson, DbAdapter.Table.EVENTS);
-            if (ret < 0) {
-                String error = "Failed to enqueue the event: " + eventJson;
-                if (SensorsDataAPI.sharedInstance(mContext).isDebugMode()) {
-                    throw new DebugModeException(error);
-                } else {
-                    Log.w(LOGTAG, error);
+        try {
+            synchronized (mDbAdapter) {
+                int ret = mDbAdapter.addJSON(eventJson, DbAdapter.Table.EVENTS);
+                if (ret < 0) {
+                    String error = "Failed to enqueue the event: " + eventJson;
+                    if (SensorsDataAPI.sharedInstance(mContext).isDebugMode()) {
+                        throw new DebugModeException(error);
+                    } else {
+                        Log.w(LOGTAG, error);
+                    }
                 }
-            }
 
-            final Message m = Message.obtain();
-            m.what = FLUSH_QUEUE;
+                final Message m = Message.obtain();
+                m.what = FLUSH_QUEUE;
 
-            if (SensorsDataAPI.sharedInstance(mContext).isDebugMode() || ret ==
-                    DbAdapter.DB_OUT_OF_MEMORY_ERROR) {
-                mWorker.runMessage(m);
-            } else {
-                String networkType = SensorsDataUtils.networkType(mContext);
-                if (networkType.equals("WIFI") || networkType.equals("3G") || networkType.equals("4G")) {
-                    // track_signup 立即发送
-                    if (type.equals("track_signup") || ret > SensorsDataAPI.sharedInstance(mContext)
-                            .getFlushBulkSize()) {
-                        mWorker.runMessage(m);
-                    } else {
-                        final int interval = SensorsDataAPI.sharedInstance(mContext).getFlushInterval();
-                        mWorker.runMessageOnce(m, interval);
+                if (SensorsDataAPI.sharedInstance(mContext).isDebugMode() || ret ==
+                        DbAdapter.DB_OUT_OF_MEMORY_ERROR) {
+                    mWorker.runMessage(m);
+                } else {
+                    String networkType = SensorsDataUtils.networkType(mContext);
+                    if (networkType.equals("WIFI") || networkType.equals("3G") || networkType.equals("4G")) {
+                        // track_signup 立即发送
+                        if (type.equals("track_signup") || ret > SensorsDataAPI.sharedInstance(mContext)
+                                .getFlushBulkSize()) {
+                            mWorker.runMessage(m);
+                        } else {
+                            final int interval = SensorsDataAPI.sharedInstance(mContext).getFlushInterval();
+                            mWorker.runMessageOnce(m, interval);
+                        }
                     }
                 }
             }
+        } catch (Exception e) {
+            Log.w(LOGTAG, "enqueueEventMessage error:" + e);
         }
     }
 

diff --git a/...nsorsAnalyticsSDK/src/main/java/com/sensorsdata/analytics/android/sdk/SensorsDataAPI.java b/...nsorsAnalyticsSDK/src/main/java/com/sensorsdata/analytics/android/sdk/SensorsDataAPI.java
@@ -1224,7 +1224,7 @@ public void onActivityResumed(Activity activity) {
                     } else {
                         track("$AppViewScreen", properties);
                     }
-                } catch (InvalidDataException | JSONException e) {
+                } catch (Exception e) {
                     Log.w(LOGTAG, e);
                 }
             }
@@ -1240,7 +1240,7 @@ public void onActivityStopped(Activity activity) {
                     .getCanonicalName())) {
                 try {
                     track("$AppEnd");
-                } catch (InvalidDataException e) {
+                } catch (Exception e) {
                     Log.w(LOGTAG, e);
                 }
             }
@@ -1384,7 +1384,7 @@ private static void mergeJSONObject(final JSONObject source, JSONObject dest)
     static final int VTRACK_SUPPORTED_MIN_API = 16;
 
     // SDK版本
-    static final String VERSION = "1.6.15";
+    static final String VERSION = "1.6.16";
 
     static Boolean ENABLE_LOG = false;