cordova-plugin-ymchat 1.0.3 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-ymchat",
-  "version": "1.0.3",
+  "version": "1.3.0",
   "description": "Cordova plugin to integrate yellow.ai chatbot",
   "cordova": {
     "id": "cordova-plugin-ymchat",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="cordova-plugin-ymchat" version="1.0.3"
+<plugin id="cordova-plugin-ymchat" version="1.3.0"
     xmlns="http://apache.org/cordova/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <name>ymchat</name>
@@ -24,7 +24,7 @@
         </config-file>
         <source-file src="src/android/com/yellow/ai/ymchat/YmChatCordova.java" target-dir="src/com/yellow/ai/ymchat" />
         <source-file src="src/android/com/yellow/ai/ymchat/YmChatService.java" target-dir="src/com/yellow/ai/ymchat" />
-        <source-file src="src/android/com/yellow/ai/ymchat/Utils/Utils.java" target-dir="src/com/yellow/ai/ymchat/utils" />
+        <source-file src="src/android/com/yellow/ai/ymchat/utils/Utils.java" target-dir="src/com/yellow/ai/ymchat/utils" />
         <framework custom="true" src="src/android/build.gradle" type="gradleReference" />
         <framework src="androidx.appcompat:appcompat:1.0.0" />
     </platform>
@@ -34,7 +34,7 @@
                 <source url="https://github.com/CocoaPods/Specs.git" branch="master"/>
             </config>
             <pods use-frameworks="true">
-                <pod name="YMChat" spec="~> 1.3.1" swift-version="5.0"/>
+                <pod name="YMChat" spec="~> 1.5" swift-version="5.0"/>
             </pods>
         </podspec>
         <config-file parent="/*" target="config.xml">
@@ -42,7 +42,7 @@
                 <param name="ios-package" value="ymchat"/>
                 <param name="onload" value="true" />
             </feature>
-            <preference name="deployment-target" value="12.0" />
+            <preference name="deployment-target" value="13.0" />
             <preference name="target-device" value="universal" />
         </config-file>
         <preference name="MICROPHONE_USAGE_DESCRIPTION" default="Your microphone will be used to record your speech when you use the Voice feature."/>

package/src/android/.idea/gradle.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="testRunner" value="PLATFORM" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="/usr/local/Cellar/gradle/7.1.1/libexec" />
+        <option name="gradleJvm" value="1.8 (2)" />
+        <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>

package/src/android/.idea/misc.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>

package/src/android/.idea/modules/android.iml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" />
+        <option name="LAST_KNOWN_AGP_VERSION" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../.." />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/src/android/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/android.iml" filepath="$PROJECT_DIR$/.idea/modules/android.iml" />
+    </modules>
+  </component>
+</project>

package/src/android/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
+  </component>
+</project>

package/src/android/build.gradle

@@ -24,6 +24,5 @@ repositories {
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.annotation:annotation:1.0.2'
-    implementation 'com.github.yellowmessenger:YMChatbot-Android:v1.4.2'
-}
-  
+    implementation 'com.github.yellowmessenger:YMChatbot-Android:v1.7.+'
+}

package/src/android/com/yellow/ai/ymchat/YmChatCordova.java

@@ -8,7 +8,6 @@ import com.yellow.ai.ymchat.utils.Utils;
 import org.apache.cordova.CallbackContext;
 import org.apache.cordova.CordovaPlugin;
 import org.json.JSONArray;
