Updated return format

appsflyio · Dec 12, 2017 · ce882b7 · ce882b7
1 parent 3e14d4b
commit ce882b7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/main/java/io/appsfly/core/AppInstance.java b/src/main/java/io/appsfly/core/AppInstance.java
@@ -2,6 +2,7 @@
 
 import io.appsfly.crypto.CtyptoUtil;
 import io.appsfly.util.json.JSONArray;
+import io.appsfly.util.json.JSONException;
 import io.appsfly.util.json.JSONObject;
 import io.appsfly.util.json.JSONTokener;
 import okhttp3.*;
@@ -67,7 +68,11 @@ public void onResponse(Call call, final okhttp3.Response response) throws IOExce
                     byte[] bytes = response.body().bytes();
                     boolean verified = CtyptoUtil.getInstance().verifychecksum(bytes, checksum, config.secretKey);
                     if (verified) {
-                        callback.onResponse(new JSONObject(bytes));
+                        try {
+                            callback.onResponse(new JSONTokener(new String(bytes)).nextValue());
+                        } catch (JSONException e) {
+                            callback.onResponse(new JSONObject());
+                        }
                     } else {
                         callback.onError(new JSONObject() {{
                             put("message", "Checksum Validation Failed");

diff --git a/src/main/java/io/appsfly/core/Callback.java b/src/main/java/io/appsfly/core/Callback.java
@@ -3,6 +3,7 @@
 import io.appsfly.util.json.JSONObject;
 
 public interface Callback {
-    void onResponse(JSONObject response);
+    void onResponse(Object response);
+
     void onError(JSONObject error);
 }