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

package/README.md

@@ -8,11 +8,13 @@ This repository contains both the React Native Bridge, as well as an example app
 
 To see an example of the React Native SDK, check out [the example folder](https://github.com/zelloptt/react-native-zello-sdk/tree/master/example).
 
-The following instructions are for the SDK, not for the example app.
+The following instructions are for the installation of the SDK into your application - **not** for the example app.
 
 ## Prerequisites
 A React Native application and environment.
 
+A thorough understanding of Zello. The best place to get started is our [documentation](https://sdk.zello.com/).
+
 
 ## Installation
 
@@ -23,7 +25,9 @@ npm install @zelloptt/react-native-zello-sdk
 
 ### iOS
 
-Before getting started, please reference the iOS Installation Guide.
+Before getting started, please reference the [iOS Installation Guide](https://sdk.zello.com/installation-guides/ios-installation-guide).
+
+The main amendment to the guide is that there is no need to add the `ZelloSDK` as a pod directly to your project.
 
 #### Troubleshooting
 
@@ -40,11 +44,11 @@ If you receive the above error, you should move the `Build Phases` phase named `
 
 ### Android
 
-Before getting started, please reference the Android Installation Guide.
+Before getting started, please reference the [Android Installation Guide](https://sdk.zello.com/installation-guides/android-installation-guide).
 
 #### Dependencies
 
-Add the repositories to your app's `build.gradle`:
+You may or may not need to add the repositories to your app's `build.gradle`:
 
 ```
 repositories {
@@ -113,6 +117,7 @@ class MainApplication : Application(), ReactApplication {
 
       override fun onCreate() {
         super.onCreate()
+        // Don't forget to start the SDK!
         zello.start()
       }
 }

package/android/build.gradle

@@ -102,7 +102,7 @@ repositories {
 
 def kotlin_version = getExtOrDefault("kotlinVersion")
 
-def zelloSdkVersion = "0.4.0"
+def zelloSdkVersion = "1.0.0"
 
 dependencies {
   // For < 0.71, this will be from the local maven repo

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

@@ -14,6 +14,7 @@ import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.zello.sdk.Zello
 import com.zello.sdk.ZelloAccountStatus
 import com.zello.sdk.ZelloAlertMessage
+import com.zello.sdk.ZelloChannel
 import com.zello.sdk.ZelloConnectionError
 import com.zello.sdk.ZelloContact
 import com.zello.sdk.ZelloCredentials
@@ -28,6 +29,7 @@ import com.zello.sdk.ZelloOutgoingEmergency
 import com.zello.sdk.ZelloOutgoingVoiceMessage
 import com.zello.sdk.ZelloRecentEntry
 import com.zello.sdk.ZelloConsoleSettings
+import com.zello.sdk.ZelloGroupConversation
 import com.zello.sdk.ZelloState
 import com.zello.sdk.ZelloTextMessage
 import javax.inject.Inject
@@ -59,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)
   }
 
@@ -83,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)
   }
 
@@ -93,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()
@@ -103,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
@@ -131,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)
   }
 
@@ -153,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)
   }
@@ -172,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))
@@ -187,6 +189,31 @@ class ZelloAndroidSdkModule @Inject constructor(
     zello.endDispatchCall(call, dispatchChannel)
   }
 
+  @ReactMethod
+  fun createGroupConversation(usernames: ReadableArray, displayName: String?) {
+    val users = usernames.toArrayList().mapNotNull { zello.getUser(it as String) }
+    zello.createGroupConversation(users, displayName)
+  }
+
+  @ReactMethod
+  fun addUsersToGroupConversation(conversationName: String, usernames: ReadableArray) {
+    val conversation = zello.getGroupConversation(conversationName) ?: return
+    val users = usernames.toArrayList().mapNotNull { zello.getUser(it as String) }
+    zello.addUsersToGroupConversation(conversation, users)
+  }
+
+  @ReactMethod
+  fun leaveGroupConversation(conversationName: String) {
+    val conversation = zello.getGroupConversation(conversationName) ?: return
+    zello.leaveGroupConversation(conversation)
+  }
+
+  @ReactMethod
+  fun renameGroupConversation(conversationName: String, newName: String) {
+    val conversation = zello.getGroupConversation(conversationName) ?: return
+    zello.renameGroupConversation(conversation, newName)
+  }
+
   override fun onStateChanged(sdk: Zello, state: ZelloState) {
   }
 
