Merge pull request #42 from AgoraIO-Community/rtm-optional

Rtm Optional
AgoraIO-Community · Oct 1, 2021 · 72a5312 · 72a5312
2 parents 89db651 + 11c0cc3
commit 72a5312
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/AgoraUIKit_iOS.podspec b/AgoraUIKit_iOS.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'AgoraUIKit_iOS'
-  s.version          = '1.6.5'
+  s.version          = '1.6.6'
   s.summary          = 'Agora video session UIKit template.'
 
   s.description      = <<-DESC

diff --git a/AgoraUIKit_macOS.podspec b/AgoraUIKit_macOS.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'AgoraUIKit_macOS'
-  s.version          = '1.6.4'
+  s.version          = '1.6.6'
   s.summary          = 'Agora video session AppKit template.'
 
   s.description      = <<-DESC

diff --git a/Sources/Agora-UIKit/AgoraSettings.swift b/Sources/Agora-UIKit/AgoraSettings.swift
@@ -20,6 +20,9 @@ public struct AgoraSettings {
     /// Delegate for Agora RTM Channel callbacks
     public weak var rtmChannelDelegate: AgoraRtmChannelDelegate?
 
+    /// Whether RTM should be initialised and used
+    public var rtmEnabled: Bool = true
+
     /// URL to fetch tokens from. If supplied, this package will automatically fetch tokens
     /// when the Agora Engine indicates it will be needed.
     /// It will follow the URL pattern found in

diff --git a/Sources/Agora-UIKit/AgoraUIKit.swift b/Sources/Agora-UIKit/AgoraUIKit.swift
@@ -22,7 +22,7 @@ public struct AgoraUIKit: Codable {
     /// Framework type of UIKit. "native", "flutter", "reactnative"
     fileprivate(set) var framework: String
     /// Version of UIKit being used
-    static let version = "1.6.5"
+    static let version = "1.6.6"
     /// Framework type of UIKit. "native", "flutter", "reactnative"
     static let framework = "native"
     #if os(iOS)

diff --git a/Sources/Agora-UIKit/AgoraVideoViewer+VideoControl.swift b/Sources/Agora-UIKit/AgoraVideoViewer+VideoControl.swift
@@ -324,8 +324,12 @@ extension AgoraVideoViewer {
 
     /// Initialise RTM to send messages across the network.
     open func setupRtmController(joining channel: String) {
+        if !self.agSettings.rtmEnabled { return }
         if self.rtmController == nil {
             self.rtmController = AgoraRtmController(delegate: self)
+            if self.rtmController == nil {
+                AgoraVideoViewer.agoraPrint(.error, message: "Error initialising RTM")
+            }
         }
         self.rtmController?.joinChannel(named: channel)
     }