Fixed tags resending when no changes were made

* Cached tags were being overridden instead of updated.

Author: jkasten2

OneSignalSDK/app/src/test/java/com/test/onesignal/MainOneSignalClassRunner.java

@@ -720,6 +720,30 @@ public void shouldSendTags() throws Exception {
       Assert.assertEquals("value3", sentTags.getString("test3"));
    }
 
+   @Test
+   public void shouldNotSendTagOnRepeats() throws Exception {
+      OneSignalInit();
+      OneSignal.sendTag("test1", "value1");
+      threadAndTaskWait();
+      Assert.assertEquals(2, ShadowOneSignalRestClient.networkCallCount);
+      Assert.assertEquals(ONESIGNAL_APP_ID, ShadowOneSignalRestClient.lastPost.getString("app_id"));
+      Assert.assertEquals("value1", ShadowOneSignalRestClient.lastPost.getJSONObject("tags").getString("test1"));
+
+      // Should only send new tag
+      ShadowOneSignalRestClient.lastPost = null;
+      OneSignal.sendTag("test2", "value2");
+      threadAndTaskWait();
+      Assert.assertEquals(3, ShadowOneSignalRestClient.networkCallCount);
+      Assert.assertEquals("value2", ShadowOneSignalRestClient.lastPost.getJSONObject("tags").getString("test2"));
+
+      // Should not resend first tags
+      ShadowOneSignalRestClient.lastPost = null;
+      OneSignal.sendTag("test1", "value1");
+      threadAndTaskWait();
+      Assert.assertEquals(3, ShadowOneSignalRestClient.networkCallCount);
+      Assert.assertNull(ShadowOneSignalRestClient.lastPost);
+   }
+
    @Test
    public void shouldSendTagsWithRequestBatching() throws Exception {
       OneSignalInit();

OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignalStateSynchronizer.java

@@ -252,9 +252,9 @@ private int getNotificationTypes() {
       private Set<String> getGroupChangeField(JSONObject cur, JSONObject changedTo) {
          try {
             if (cur.getDouble("lat") != changedTo.getDouble("lat")
-             || cur.getDouble("long") != changedTo.getDouble("long")
-             || cur.getDouble("loc_acc") != changedTo.getDouble("loc_acc")
-             || cur.getDouble("loc_type") != changedTo.getDouble("loc_type"))
+                || cur.getDouble("long") != changedTo.getDouble("long")
+                || cur.getDouble("loc_acc") != changedTo.getDouble("loc_acc")
+                || cur.getDouble("loc_type") != changedTo.getDouble("loc_type"))
                return LOCATION_FIELDS_SET;
          } catch (Throwable t) {
             return LOCATION_FIELDS_SET;
@@ -392,7 +392,17 @@ private void persistStateAfterSync(JSONObject inDependValues, JSONObject inSyncV
 
             synchronized (syncLock) {
                if (inSyncValues.has("tags")) {
-                  JSONObject newTags = new JSONObject();
+                  JSONObject newTags;
+                  if (syncValues.has("tags")) {
+                     try {
+                        newTags = new JSONObject(syncValues.optString("tags"));
+                     } catch (JSONException e) {
+                        newTags = new JSONObject();
+                     }
+                  }
+                  else
+                     newTags = new JSONObject();
+
                   JSONObject curTags = inSyncValues.optJSONObject("tags");
                   Iterator<String> keys = curTags.keys();
                   String key;
@@ -402,6 +412,8 @@ private void persistStateAfterSync(JSONObject inDependValues, JSONObject inSyncV
                         key = keys.next();
                         if (!"".equals(curTags.optString(key)))
                            newTags.put(key, curTags.optString(key));
+                        else
+                           newTags.remove(key);
                      }
 
                      if (newTags.toString().equals("{}"))