Release 1.6.23

sensorsdata · Nov 7, 2016 · 5302a73 · 5302a73
1 parent 21057a8
commit 5302a73
Show file tree

Hide file tree

Showing 4 changed files with 202 additions and 13 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.22"
+version = "1.6.23"
 
 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
@@ -236,9 +236,17 @@ public void sendData() {
                     Log.i(LOGTAG, "Invalid data: " + e.getMessage());
                 }
             } catch (ResponseErrorException e) {
-                Log.i(LOGTAG, "ResponseErrorException: " + e.getMessage());
+                if (SensorsDataAPI.sharedInstance(mContext).isDebugMode()) {
+                    throw new DebugModeException(e.getMessage());
+                } else {
+                    Log.i(LOGTAG, "ResponseErrorException: " + e.getMessage());
+                }
             } catch (Exception e) {
-                Log.i(LOGTAG, "Exception: " + e.getMessage());
+                if (SensorsDataAPI.sharedInstance(mContext).isDebugMode()) {
+                    throw new DebugModeException(e.getMessage());
+                } else {
+                    Log.i(LOGTAG, "Exception: " + e.getMessage());
+                }
             } finally {
                 if (null != bout)
                     try {

diff --git a/...AnalyticsSDK/src/main/java/com/sensorsdata/analytics/android/sdk/AppWebViewInterface.java b/...AnalyticsSDK/src/main/java/com/sensorsdata/analytics/android/sdk/AppWebViewInterface.java
@@ -1,6 +1,7 @@
 package com.sensorsdata.analytics.android.sdk;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.util.Log;
 import android.webkit.JavascriptInterface;
 
@@ -27,7 +28,12 @@ public String sensorsdata_call_app() {
                 properties = new JSONObject();
             }
             properties.put("type", "Android");
-            properties.put("distinct_id", SensorsDataAPI.sharedInstance(mContext).getDistinctId());
+            String loginId = SensorsDataAPI.sharedInstance(mContext).getLoginId();
+            if (!TextUtils.isEmpty(loginId)) {
+                properties.put("distinct_id", loginId);
+            } else {
+                properties.put("distinct_id", SensorsDataAPI.sharedInstance(mContext).getAnonymousId());
+            }
             return properties.toString();
         } catch (JSONException e) {
             Log.i(LOGTAG, e.getMessage());