@@ -205,7 +232,7 @@ class ZelloAndroidSdkModule @Inject constructor(
   }
 
   override fun onContactListUpdated(zello: Zello) {
-    val map = ZelloAndroidSdkModuleHelper.contactListToWritableMap(this.zello.users, this.zello.channels)
+    val map = ZelloAndroidSdkModuleHelper.contactListToWritableMap(this.zello.users, this.zello.channels, this.zello.groupConversations)
     this.zello.emergencyChannel?.let {
       map.putMap("emergencyChannel", ZelloAndroidSdkModuleHelper.sdkContactToWritableMap(it))
     }
@@ -239,7 +266,7 @@ class ZelloAndroidSdkModule @Inject constructor(
   override fun onIncomingAlertMessage(zello: Zello, message: ZelloAlertMessage) {
     sendEvent(reactApplicationContext, "onIncomingAlertMessage", Arguments.createMap().apply {
       putMap("contact", ZelloAndroidSdkModuleHelper.sdkContactToWritableMap(contact = message.contact))
-      putString("channelUserName", message.channelUser?.name)
+      putMap("channelUser", ZelloAndroidSdkModuleHelper.channelUserToWritableMap(message.channelUser))
       putString("timestamp", message.timestamp.toString())
       putString("text", message.text)
     })
@@ -264,7 +291,7 @@ class ZelloAndroidSdkModule @Inject constructor(
   override fun onIncomingImageMessage(message: ZelloImageMessage) {
     sendEvent(reactApplicationContext, "onIncomingImageMessage", Arguments.createMap().apply {
       putMap("contact", ZelloAndroidSdkModuleHelper.sdkContactToWritableMap(contact = message.contact))
-      putString("channelUserName", message.channelUser?.name)
+      putMap("channelUser", ZelloAndroidSdkModuleHelper.channelUserToWritableMap(message.channelUser))
       putString("timestamp", message.timestamp.toString())
       putString("thumbnail", ZelloAndroidSdkModuleHelper.bitmapToBase64String(message.thumbnail))
       putString("image", ZelloAndroidSdkModuleHelper.bitmapToBase64String(message.image))
@@ -274,7 +301,7 @@ class ZelloAndroidSdkModule @Inject constructor(
   override fun onIncomingLocationMessage(zello: Zello, message: ZelloLocationMessage) {
     sendEvent(reactApplicationContext, "onIncomingLocationMessage", Arguments.createMap().apply {
       putMap("contact", ZelloAndroidSdkModuleHelper.sdkContactToWritableMap(contact = message.contact))
-      putString("channelUserName", message.channelUser?.name)
+      putMap("channelUser", ZelloAndroidSdkModuleHelper.channelUserToWritableMap(message.channelUser))
       putString("timestamp", message.timestamp.toString())
       putString("address", message.address)
       putDouble("latitude", message.latitude)
@@ -324,7 +351,7 @@ class ZelloAndroidSdkModule @Inject constructor(
   override fun onIncomingTextMessage(message: ZelloTextMessage) {
     sendEvent(reactApplicationContext, "onIncomingTextMessage", Arguments.createMap().apply {
       putMap("contact", ZelloAndroidSdkModuleHelper.sdkContactToWritableMap(contact = message.contact))
-      putString("channelUserName", message.channelUser?.name)
+      putMap("channelUser", ZelloAndroidSdkModuleHelper.channelUserToWritableMap(message.channelUser))
       putString("timestamp", message.timestamp.toString())
       putString("text", message.text)
     })
@@ -333,7 +360,7 @@ class ZelloAndroidSdkModule @Inject constructor(
   override fun onIncomingVoiceMessageStarted(zello: Zello, message: ZelloIncomingVoiceMessage) {
     sendEvent(reactApplicationContext, "onIncomingVoiceMessageStarted", Arguments.createMap().apply {
       putMap("contact", ZelloAndroidSdkModuleHelper.sdkContactToWritableMap(contact = message.contact))
-      putString("channelUserName", message.channelUser?.name)
+      putMap("channelUser", ZelloAndroidSdkModuleHelper.channelUserToWritableMap(message.channelUser))
       putString("timestamp", message.timestamp.toString())
     })
   }
@@ -341,7 +368,7 @@ class ZelloAndroidSdkModule @Inject constructor(
   override fun onIncomingVoiceMessageStopped(zello: Zello, message: ZelloIncomingVoiceMessage) {
     sendEvent(reactApplicationContext, "onIncomingVoiceMessageStopped", Arguments.createMap().apply {
       putMap("contact", ZelloAndroidSdkModuleHelper.sdkContactToWritableMap(contact = message.contact))
-      putString("channelUserName", message.channelUser?.name)
+      putMap("channelUser", ZelloAndroidSdkModuleHelper.channelUserToWritableMap(message.channelUser))
       putString("timestamp", message.timestamp.toString())
     })
   }
@@ -474,6 +501,53 @@ class ZelloAndroidSdkModule @Inject constructor(
     })
   }
 
+  override fun onGroupConversationLeft(sdk: Zello, conversation: ZelloGroupConversation) {
+    sendEvent(reactApplicationContext, "onGroupConversationLeft", Arguments.createMap().apply {
+      putMap("conversation", ZelloAndroidSdkModuleHelper.sdkContactToWritableMap(conversation))
+    })
+  }
+
+  override fun onGroupConversationInvite(sdk: Zello, conversation: ZelloGroupConversation) {
+    sendEvent(reactApplicationContext, "onGroupConversationInvite", Arguments.createMap().apply {
+      putMap("conversation", ZelloAndroidSdkModuleHelper.sdkContactToWritableMap(conversation))
+    })
+  }
+
+  override fun onGroupConversationCreated(sdk: Zello, conversation: ZelloGroupConversation) {
+    sendEvent(reactApplicationContext, "onGroupConversationCreated", Arguments.createMap().apply {
+      putMap("conversation", ZelloAndroidSdkModuleHelper.sdkContactToWritableMap(conversation))
+    })
+  }
+
+  override fun onGroupConversationRenamed(sdk: Zello, conversation: ZelloGroupConversation) {
+    sendEvent(reactApplicationContext, "onGroupConversationRenamed", Arguments.createMap().apply {
+      putMap("conversation", ZelloAndroidSdkModuleHelper.sdkContactToWritableMap(conversation))
+    })
+  }
+
+  override fun onGroupConversationUsersAdded(sdk: Zello, conversation: ZelloGroupConversation, users: List<ZelloChannel.User>) {
+    sendEvent(reactApplicationContext, "onGroupConversationUsersAdded", Arguments.createMap().apply {
+      putMap("conversation", ZelloAndroidSdkModuleHelper.sdkContactToWritableMap(conversation))
+      putArray("users", ZelloAndroidSdkModuleHelper.channelUsersToWritableArray(users))
+    })
+  }
+
+  override fun onGroupConversationUsersLeft(sdk: Zello, conversation: ZelloGroupConversation, users: List<ZelloChannel.User>) {
+    sendEvent(reactApplicationContext, "onGroupConversationUsersLeft", Arguments.createMap().apply {
+      putMap("conversation", ZelloAndroidSdkModuleHelper.sdkContactToWritableMap(conversation))
+      putArray("users", ZelloAndroidSdkModuleHelper.channelUsersToWritableArray(users))
+    })
+  }
+
+  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/android/src/main/java/com/zellosdk/ZelloAndroidSdkModuleHelper.kt

@@ -10,6 +10,7 @@ import com.zello.sdk.ZelloChannel
 import com.zello.sdk.ZelloConsoleSettings
 import com.zello.sdk.ZelloContact
 import com.zello.sdk.ZelloDispatchChannel
+import com.zello.sdk.ZelloGroupConversation
 import com.zello.sdk.ZelloHistoryAlertMessage
 import com.zello.sdk.ZelloHistoryImageMessage
 import com.zello.sdk.ZelloHistoryLocationMessage
@@ -22,7 +23,7 @@ import com.zello.sdk.ZelloUser
 import java.io.ByteArrayOutputStream
 
 object ZelloAndroidSdkModuleHelper {
-	fun contactListToWritableMap(users: List<ZelloUser>, channels: List<ZelloChannel>): WritableMap {
+	fun contactListToWritableMap(users: List<ZelloUser>, channels: List<ZelloChannel>, groupConversation: List<ZelloGroupConversation>): WritableMap {
 		return Arguments.createMap().apply {
 			putArray("users", WritableNativeArray().apply {
 				users.forEach { user ->
@@ -34,6 +35,11 @@ object ZelloAndroidSdkModuleHelper {
 					pushMap(sdkContactToWritableMap(channel))
 				}
 			})
+			putArray("groupConversations", WritableNativeArray().apply {
+				groupConversation.forEach { conversation ->
+					pushMap(sdkContactToWritableMap(conversation))
+				}
+			})
 		}
 	}
 
@@ -48,6 +54,9 @@ object ZelloAndroidSdkModuleHelper {
 				putString("customStatusText", contact.customStatusText)
 				putString("profilePictureUrl", contact.profilePictureUrl)
 				putString("profilePictureThumbnailUrl", contact.profilePictureThumbnailUrl)
+				putMap("supportedFeatures", WritableNativeMap().apply {
+					putBoolean("groupConversations", contact.supportedFeatures.groupConversations)
+				})
 			}
 
 			is ZelloChannel -> WritableNativeMap().apply {
@@ -71,6 +80,19 @@ object ZelloAndroidSdkModuleHelper {
 					contact.currentCall?.let { call ->
 						putMap("currentCall", callToWritableMap(call))
 					}
+				} else if (contact is ZelloGroupConversation) {
+					putBoolean("isGroupConversation", true)
+					putString("displayName", contact.displayName)
+					putArray("users", WritableNativeArray().apply {
+						contact.users.forEach { user ->
+							pushMap(channelUserToWritableMap(user))
+						}
+					})
+					putArray("onlineUsers", WritableNativeArray().apply {
+						contact.onlineUsers.forEach { user ->
+							pushMap(channelUserToWritableMap(user))
+						}
+					})
 				}
 			}
 
@@ -89,7 +111,7 @@ object ZelloAndroidSdkModuleHelper {
 	fun incomingEmergencyToWritableMap(incomingEmergency: ZelloIncomingEmergency): WritableMap {
 		return Arguments.createMap().apply {
 			putMap("channel", sdkContactToWritableMap(contact = incomingEmergency.channel))
-			putString("channelUserName", incomingEmergency.channelUser.name)
+			putMap("channelUser", channelUserToWritableMap(incomingEmergency.channelUser))
 			putString("emergencyId", incomingEmergency.emergencyId)
 			putString("startTimestamp", incomingEmergency.startTimestamp.toString())
 			incomingEmergency.endTimestamp?.let {
@@ -114,7 +136,7 @@ object ZelloAndroidSdkModuleHelper {
 			recents.forEach {
 				pushMap(WritableNativeMap().apply {
 					putMap("contact", sdkContactToWritableMap(it.contact))
-					putString("channelUserName", it.channelUser?.name)
+					putMap("channelUser", channelUserToWritableMap(it.channelUser))
 					putString("type", it.type.toString())
 					putString("timestamp", it.timestamp.toString())
 					putBoolean("incoming", it.incoming)
@@ -146,7 +168,7 @@ object ZelloAndroidSdkModuleHelper {
 		return Arguments.createMap().apply {
 			putMap("contact", sdkContactToWritableMap(contact = message.contact))
 			putString("type", "voice")
-			putString("channelUserName", message.channelUser?.name)
+			putMap("channelUser", channelUserToWritableMap(message.channelUser))
 			putString("timestamp", message.timestamp.toString())
 			putString("historyId", message.historyId)
 			putBoolean("incoming", message.incoming)
@@ -158,7 +180,7 @@ object ZelloAndroidSdkModuleHelper {
 		return Arguments.createMap().apply {
 			putMap("contact", sdkContactToWritableMap(contact = message.contact))
 			putString("type", "image")
-			putString("channelUserName", message.channelUser?.name)
+			putMap("channelUser", channelUserToWritableMap(message.channelUser))
 			putString("timestamp", message.timestamp.toString())
 			putString("historyId", message.historyId)
 			putBoolean("incoming", message.incoming)
@@ -169,7 +191,7 @@ object ZelloAndroidSdkModuleHelper {
 		return Arguments.createMap().apply {
 			putMap("contact", sdkContactToWritableMap(contact = message.contact))
 			putString("type", "text")
-			putString("channelUserName", message.channelUser?.name)
+			putMap("channelUser", channelUserToWritableMap(message.channelUser))
 			putString("timestamp", message.timestamp.toString())
 			putString("historyId", message.historyId)
 			putBoolean("incoming", message.incoming)
@@ -181,7 +203,7 @@ object ZelloAndroidSdkModuleHelper {
 		return Arguments.createMap().apply {
 			putMap("contact", sdkContactToWritableMap(contact = message.contact))
 			putString("type", "alert")
-			putString("channelUserName", message.channelUser?.name)
+			putMap("channelUser", channelUserToWritableMap(message.channelUser))
 			putString("timestamp", message.timestamp.toString())
 			putString("historyId", message.historyId)
 			putBoolean("incoming", message.incoming)
@@ -193,7 +215,7 @@ object ZelloAndroidSdkModuleHelper {
 		return Arguments.createMap().apply {
 			putMap("contact", sdkContactToWritableMap(contact = message.contact))
 			putString("type", "location")
-			putString("channelUserName", message.channelUser?.name)
+			putMap("channelUser", channelUserToWritableMap(message.channelUser))
 			putString("timestamp", message.timestamp.toString())
 			putString("historyId", message.historyId)
 			putBoolean("incoming", message.incoming)
@@ -207,6 +229,11 @@ object ZelloAndroidSdkModuleHelper {
 	fun consoleSettingsToWritableMap(settings: ZelloConsoleSettings): WritableMap {
 		return Arguments.createMap().apply {
 			putBoolean("allowNonDispatchersToEndCalls", settings.allowNonDispatchersToEndCalls)
+			putBoolean("allowTextMessages", settings.allowTextMessages)
+			putBoolean("allowImageMessages", settings.allowImageMessages)
+			putBoolean("allowLocationMessages", settings.allowLocationMessages)
+			putBoolean("allowAlertMessages", settings.allowAlertMessages)
+			putBoolean("allowGroupConversations", settings.allowGroupConversations)
 		}
 	}
 
@@ -218,4 +245,22 @@ object ZelloAndroidSdkModuleHelper {
 			putString("timestamp", call.timestamp.toString())
 		}
 	}
+
+	fun channelUserToWritableMap(channelUser: ZelloChannel.User?): WritableMap? {
+		if (channelUser == null) {
+			return null
+		}
+		return Arguments.createMap().apply {
+			putString("name", channelUser.name)
+			putString("displayName", channelUser.displayName)
+		}
+	}
+
+	fun channelUsersToWritableArray(channelUsers: List<ZelloChannel.User>): WritableNativeArray {
+		return WritableNativeArray().apply {
+			channelUsers.forEach {
+				pushMap(channelUserToWritableMap(it))
+			}
+		}
+	}
 }

package/ios/Extensions/ZelloConsoleSettings+Extension.swift

@@ -3,7 +3,12 @@ import ZelloSDK
 extension ZelloConsoleSettings {
   var jsonDictionary: [AnyHashable: Any] {
     return [
-      "allowNonDispatchersToEndCalls": allowsNonDispatchersToEndCalls
+      "allowNonDispatchersToEndCalls": allowsNonDispatchersToEndCalls,
+      "allowImageMessages": allowsImageMessages,
+      "allowLocationMessages": allowsLocationMessages,
+      "allowTextMessages": allowsTextMessages,
+      "allowAlertMessages": allowsAlertMessages,
+      "allowGroupConversations": allowsGroupConversations
     ]
   }
 }

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 [:]
   }
@@ -52,6 +54,55 @@ extension ZelloUser {
     if let url = profilePictureThumbnailURL?.absoluteString {
       body["profilePictureThumbnailUrl"] = url
     }
+    body["supportedFeatures"] = [
+      "groupConversations": supportedFeatures.groupConversations
+    ]
+    return body
+  }
+}
+
+extension ZelloGroupConversation {
+  var jsonDictionary: [AnyHashable: Any] {
+    let body: [AnyHashable: Any] = [
+      "name": name,
+      "isChannel": true,
+      "isMuted": isMuted,
+      "isConnected": status == .connected,
+      "isConnecting": status == .connecting,
+      "usersOnline": onlineUsers.count,
+      "options": [
+        "noDisconnect": false,
+        "hidePowerButton": false,
+        "listenOnly": false,
+        "allowAlerts": true,
+        "allowTextMessages": true,
+        "allowLocations": true
+      ],
+      "isGroupConversation": true,
+      "displayName": displayName,
+      "users": users.map { user in user.jsonDictionary },
+      "onlineUsers": onlineUsers.map { user in user.jsonDictionary }
+    ]
+    return body
+  }
+}
+
+extension ZelloGroupConversationUser {
+  var jsonDictionary: [AnyHashable: Any] {
+    let body: [AnyHashable: Any] = [
+      "name": name,
+      "displayName": displayName
+    ]
+    return body
+  }
+}
+
+extension ZelloChannel.User {
+  var jsonDictionary: [AnyHashable: Any] {
+    let body: [AnyHashable: Any] = [
+      "name": name,
+      "displayName": displayName
+    ]
     return body
   }
 }

package/ios/Extensions/ZelloIOSSdkModule+Extension.swift

@@ -18,11 +18,19 @@ 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 }
+    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,
-      "channels": channels
+      "channels": channels,
+      "groupConversations": groupConversations
     ]
     if let emergencyChannel = zello.emergencyChannel {
       body["emergencyChannel"] = emergencyChannel.jsonDictionary
@@ -80,7 +88,7 @@ extension ZelloIOSSdkModule: Zello.Delegate {
       "timestamp": incomingVoiceMessage.timestamp.bridgeTimestamp
     ]
     if let channelUser = incomingVoiceMessage.channelUser {
-      body["channelUserName"] = channelUser.name
+      body["channelUser"] = channelUser.jsonDictionary
     }
     sendSdkEvent(withName: "onIncomingVoiceMessageStarted", body: body)
   }
@@ -91,7 +99,7 @@ extension ZelloIOSSdkModule: Zello.Delegate {
       "timestamp": incomingVoiceMessage.timestamp.bridgeTimestamp
     ]
     if let channelUser = incomingVoiceMessage.channelUser {
-      body["channelUserName"] = channelUser.name
+      body["channelUser"] = channelUser.jsonDictionary
     }
     sendSdkEvent(withName: "onIncomingVoiceMessageStopped", body: body)
   }
@@ -103,7 +111,7 @@ extension ZelloIOSSdkModule: Zello.Delegate {
       "timestamp": textMessage.timestamp.bridgeTimestamp
     ]
     if let channelUser = textMessage.channelUser {
-      body["channelUserName"] = channelUser.name
+      body["channelUser"] = channelUser.jsonDictionary
     }
     sendSdkEvent(withName: "onIncomingTextMessage", body: body)
   }
@@ -133,7 +141,7 @@ extension ZelloIOSSdkModule: Zello.Delegate {
     ]
 
     if let channelUser = imageMessage.channelUser {
-      body["channelUserName"] = channelUser.name
+      body["channelUser"] = channelUser.jsonDictionary
     }
 
     body["image"] = imageMessage.image.base64String
@@ -171,7 +179,7 @@ extension ZelloIOSSdkModule: Zello.Delegate {
       "accuracy": locationMessage.location.horizontalAccuracy,
     ]
     if let channelUser = locationMessage.channelUser {
-      body["channelUserName"] = channelUser.name
+      body["channelUser"] = channelUser.jsonDictionary
     }
     if let address = locationMessage.address {
       body["address"] = address
@@ -186,7 +194,7 @@ extension ZelloIOSSdkModule: Zello.Delegate {
       "timestamp": alertMessage.timestamp.bridgeTimestamp
     ]
     if let channelUser = alertMessage.channelUser {
-      body["channelUserName"] = channelUser.name
+      body["channelUser"] = channelUser.jsonDictionary
     }
     sendSdkEvent(withName: "onIncomingAlertMessage", body: body)
   }
@@ -318,4 +326,36 @@ extension ZelloIOSSdkModule: Zello.Delegate {
   func zello(_ zello: Zello, didUpdate consoleSettings: ZelloConsoleSettings) {
     sendSdkEvent(withName: "onConsoleSettingsChanged", body: consoleSettings.jsonDictionary)
   }
+
+  func zello(_ zello: Zello, didJoin conversation: ZelloGroupConversation) {
+    sendSdkEvent(withName: "onGroupConversationInvite", body: ["conversation": conversation.jsonDictionary])
+  }
+
+  func zello(_ zello: Zello, didLeave conversation: ZelloGroupConversation) {
+    sendSdkEvent(withName: "onGroupConversationLeft", body: ["conversation": conversation.jsonDictionary])
+  }
+
+  func zello(_ zello: Zello, didCreate conversation: ZelloGroupConversation) {
+    sendSdkEvent(withName: "onGroupConversationCreated", body: ["conversation": conversation.jsonDictionary])
+  }
+
+  func zello(_ zello: Zello, didRename conversation: ZelloGroupConversation) {
+    sendSdkEvent(withName: "onGroupConversationRenamed", body: ["conversation": conversation.jsonDictionary])
+  }
+
+  func zello(_ zello: Zello, didAdd users: [ZelloGroupConversationUser], to conversation: ZelloGroupConversation) {
+    let body: [AnyHashable: Any] = [
+      "conversation": conversation.jsonDictionary,
+      "users": users.map { user in user.jsonDictionary }
+    ]
+    sendSdkEvent(withName: "onGroupConversationUsersAdded", body: body)
+  }
+
+  func zello(_ zello: Zello, didRemove users: [ZelloGroupConversationUser], from conversation: ZelloGroupConversation) {
+    let body: [AnyHashable: Any] = [
+      "conversation": conversation.jsonDictionary,
+      "users": users.map { user in user.jsonDictionary }
+    ]
+    sendSdkEvent(withName: "onGroupConversationUsersLeft", body: body)
+  }
 }