jni bridge fix

Author: dorotaphanSiili

templates/jnibridge/client/jnibridgeclient.java.tpl

@@ -56,13 +56,13 @@ public class {{Camel .Interface.Name}}JniClient extends Abstract{{Camel .Interfa
      public {{javaReturn "" .Return}} {{camel .Name}}({{javaParams "" .Params}})
      {
         Log.v(TAG, "Blocking call{{camel .Name}} - should not be used ");
-        return mMessengerClient.{{camel .Name}}({{javaVars .Params}});
+        {{if not .Return.IsVoid}}return{{ end }} mMessengerClient.{{camel .Name}}({{javaVars .Params}});
     }
 
-    public void {{camel .Name}}Async(String callId, {{javaParams "" .Params}}){
+    public void {{camel .Name}}Async(String callId{{if len .Params}}, {{javaParams "" .Params}}{{end}}){
         Log.v(TAG, "non blocking call {{camel .Name}} ");
         mMessengerClient.{{camel .Name}}Async({{javaVars .Params }}).thenAccept(i -> {
-            nativeOn{{Camel .Name}}Result(i, callId);});
+            nativeOn{{Camel .Name}}Result({{if not .Return.IsVoid}}i, {{end}}callId);});
     }
 
     //Should not be called directly, use {{camel .Name}}Async(String callId, {{javaParams "" .Params}})
@@ -134,7 +134,7 @@ public class {{Camel .Interface.Name}}JniClient extends Abstract{{Camel .Interfa
     private native void nativeOn{{Camel .Name}}({{javaParams "" .Params }});
     {{- end }}
     {{- range .Interface.Operations }}
-    private native void nativeOn{{Camel .Name}}Result({{javaReturn "" .Return}} result, String callId);
+    private native void nativeOn{{Camel .Name}}Result({{if not .Return.IsVoid}}{{javaReturn "" .Return}} result, {{end}}String callId);
     {{- end }}
     private native void nativeIsReady(boolean isReady);
 }