@zelloptt/react-native-zello-sdk 1.0.0 → 1.0.1

package/android/src/main/java/com/zellosdk/ZelloAndroidSdkModule.kt

@@ -61,8 +61,8 @@ class ZelloAndroidSdkModule @Inject constructor(
     zello.disconnect()
   }
 
-  @ReactMethod fun setSelectedContact(name: String, isChannel: Boolean) {
-    val contact = (if (isChannel) zello.getChannel(name) else zello.getUser(name)) ?: return
+  @ReactMethod fun setSelectedContact(name: String, type: String) {
+    val contact = contactFrom(name, type) ?: return
     zello.setSelectedContact(contact)
   }
 
@@ -85,8 +85,8 @@ class ZelloAndroidSdkModule @Inject constructor(
     zello.disconnectChannel(channel)
   }
 
-  @ReactMethod fun startVoiceMessage(name: String, isChannel: Boolean) {
-    val contact = (if (isChannel) zello.getChannel(name) else zello.getUser(name)) ?: return
+  @ReactMethod fun startVoiceMessage(name: String, type: String) {
+    val contact = contactFrom(name, type) ?: return
     zello.startVoiceMessage(contact)
   }
 
@@ -95,8 +95,8 @@ class ZelloAndroidSdkModule @Inject constructor(
   }
 
   @ReactMethod
-  fun sendImage(name: String, isChannel: Boolean, data: ReadableArray) {
-    val contact = (if (isChannel) zello.getChannel(name) else zello.getUser(name)) ?: return
+  fun sendImage(name: String, type: String, data: ReadableArray) {
+    val contact = contactFrom(name, type) ?: return
     val byteArray = ByteArray(data.size())
     for (i in 0 until data.size()) {
       byteArray[i] = data.getInt(i).toByte()
@@ -105,20 +105,20 @@ class ZelloAndroidSdkModule @Inject constructor(
   }
 
   @ReactMethod
-  fun sendLocation(name: String, isChannel: Boolean) {
-    val contact = (if (isChannel) zello.getChannel(name) else zello.getUser(name)) ?: return
+  fun sendLocation(name: String, type: String) {
+    val contact = contactFrom(name, type) ?: return
     zello.sendLocation(contact)
   }
 
   @ReactMethod
-  fun sendText(name: String, isChannel: Boolean, text: String) {
-    val contact = (if (isChannel) zello.getChannel(name) else zello.getUser(name)) ?: return
+  fun sendText(name: String, type: String, text: String) {
+    val contact = contactFrom(name, type) ?: return
     zello.sendText(text, contact)
   }
 
   @ReactMethod
-  fun sendAlert(name: String, isChannel: Boolean, text: String, level: String?) {
-    val contact = (if (isChannel) zello.getChannel(name) else zello.getUser(name)) ?: return
+  fun sendAlert(name: String, type: String, text: String, level: String?) {
+    val contact = contactFrom(name, type) ?: return
     val channelAlertLevel = when (level) {
       "all" -> ZelloAlertMessage.ChannelLevel.ALL
       "connected" -> ZelloAlertMessage.ChannelLevel.CONNECTED
@@ -133,14 +133,14 @@ class ZelloAndroidSdkModule @Inject constructor(
   }
 
   @ReactMethod
-  fun muteContact(name: String, isChannel: Boolean) {
-    val contact = (if (isChannel) zello.getChannel(name) else zello.getUser(name)) ?: return
+  fun muteContact(name: String, type: String) {
+    val contact = contactFrom(name, type) ?: return
     zello.muteContact(contact)
   }
 
   @ReactMethod
-  fun unmuteContact(name: String, isChannel: Boolean) {
-    val contact = (if (isChannel) zello.getChannel(name) else zello.getUser(name)) ?: return
+  fun unmuteContact(name: String, type: String) {
+    val contact = contactFrom(name, type) ?: return
     zello.unmuteContact(contact)
   }
 
@@ -155,15 +155,15 @@ class ZelloAndroidSdkModule @Inject constructor(
   }
 
   @ReactMethod
-  fun getHistory(name: String, isChannel: Boolean, size: Int?, callback: Callback) {
-    val contact = (if (isChannel) zello.getChannel(name) else zello.getUser(name)) ?: return
+  fun getHistory(name: String, type: String, size: Int?, callback: Callback) {
+    val contact = contactFrom(name, type) ?: return
     val messages = if (size != null) zello.getHistory(contact, size) else zello.getHistory(contact)
     callback.invoke(ZelloAndroidSdkModuleHelper.historyMessagesToWritableArray(messages))
   }
 
   @ReactMethod
-  fun playHistoryMessage(historyId: String, contactName: String, isChannel: Boolean) {
-    val contact = (if (isChannel) zello.getChannel(contactName) else zello.getUser(contactName)) ?: return
+  fun playHistoryMessage(historyId: String, contactName: String, type: String) {
+    val contact = contactFrom(name, type) ?: return
     val message = zello.getHistoryMessage(historyId, contact) as? ZelloHistoryVoiceMessage ?: return
     zello.playHistoryMessage(message)
   }
@@ -174,8 +174,8 @@ class ZelloAndroidSdkModule @Inject constructor(
   }
 
   @ReactMethod
-  fun getImageDataForHistoryImageMessage(historyId: String, contactName: String, isChannel: Boolean, callback: Callback) {
-    val contact = (if (isChannel) zello.getChannel(contactName) else zello.getUser(contactName)) ?: return
+  fun getImageDataForHistoryImageMessage(historyId: String, contactName: String, type: String, callback: Callback) {
+    val contact = contactFrom(name, type) ?: return
     val message = zello.getHistoryMessage(historyId, contact) as? ZelloHistoryImageMessage ?: return
     zello.loadBitmapForHistoryImageMessage(message) {
       callback.invoke(ZelloAndroidSdkModuleHelper.bitmapToBase64String(it))
@@ -539,6 +539,15 @@ class ZelloAndroidSdkModule @Inject constructor(
     })
   }
 
+  private fun contactFrom(name: String, type: String): ZelloContact? {
+    return when (type) {
+      "channel", "dispatchChannel" -> zello.getChannel(name)
+      "groupConversation" -> zello.getGroupConversation(name)
+      "user" -> zello.getUser(name)
+      else -> null
+    }
+  }
+
   private fun sendEvent(reactContext: ReactContext, name: String, params: WritableMap?) {
     reactContext
       .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)

package/ios/Extensions/ZelloContact+Extension.swift

@@ -6,6 +6,8 @@ extension ZelloContact {
       return user.jsonDictionary
     } else if let channel = self.asZelloChannel() {
       return channel.jsonDictionary
+    } else if let groupConversation = self.asZelloGroupConversation() {
+      return groupConversation.jsonDictionary
     }
     return [:]
   }

package/ios/Extensions/ZelloIOSSdkModule+Extension.swift

@@ -18,11 +18,14 @@ extension ZelloIOSSdkModule: Zello.Delegate {
   }
 
   func zelloDidUpdateContactList(_ zello: Zello) {
-    let users = zello.users.map { ZelloContact.user($0).jsonDictionary }
-    let channels = zello.channels.map { ZelloContact.channel($0).jsonDictionary }
-    // TODO It's not clear the asZelloGroupConversation is necessary - without it, the ZelloContact.jsonDictionary impl is used
-    let groupConversations = zello.groupConversations.compactMap {
-      ZelloContact.conversation($0).asZelloGroupConversation()?.jsonDictionary
+    let users = zello.users.map { user in
+      user.jsonDictionary
+    }
+    let channels = zello.channels.map { channel in
+      channel.jsonDictionary
+    }
+    let groupConversations = zello.groupConversations.map { conversation in
+      conversation.jsonDictionary
     }
     var body: [AnyHashable: Any] = [
       "users": users,

package/ios/ZelloIOSSdkModule.swift

@@ -42,15 +42,15 @@ import ZelloSDK
     zello.setAccountStatus(status: accountStatus)
   }
 
-  @objc func selectContact(_ name: String, isChannel: Bool) {
-    guard let contact = isChannel ? zello.channel(named: name).map(ZelloContact.channel) : zello.user(named: name).map(ZelloContact.user) else {
+  @objc func selectContact(_ name: String, contactType: String) {
+    guard let contact = contactFromType(contactType, name: name) else {
       return
     }
     zello.setSelectedContact(contact: contact)
   }
 
-  @objc func startVoiceMessage(_ name: String, isChannel: Bool) {
-    guard let contact = isChannel ? zello.channel(named: name).map(ZelloContact.channel) : zello.user(named: name).map(ZelloContact.user) else {
+  @objc func startVoiceMessage(_ name: String, contactType: String) {
+    guard let contact = contactFromType(contactType, name: name) else {
       return
     }
     zello.startVoiceMessage(contact: contact)
@@ -60,8 +60,8 @@ import ZelloSDK
     zello.stopVoiceMessage()
   }
 
-  @objc func sendImage(_ name: String, isChannel: Bool, data: [Int]) {
-    guard let contact = isChannel ? zello.channel(named: name).map(ZelloContact.channel) : zello.user(named: name).map(ZelloContact.user) else {
+  @objc func sendImage(_ name: String, contactType: String, data: [Int]) {
+    guard let contact = contactFromType(contactType, name: name) else {
       return
     }
     let byteArray = data.map { UInt8($0) }
@@ -72,26 +72,26 @@ import ZelloSDK
     zello.send(image, to: contact)
   }
 
-  @objc func sendLocation(_ name: String, isChannel: Bool) {
-    guard let contact = isChannel ? zello.channel(named: name).map(ZelloContact.channel) : zello.user(named: name).map(ZelloContact.user) else {
+  @objc func sendLocation(_ name: String, contactType: String) {
+    guard let contact = contactFromType(contactType, name: name) else {
       return
     }
     zello.sendLocation(to: contact)
   }
 
-  @objc func sendText(_ name: String, isChannel: Bool, text: String) {
-    guard let contact = isChannel ? zello.channel(named: name).map(ZelloContact.channel) : zello.user(named: name).map(ZelloContact.user) else {
+  @objc func sendText(_ name: String, contactType: String, text: String) {
+    guard let contact = contactFromType(contactType, name: name) else {
       return
     }
     zello.send(textMessage: text, to: contact)
   }
 
-  @objc func sendAlert(_ name: String, isChannel: Bool, text: String, level: String?) {
-    guard let contact = isChannel ? zello.channel(named: name).map(ZelloContact.channel) : zello.user(named: name).map(ZelloContact.user) else {
+  @objc func sendAlert(_ name: String, contactType: String, text: String, level: String?) {
+    guard let contact = contactFromType(contactType, name: name) else {
       return
     }
     var alertLevel: ZelloAlertMessage.ChannelLevel? = nil
-    if isChannel {
+    if contact.isZelloChannel || contact.isZelloGroupConversation {
       switch level {
       case "all":
         alertLevel = .all
@@ -136,15 +136,15 @@ import ZelloSDK
     zello.submitReport()
   }
 
-  @objc func muteContact(_ name: String, isChannel: Bool) {
-    guard let contact = isChannel ? zello.channel(named: name).map(ZelloContact.channel) : zello.user(named: name).map(ZelloContact.user) else {
+  @objc func muteContact(_ name: String, contactType: String) {
+    guard let contact = contactFromType(contactType, name: name) else {
       return
     }
     zello.muteContact(contact: contact)
   }
 
-  @objc func unmuteContact(_ name: String, isChannel: Bool) {
-    guard let contact = isChannel ? zello.channel(named: name).map(ZelloContact.channel) : zello.user(named: name).map(ZelloContact.user) else {
+  @objc func unmuteContact(_ name: String, contactType: String) {
+    guard let contact = contactFromType(contactType, name: name) else {
       return
     }
     zello.unmuteContact(contact: contact)
@@ -160,8 +160,8 @@ import ZelloSDK
     }
   }
 
-  @objc func getHistory(_ name: String, isChannel: Bool, maxMessages: Int, callback: RCTResponseSenderBlock) {
-    guard let contact = isChannel ? zello.channel(named: name).map(ZelloContact.channel) : zello.user(named: name).map(ZelloContact.user) else {
+  @objc func getHistory(_ name: String, contactType: String, maxMessages: Int, callback: RCTResponseSenderBlock) {
+    guard let contact = contactFromType(contactType, name: name) else {
       callback(nil)
       return
     }
@@ -182,9 +182,9 @@ import ZelloSDK
     }])
   }
 
-  @objc func playHistoryMessage(_ historyId: String, contactName: String, isChannel: Bool) {
+  @objc func playHistoryMessage(_ historyId: String, contactName: String, contactType: String) {
     guard
-      let contact = isChannel ? zello.channel(named: contactName).map(ZelloContact.channel) : zello.user(named: contactName).map(ZelloContact.user),
+      let contact = contactFromType(contactType, name: contactName),
       let message = zello.getHistoryMessage(historyId, contact: contact) as? ZelloHistoryVoiceMessage
     else {
       return
@@ -196,9 +196,9 @@ import ZelloSDK
     zello.stopHistoryMessagePlayback()
   }
 
-  @objc func getHistoryImageData(_ historyId: String, contactName: String, isChannel: Bool, callback: RCTResponseSenderBlock) {
+  @objc func getHistoryImageData(_ historyId: String, contactName: String, contactType: String, callback: RCTResponseSenderBlock) {
     guard
-      let contact = isChannel ? zello.channel(named: contactName).map(ZelloContact.channel) : zello.user(named: contactName).map(ZelloContact.user),
+      let contact = contactFromType(contactType, name: contactName),
       let message = zello.getHistoryMessage(historyId, contact: contact) as? ZelloHistoryImageMessage,
       let image = zello.loadHistoryImage(for: message),
       let base64String = image.base64String
@@ -248,6 +248,26 @@ import ZelloSDK
 }
 
 extension ZelloIOSSdkModule {
+  func contactFromType(_ type: String, name: String) -> ZelloContact? {
+    if type == "user" {
+      guard let user = zello.user(named: name) else {
+        return nil
+      }
+      return ZelloContact.user(user)
+    } else if type == "channel" || type == "dispatchChannel" {
+      guard let user = zello.channel(named: name) else {
+        return nil
+      }
+      return ZelloContact.channel(user)
+    } else if type == "groupConversation" {
+      guard let user = zello.conversation(named: name) else {
+        return nil
+      }
+      return ZelloContact.conversation(user)
+    }
+    return nil
+  }
+
   func sendSdkEvent(withName name: String, body: [AnyHashable: Any]?) {
     var eventBody = body ?? [:]
     eventBody[eventName] = name

package/ios/ZelloIOSSdkModuleBridge.m

@@ -9,18 +9,18 @@ RCT_EXTERN_METHOD(disconnect)
 
 RCT_EXTERN_METHOD(setAccountStatus:(NSString *)status)
 
-RCT_EXTERN_METHOD(selectContact:(NSString *)name isChannel:(BOOL)isChannel)
+RCT_EXTERN_METHOD(selectContact:(NSString *)name contactType:(NSString *)contactType)
 
-RCT_EXTERN_METHOD(startVoiceMessage:(NSString *)name isChannel:(BOOL)isChannel)
+RCT_EXTERN_METHOD(startVoiceMessage:(NSString *)name contactType:(NSString *)contactType)
 RCT_EXTERN_METHOD(stopVoiceMessage)
 
-RCT_EXTERN_METHOD(sendImage:(NSString *)name isChannel:(BOOL)isChannel data:(NSArray)data)
+RCT_EXTERN_METHOD(sendImage:(NSString *)name contactType:(NSString *)contactType data:(NSArray)data)
 
-RCT_EXTERN_METHOD(sendLocation:(NSString *)name isChannel:(BOOL)isChannel)
+RCT_EXTERN_METHOD(sendLocation:(NSString *)name contactType:(NSString *)contactType)
 
-RCT_EXTERN_METHOD(sendText:(NSString *)name isChannel:(BOOL)isChannel text:(NSString *)text)
+RCT_EXTERN_METHOD(sendText:(NSString *)name contactType:(NSString *)contactType text:(NSString *)text)
 
-RCT_EXTERN_METHOD(sendAlert:(NSString *)name isChannel:(BOOL)isChannel text:(NSString *)text level:(NSString *)level)
+RCT_EXTERN_METHOD(sendAlert:(NSString *)name contactType:(NSString *)contactType text:(NSString *)text level:(NSString *)level)
 
 RCT_EXTERN_METHOD(connectChannel:(NSString *)name)
 RCT_EXTERN_METHOD(disconnectChannel:(NSString *)name)
@@ -30,19 +30,19 @@ RCT_EXTERN_METHOD(disconnectGroupConversation:(NSString *)name)
 
 RCT_EXTERN_METHOD(submitProblemReport)
 
-RCT_EXTERN_METHOD(muteContact:(NSString *)name isChannel:(BOOL)isChannel)
-RCT_EXTERN_METHOD(unmuteContact:(NSString *)name isChannel:(BOOL)isChannel)
+RCT_EXTERN_METHOD(muteContact:(NSString *)name contactType:(NSString *)contactType)
+RCT_EXTERN_METHOD(unmuteContact:(NSString *)name contactType:(NSString *)contactType)
 
 RCT_EXTERN_METHOD(startEmergency)
 RCT_EXTERN_METHOD(stopEmergency)
 
-RCT_EXTERN_METHOD(getHistory:(NSString *)name isChannel:(BOOL)isChannel maxMessages:(NSInteger)maxMessages callback:(RCTResponseSenderBlock)callback)
+RCT_EXTERN_METHOD(getHistory:(NSString *)name contactType:(NSString *)contactType maxMessages:(NSInteger)maxMessages callback:(RCTResponseSenderBlock)callback)
 
-RCT_EXTERN_METHOD(playHistoryMessage:(NSString *)historyId contactName:(NSString *)contactName isChannel:(BOOL)isChannel)
+RCT_EXTERN_METHOD(playHistoryMessage:(NSString *)historyId contactName:(NSString *)contactName contactType:(NSString *)contactType)
 
 RCT_EXTERN_METHOD(stopHistoryMessagePlayback)
 
-RCT_EXTERN_METHOD(getHistoryImageData:(NSString *)historyId contactName:(NSString *)contactName isChannel:(BOOL)isChannel callback:(RCTResponseSenderBlock)callback)
+RCT_EXTERN_METHOD(getHistoryImageData:(NSString *)historyId contactName:(NSString *)contactName contactType:(NSString *)contactType callback:(RCTResponseSenderBlock)callback)
 
 RCT_EXTERN_METHOD(endDispatchCall:(NSString *)channelName)