-import org.json.JSONException;
 import org.json.JSONObject;
 
 public class YmChatCordova extends CordovaPlugin {
@@ -30,9 +29,6 @@ public class YmChatCordova extends CordovaPlugin {
       case "setEnableSpeech":
         setEnableSpeech(args, callbackContext);
         return true;
-      case "setEnableHistory":
-        setEnableHistory(args, callbackContext);
-        return true;
       case "setAuthenticationToken":
         setAuthenticationToken(args, callbackContext);
         return true;
@@ -52,11 +48,20 @@ public class YmChatCordova extends CordovaPlugin {
         onBotClose(callbackContext);
         return true;
       case "startChatbot":
-      startChatbot(callbackContext);
+        startChatbot(callbackContext);
         return true;
       case "closeBot":
         closeBot();
         return true;
+      case "unlinkDeviceToken":
+        unlinkDeviceToken(args, callbackContext);
+        return true;
+      case "setVersion":
+        setVersion(args,callbackContext);
+        return  true;
+      case "setCustomLoaderURL":
+        setCustomLoaderURL(args, callbackContext);
+        return true;
     }
     return false;
   }
@@ -106,15 +111,6 @@ public class YmChatCordova extends CordovaPlugin {
     }
   }
 
-  public void setEnableHistory(JSONArray args, CallbackContext callbackContext) {
-    try {
-      boolean enableHistory = args.getBoolean(0);
-      ymChatService.setEnableHistory(enableHistory, callbackContext);
-    } catch (Exception e) {
-      Utils.genericErrorHelper(e, callbackContext);
-    }
-  }
-
   public void setAuthenticationToken(JSONArray args, CallbackContext callbackContext) {
     try {
       String authToken = args.getString(0);
@@ -158,4 +154,35 @@ public class YmChatCordova extends CordovaPlugin {
   public void onBotClose(CallbackContext onBotCloseEvent) {
     ymChatService.onBotClose(onBotCloseEvent);
   }
+
+  private void unlinkDeviceToken(JSONArray args, CallbackContext callbackContext) {
+    try {
+      String botId = args.getString(0);
+      String apiKey = args.getString(1);
+      String deviceToken = args.getString(2);
+      ymChatService.unlinkDeviceToken(botId, apiKey, deviceToken, callbackContext);
+    } catch (Exception e) {
+      Utils.genericErrorHelper(e, callbackContext);
+    }
+  }
+
+  private void setVersion(JSONArray args, CallbackContext callbackContext) {
+    try{
+      int version = args.getInt(0);
+      ymChatService.setVersion(version,callbackContext);
+    }catch(Exception e)
+    {
+      Utils.genericErrorHelper(e, callbackContext);
+    }
+  }
+
+  public void setCustomLoaderURL(JSONArray args, CallbackContext callbackContext) {
+    try {
+      String customUrl = args.getString(0);
+      ymChatService.setCustomLoaderUrl(customUrl, callbackContext);
+    } catch (Exception e) {
+      Utils.genericErrorHelper(e, callbackContext);
+    }
+  }
+
 }

package/src/android/com/yellow/ai/ymchat/YmChatService.java

@@ -1,14 +1,17 @@
 package com.yellow.ai.ymchat;
 
 import android.content.Context;
+import android.net.Uri;
 import android.util.Log;
 
 import com.yellow.ai.ymchat.utils.Utils;
 import com.yellowmessenger.ymchat.YMChat;
 import com.yellowmessenger.ymchat.YMConfig;
+import com.yellowmessenger.ymchat.models.YellowCallback;
 
 import org.apache.cordova.CallbackContext;
 import org.apache.cordova.PluginResult;
+import org.json.JSONArray;
 import org.json.JSONObject;
 
 import java.util.HashMap;
@@ -18,7 +21,7 @@ public class YmChatService {
   final String Tag = "YmChat";
   final String ExceptionString = "Exception";
   final String code = "code";
-  final String data = "data";
+  final String data = "date";
 
   HashMap<String, Object> payloadData = new HashMap<>();
 
@@ -52,10 +55,6 @@ public class YmChatService {
     ymChat.config.enableSpeech = speech;
   }
 
-  public void setEnableHistory(boolean history, CallbackContext callbackContext) {
-    ymChat.config.enableHistory = history;
-  }
-
   public void setAuthenticationToken(String token, CallbackContext callbackContext) {
     ymChat.config.ymAuthenticationToken = token;
   }
@@ -105,4 +104,32 @@ public class YmChatService {
       }
     });
   }
