Fix for #73. Configure callback is now called.

nordnet · Dec 28, 2015 · 6f92675 · 6f92675
1 parent 0c2b539
commit 6f92675
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/ios/HCPPlugin.m b/src/ios/HCPPlugin.m
@@ -630,17 +630,26 @@ - (void)jsConfigure:(CDVInvokedUrlCommand *)command {
         return;
     }
 
+    id configureArguments = command.arguments[0];
     NSError *error = nil;
-    id options = [NSJSONSerialization JSONObjectWithContentsFromString:command.arguments[0] error:&error];
+    NSDictionary *options;
+    if ([configureArguments isKindOfClass:[NSString class]]) {
+        options = [NSJSONSerialization JSONObjectWithContentsFromString:configureArguments error:&error];
+    } else {
+        options = configureArguments;
+    }
+
     if (error) {
-        [self.commandDelegate sendPluginResult:nil callbackId:command.callbackId];
+        CDVPluginResult *pluginResult = [CDVPluginResult pluginResultWithActionName:nil applicationConfig:nil error:error];
+        [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
         return;
     }
 
     [_pluginXmlConfig mergeOptionsFromJS:options];
     // TODO: store them somewhere?
 
-    [self.commandDelegate sendPluginResult:nil callbackId:command.callbackId];
+    CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
 
 - (void)jsFetchUpdate:(CDVInvokedUrlCommand *)command {

diff --git a/src/ios/JS/CDVPluginResult+HCPEvents.m b/src/ios/JS/CDVPluginResult+HCPEvents.m
@@ -50,6 +50,7 @@ + (CDVPluginResult *)pluginResultWithActionName:(NSString *)action applicationCo
     NSData *jsonData = [NSJSONSerialization dataWithJSONObject:jsonObject options:kNilOptions error:nil];
     NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
 
+    // TODO: should be moved to an [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dict];
     return [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:jsonString];
 }