Update demo app

microsoft · Nov 8, 2018 · 4f49c6a · 4f49c6a
1 parent 292f608
commit 4f49c6a
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/...rc/projectDependency/java/com/microsoft/appcenter/sasquatch/activities/EventActivity.java b/...rc/projectDependency/java/com/microsoft/appcenter/sasquatch/activities/EventActivity.java
@@ -224,7 +224,7 @@ public void send(@SuppressWarnings("UnusedParameters") View view) {
         Map<String, String> properties = null;
         EventProperties typedProperties = null;
         if (mProperties.size() > 0) {
-            if (onlyStringProperties() && (persistenceFlag == PersistenceFlag.DEFAULT || target == null)) {
+            if (onlyStringProperties()) {
                 properties = new HashMap<>();
                 for (TypedPropertyFragment fragment : mProperties) {
                     fragment.set(properties);
@@ -256,12 +256,18 @@ public void send(@SuppressWarnings("UnusedParameters") View view) {
                     Analytics.trackEvent(name);
                 }
             } else {
-                if (persistenceFlag != PersistenceFlag.DEFAULT) {
-                    target.trackEvent(name, typedProperties, flags);
-                } else if (typedProperties != null) {
-                    target.trackEvent(name, typedProperties);
+                if (typedProperties != null) {
+                    if (persistenceFlag != PersistenceFlag.DEFAULT) {
+                        target.trackEvent(name, typedProperties, flags);
+                    } else {
+                        target.trackEvent(name, typedProperties);
+                    }
                 } else if (properties != null) {
-                    target.trackEvent(name, properties);
+                    if (persistenceFlag != PersistenceFlag.DEFAULT) {
+                        target.trackEvent(name, properties, flags);
+                    } else {
+                        target.trackEvent(name, properties);
+                    }
                 } else {
                     target.trackEvent(name);
                 }