+
+  public void unlinkDeviceToken(String botId, String apiKey, String deviceToken,CallbackContext callbackContext) {
+    try{
+      ymChat.unlinkDeviceToken(botId, apiKey, deviceToken, new YellowCallback() {
+        @Override
+        public void success() {
+          callbackContext.success();
+        }
+
+        @Override
+        public void failure(String message) {
+          Utils.genericErrorHelper(new Exception(),callbackContext);
+        }
+      });
+    }
+    catch (Exception e)
+    {
+      Utils.genericErrorHelper(e, callbackContext);
+    }
+  }
+
+  public void setVersion(int version, CallbackContext callbackContext) {
+    ymChat.config.version = version;
+  }
+
+  public void setCustomLoaderUrl(String url, CallbackContext callbackContext) {
+    ymChat.config.customLoaderUrl = url;
+  }
 }

package/src/android/local.properties

@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Fri Sep 24 13:53:23 IST 2021
+sdk.dir=/Users/purush/Library/Android/sdk

package/src/ios/ymchat.m

@@ -35,13 +35,6 @@
     YMChat.shared.config.enableSpeech = enableSpeech;
 }
 
-- (void)setEnableHistory:(CDVInvokedUrlCommand*)command
-{
-    BOOL history = [command.arguments objectAtIndex:0];
-    assert(YMChat.shared.config != nil);
-    YMChat.shared.config.enableHistory = history;
-}
-
 - (void)setAuthenticationToken:(CDVInvokedUrlCommand*)command
 {
     NSString* authToken = [command.arguments objectAtIndex:0];
@@ -115,4 +108,33 @@
     [self.commandDelegate sendPluginResult:pluginResult callbackId:onBotClosed.callbackId];
 }
 
+- (void)setVersion:(CDVInvokedUrlCommand*)command
+{
+    assert(YMChat.shared.config != nil);
+    NSNumber* version = [command.arguments objectAtIndex:0];
+    YMChat.shared.config.version = version.integerValue;
+}
+
+- (void) unlinkDeviceToken:(CDVInvokedUrlCommand*)command {
+    NSString* botId = [command.arguments objectAtIndex:0];
+    NSString* apiKey = [command.arguments objectAtIndex:1];
+    NSString* deviceToken = [command.arguments objectAtIndex:2];
+    [[YMChat shared] unlinkDeviceTokenWithBotId:botId apiKey:apiKey deviceToken:deviceToken success:^{
+        CDVPluginResult* pluginResult = nil;
+        pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+        [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+    } failure:^(NSString * _Nonnull failureMessage) {
+        CDVPluginResult* pluginResult = nil;
+        pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:failureMessage];
+        [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+    }];
+}
+
+- (void)setCustomLoaderURL:(CDVInvokedUrlCommand*)command
+{
+    NSString* url = [command.arguments objectAtIndex:0];
+    assert(YMChat.shared.config != nil);
+    YMChat.shared.config.customLoaderUrl = url;
+}
+
 @end

package/www/ymchat.js

@@ -11,9 +11,6 @@ const YmChatAPI = {
   setEnableSpeech: (speech) => {
     exec(null, null, "ymchat", "setEnableSpeech", [speech]);
   },
-  setEnableHistory: (history) => {
-    exec(null, null, "ymchat", "setEnableHistory", [history]);
-  },
   setAuthenticationToken: (token) => {
     exec(null, null, "ymchat", "setAuthenticationToken", [token]);
   },
@@ -38,6 +35,15 @@ const YmChatAPI = {
   closeBot: () => {
     exec(null, null, "ymchat", "closeBot", []);
   },
+  unlinkDeviceToken: (botId, apiKey, deviceToken, success, failure) => {
+    exec(success, failure, "ymchat", "unlinkDeviceToken", [botId, apiKey, deviceToken])
+  },
+  setVersion: (version) => {
+    exec(null, null, "ymchat", "setVersion", [version])
+  },
+  setCustomLoaderURL: (url) => {
+    exec(null, null, "ymchat", "setCustomLoaderURL", [url]);
+  }
 };
 
 module.exports = YmChatAPI;