adjust pn_other decryption

Author: Max Presman

src/main/java/com/pubnub/api/endpoints/History.java

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.pubnub.api.vendor.Crypto;
 import com.pubnub.api.PubNub;
 import com.pubnub.api.PubNubException;
@@ -155,6 +156,13 @@ private JsonNode processMessage(JsonNode message) throws PubNubException {
             throw PubNubException.builder().pubnubError(PubNubErrorBuilder.PNERROBJ_PARSING_ERROR).errormsg(e.getMessage()).build();
         }
 
+        // inject the decoded resposne into the payload
+        if (message.isObject() && message.has("pn_other")) {
+            ObjectNode objectNode = (ObjectNode) message;
+            objectNode.set("pn_other", outputObject);
+            outputObject = objectNode;
+        }
+
         return outputObject;
     }
 

src/main/java/com/pubnub/api/workers/SubscribeMessageWorker.java

@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.pubnub.api.PubNub;
 import com.pubnub.api.PubNubException;
 import com.pubnub.api.enums.PNOperationType;
@@ -100,6 +101,13 @@ private JsonNode processMessage(final JsonNode input) {
             return null;
         }
 
+        // inject the decoded response into the payload
+        if (input.isObject() && input.has("pn_other")) {
+            ObjectNode objectNode = (ObjectNode) input;
+            objectNode.set("pn_other", outputObject);
+            outputObject = objectNode;
+        }
+
         return outputObject;
     }
 

src/test/java/com/pubnub/api/endpoints/HistoryEndpointTest.java

@@ -177,7 +177,7 @@ public void testSyncEncryptedWithPNOtherSuccess() throws IOException, PubNubExce
         Assert.assertEquals(response.getMessages().size(), 1);
 
         Assert.assertEquals(response.getMessages().get(0).getTimetoken(), null);
-        Assert.assertEquals("hey", response.getMessages().get(0).getEntry().get("text").asText());
+        Assert.assertEquals("hey", response.getMessages().get(0).getEntry().get("pn_other").get("text").asText());
 
     }
 
@@ -188,11 +188,11 @@ public void testSyncSuccessWithoutTimeToken() throws IOException, PubNubExceptio
         ObjectMapper mapper = new ObjectMapper();
 
 
-        Map<String, Object> historyItem1 = new HashMap<String, Object>();
+        Map<String, Object> historyItem1 = new HashMap<>();
         historyItem1.put("a", 11);
         historyItem1.put("b", 22);
 
-        Map<String, Object> historyItem2 = new HashMap<String, Object>();
+        Map<String, Object> historyItem2 = new HashMap<>();
         historyItem2.put("a", 33);
         historyItem2.put("b", 44);
 

src/test/java/com/pubnub/api/managers/SubscriptionManagerTest.java

@@ -471,7 +471,7 @@ public void status(PubNub pubnub, PNStatus status) {
             public void message(PubNub pubnub, PNMessageResult message) {
                 List<LoggedRequest> requests = findAll(getRequestedFor(urlMatching("/v2/subscribe.*")));
                 assertTrue(requests.size() > 0);
-                assertEquals("hey", message.getMessage().get("text").asText());
+                assertEquals("hey", message.getMessage().get("pn_other").get("text").asText());
                 atomic.addAndGet(1);
             }