fix: solved #13: return json object instead of string

Author: spoeck

android/src/main/java/de/innfactory/apiai/RNApiAiModule.java

@@ -14,7 +14,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.List;
-import 	org.json.JSONObject;
 
 import ai.api.AIListener;
 import ai.api.AIServiceException;
@@ -123,7 +122,7 @@ public void setEntitiesAsJson(String userEntitiesAsJson) throws AIServiceExcepti
 
 
     @ReactMethod
-    public void startListening(Callback onResult, Callback onError) {//, Callback onListeningStarted, Callback onListeningCanceled,  Callback onListeningFinished,  Callback onAudioLevel) {
+    public void startListeningNative(Callback onResult, Callback onError) {//, Callback onListeningStarted, Callback onListeningCanceled,  Callback onListeningFinished,  Callback onAudioLevel) {
 
         onResultCallback = onResult;
         onErrorCallback = onError;
@@ -187,7 +186,7 @@ public void onResult(AIResponse response) {
         if (onResultCallback != null) {
             Gson gson = new Gson();
             try {
-                onResultCallback.invoke(new JSONObject(gson.toJson(response)));
+                onResultCallback.invoke(gson.toJson(response));
             } catch (Exception e) {
                 Log.e(TAG, e.getMessage(), e);
             }
@@ -202,7 +201,7 @@ public void onError(final AIError error) {
             Gson gson = new Gson();
 
             try {
-                onErrorCallback.invoke(new JSONObject(gson.toJson(error)));
+                onErrorCallback.invoke(gson.toJson(error));
             } catch (Exception e) {
                 Log.e(TAG, e.getMessage(), e);
             }
@@ -277,7 +276,7 @@ public void onAudioLevel(float level) {
 
 
     @ReactMethod
-    public void requestQuery(String query, Callback onResult, Callback onError) {
+    public void requestQueryNative(String query, Callback onResult, Callback onError) {
 
         onResultCallback = onResult;
         onErrorCallback = onError;
@@ -314,7 +313,7 @@ protected AIResponse doInBackground(AIRequest... requests) {
                 } catch (AIServiceException e) {
                     Gson gson = new Gson();
                     try {
-                        onErrorCallback.invoke(new JSONObject(gson.toJson(e)));
+                        onErrorCallback.invoke(gson.toJson(e));
                     } catch (Exception e1) {
                         Log.e(TAG, e.getMessage(), e);
                     }

example/index.android.js

@@ -88,9 +88,9 @@ export default class App extends Component {
 
                       ApiAi.startListening(result => {
 						  console.log(result);
-                          this.setState({result: result});
+                          this.setState({result: JSON.stringify(result)});
                       }, error => {
-                          this.setState({result: error});
+                          this.setState({result: JSON.stringify(error)});
                       });
 
                   }}/>

example/package.json

@@ -9,7 +9,7 @@
   "dependencies": {
     "react": "16.0.0-alpha.12",
     "react-native": "0.47.1",
-    "react-native-api-ai": "^1.3.0"
+    "react-native-api-ai": "../"
   },
   "devDependencies": {
     "babel-jest": "20.0.3",

index.android.js

@@ -5,6 +5,14 @@ import EventRequest from './js/ResetContextsRequest';
 
 let ApiAi = NativeModules.ApiAi;
 
+ApiAi.startListening = (onResult: ()=>{}, onError: ()=>{}) => {
+    ApiAi.startListeningNative((r)=>onResult(JSON.parse(r)), (e)=>onError(JSON.parse(e)))
+};
+
+ApiAi.requestQuery = (query: String, onResult: ()=>{}, onError: ()=>{}) => {
+    ApiAi.requestQueryNative(query, (r)=>onResult(JSON.parse(r)), (e)=>onError(JSON.parse(e)))
+};
+
 ApiAi.setContexts = (contexts) => {
     ApiAi.setContextsAsJson(JSON.stringify(contexts))
 };