@moxtradeveloper/react-native-moxo-module 9.9.7 → 10.1.3

package/README.md

@@ -56,6 +56,25 @@ install! 'cocoapods', :deterministic_uuids => false
 # Rest of the file.....
 ```
 
+Exception: 
+![pod_error](./docs/pod_error.png)
+if you getting this error post moxo plugin installation, please also add master cocoapod repo as source into Podfile under your iOS project.
+Usually is https://github.com/CocoaPods/Specs.git
+
+```ruby
+require_relative '../node_modules/react-native/scripts/react_native_pods'
+require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
+#Add moxo source here
+source 'https://maven.moxtra.com/repo/moxtra-specs.git'
+source 'https://github.com/CocoaPods/Specs.git'
+
+#Change platform version if is not iOS 13
+platform :ios, '13.0'
+install! 'cocoapods', :deterministic_uuids => false
+
+# Rest of the file.....
+```
+
 ## Initialization
 
 ### Login

package/android/build.gradle

@@ -148,7 +148,7 @@ dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "com.moxtra:mep-sdk:9.9.7"
+  implementation "com.moxtra:mep-sdk:10.1.3"
 // From node_modules
 }
 

package/android/src/main/java/com/moxomodule/MoxoModuleModule.kt

@@ -9,6 +9,7 @@ import com.moxtra.mepsdk.MEPClient
 import com.moxtra.mepsdk.MEPClientDelegate
 import com.moxtra.mepsdk.data.MEPStartMeetOptions
 import com.moxtra.sdk.LinkConfig
+import com.moxtra.sdk.common.ActionListener
 import com.moxtra.sdk.common.ApiCallback
 import org.json.JSONArray
 import org.json.JSONException
@@ -22,7 +23,8 @@ class MoxoModuleModule(reactContext: ReactApplicationContext) :
   private var mReactContext = reactContext
 
   private val UNREAD_MSG_EVENT = "onUnreadMessageCountUpdated"
-
+  private val TAP_WINDOW_CLOSE_EVENT = "tapWindowCloseEvent"
+  
   override fun getName(): String {
     return NAME
   }
@@ -32,17 +34,15 @@ class MoxoModuleModule(reactContext: ReactApplicationContext) :
     Log.d(TAG, "setup called with domain: $domain, options: $options")
     var linkConfig: LinkConfig? = null
     try {
-      if (domain != null) {
-        if (options != null && options is String) {
+      if (!domain.isNullOrEmpty() && !options.isNullOrEmpty()) {
           linkConfig = LinkConfig()
           val jsonObject = JSONObject(options)
           val certOrgName: String? = jsonObject.getString("certOrgName")
           val certPublicKey: String? = jsonObject.getString("certPublicKey")
           val ignoreBadCert: Boolean = jsonObject.getBoolean("ignoreBadCert")
-          linkConfig.setCertOrganization(certOrgName)
-          linkConfig.setCertPublicKey(certPublicKey)
-          linkConfig.setIgnoreBadCert(ignoreBadCert)
-        }
+        linkConfig.certOrganization = certOrgName
+        linkConfig.certPublicKey = certPublicKey
+        linkConfig.isIgnoreBadCert = ignoreBadCert
       }
     } catch (e: JSONException) {
 
@@ -51,16 +51,13 @@ class MoxoModuleModule(reactContext: ReactApplicationContext) :
     mReactContext.runOnUiQueueThread {
       MEPClient.initialize(mReactContext?.applicationContext as Application)
       MEPClient.setupDomain(domain, linkConfig)
-
-      //setup callbacks
-      onUnreadMessageCountUpdated()
     }
   }
 
   @ReactMethod
   fun link(token: String?, promise: Promise?) {
     Log.d(TAG, "link called with token: $token")
-    if (token == null || token.isEmpty()) {
+    if (token.isNullOrEmpty()) {
       promise?.reject("-1", "token is empty or null")
       return
     }
@@ -138,7 +135,7 @@ class MoxoModuleModule(reactContext: ReactApplicationContext) :
       promise?.reject("-1", "Not linked")
       return
     }
-    if (chatId?.isEmpty() == false) {
+    if (!chatId.isNullOrEmpty()) {
       MEPClient.openChat(chatId, feedSequence?.toLong() ?: 0, object : ApiCallback<Void?> {
         override fun onCompleted(rult: Void?) {
           Log.d(TAG, "openChat successful...")
@@ -179,9 +176,9 @@ class MoxoModuleModule(reactContext: ReactApplicationContext) :
         )
       }
     }
-    if (uniqueId?.isEmpty() == false) {
+    if (!uniqueId.isNullOrEmpty()) {
       MEPClient.openRelationChat(uniqueId, callback)
-    } else if (email?.isEmpty() == false) {
+    } else if (!email.isNullOrEmpty()) {
       MEPClient.openRelationChatWithEmail(email, callback)
     } else {
       promise?.reject("-1", "Invalid parameter")
@@ -198,8 +195,19 @@ class MoxoModuleModule(reactContext: ReactApplicationContext) :
 
     MEPClient.getClientDelegate().setOnUnreadMessageListener(listener)
   }
+  
+  private fun onTapWindowClose() {
+    Log.d(TAG, "onTapWindowClose called...")
+    val listener: ActionListener<Void> = ActionListener { _, _ ->
+      run {
+        Log.d(TAG, "onTapWindowClose button clicked...")
+        sendEvent(mReactContext, TAP_WINDOW_CLOSE_EVENT, null)
+      }
+    }
+    MEPClient.getClientDelegate().setOnCloseButtonListener(listener)
+  }
 
-  private fun sendEvent(reactContext: ReactContext, eventName: String, params: Int?) {
+  private fun sendEvent(reactContext: ReactContext, eventName: String, params: Any?) {
     reactContext
       .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
       .emit(eventName, params)
@@ -208,6 +216,10 @@ class MoxoModuleModule(reactContext: ReactApplicationContext) :
   @ReactMethod
   fun addListener(eventName: String) {
     Log.d(TAG, "addListener called...")
+    when (eventName) {
+        TAP_WINDOW_CLOSE_EVENT ->
+           onTapWindowClose()
+    }
   }
 
   @ReactMethod
@@ -221,7 +233,7 @@ class MoxoModuleModule(reactContext: ReactApplicationContext) :
       TAG,
       "registerNotification called and token is " + (if (deviceToken == null) "null" else "not null")
     )
-    if (deviceToken != null) {
+    if (!deviceToken.isNullOrEmpty()) {
             MEPClient.registerNotification(
                 deviceToken,
         null, null, null,
@@ -267,7 +279,7 @@ class MoxoModuleModule(reactContext: ReactApplicationContext) :
                   else -> continue
                 }
               }
-              promise?.resolve(jsonObject.toString())
+              promise?.resolve(json2WritableNativeMap(jsonObject))
             }
 
             override fun onError(errorCode: Int, errorMsg: String?) {

package/ios/MoxoModule.swift

@@ -3,6 +3,7 @@ class MoxoModule: RCTEventEmitter, MEPClientDelegate {
     let default_error_code = 999
     let default_error_message = "invalid parameters"
     let unread_message_event = "onUnreadMessageCountUpdated"
+    let tap_close_event = "tapWindowCloseEvent"
     private var onUnreadMessageCountUpdated:RCTResponseSenderBlock? = nil;
     
     override class func moduleName() -> String! {
@@ -155,9 +156,13 @@ class MoxoModule: RCTEventEmitter, MEPClientDelegate {
         sendEvent(withName: unread_message_event, body: unreadCount)
     }
     
+    func client(_ client: MEPClient, didTapClose sender: Any?) {
+        sendEvent(withName: tap_close_event, body: nil)
+    }
+    
     //MARK: RCTBridgeModule
     override func supportedEvents() -> [String]! {
-        return [unread_message_event]
+        return [unread_message_event, tap_close_event]
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moxtradeveloper/react-native-moxo-module",
-  "version": "9.9.7",
+  "version": "10.1.3",
   "description": "Plugin for adding Moxtra services to react-native Apps.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/react-native-moxo-module.podspec

@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
   s.public_header_files = 'ios/*.h'
   s.swift_version = '5.0'
   s.dependency "React-Core"
-  s.dependency 'MEPSDKDylib', '~> 9.9.7'
+  s.dependency 'MEPSDKDylib', '~> 10.1.3'
 
   # Don't install the dependencies when we run `pod install` in the old architecture.
   if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then

package/src/index.tsx

@@ -5,6 +5,7 @@ const LINKING_ERROR =
   '- You rebuilt the app after installing the package\n' +
   '- You are not using Expo Go\n';
 const UNREAD_MSG_EVENT = "onUnreadMessageCountUpdated";
+const TAP_WINDOW_CLOSE_EVENT = "tapWindowCloseEvent";
 
 const MoxoModule = NativeModules.MoxoModule
   ? NativeModules.MoxoModule
@@ -172,3 +173,11 @@ export function startMeet(topic: string, options?: object): Promise<object> {
   return MoxoModule.startMeet(topic, options);
 }
 
+/**
+ * Set the callback when user tap close button on MEP window
+ * You should call hideMEPWindow() to hide MEP window in this callback if you want to hide MEP window
+*/
+export function onTapWindowClose(callback: () => void) {
+  MoxoEventEmitter.addListener(TAP_WINDOW_CLOSE_EVENT, callback);
+}
+