Merge pull request #87 from AgoraIO-Community/rtm-update-fix

Fix RTM 1.1.1 Compatibility

- Minimum RTM 1.1.1
- Add Error param to delegate methods to pass through the error
- Show correct versions of RTC and RTM
- Show RTM classes

CHANGELOG.md

@@ -1,4 +1,11 @@
-### 1.0.0
+## 1.0.1
+
+- Add Error param to delegate methods to pass through the error
+- Show correct versions of RTC and RTM
+- Show RTM classes
+- Update RTM to v1.1.1
+
+## 1.0.0
 
   - Updated RTC to v5.2.0
   - JSON serialization for all the host controls

lib/agora_uikit.dart

@@ -49,6 +49,15 @@ export 'package:agora_rtc_engine/rtc_engine.dart'
         SuperResolutionStateReason,
         UploadErrorReason,
         VideoRenderMode;
+export 'package:agora_rtm/agora_rtm.dart'
+    show
+        AgoraRtmMessage,
+        AgoraRtmMember,
+        AgoraRtmChannelAttribute,
+        AgoraRtmChannelException,
+        AgoraRtmClientException,
+        AgoraRtmLocalInvitation,
+        AgoraRtmRemoteInvitation;
 export 'package:permission_handler/permission_handler.dart';
 
 export 'models/agora_channel_data.dart' show AgoraChannelData;

lib/controllers/rtm_client_event_handler.dart

@@ -45,11 +45,11 @@ Future<void> rtmClientEventHandler({
     }
   };
 
-  agoraRtmClient.onError = () {
-    agoraRtmClientEventHandler.onError?.call();
+  agoraRtmClient.onError = (error) {
+    agoraRtmClientEventHandler.onError?.call(error);
 
     log(
-      'Error Occurred while initializing the RTM client',
+      'Error Occurred while initializing the RTM client: ${error.hashCode}',
       level: Level.error.value,
       name: 'AgoraUIKit',
     );

lib/controllers/session_controller.dart

@@ -12,6 +12,7 @@ import 'package:agora_uikit/models/agora_connection_data.dart';
 import 'package:agora_uikit/models/agora_rtc_event_handlers.dart';
 import 'package:agora_uikit/models/agora_rtm_channel_event_handler.dart';
 import 'package:agora_uikit/models/agora_rtm_client_event_handler.dart';
+import 'package:agora_uikit/models/agora_rtm_mute_request.dart';
 import 'package:agora_uikit/models/agora_settings.dart';
 import 'package:agora_uikit/models/agora_user.dart';
 import 'package:agora_uikit/src/enums.dart';
@@ -77,6 +78,12 @@ class SessionController extends ValueNotifier<AgoraSettings> {
       ),
       connectionData: agoraConnectionData,
     );
+    // Getting SDK versions and assigning them
+    String? rtcVersion = await value.engine?.getSdkVersion();
+    AgoraVersions.staticRTM = await AgoraRtmClient.getSdkVersion();
+    if (rtcVersion != null) {
+      AgoraVersions.staticRTC = rtcVersion;
+    }
   }
 
   Future<void> askForUserCameraAndMicPermission() async {

lib/models/agora_rtm_client_event_handler.dart

@@ -12,7 +12,7 @@ class AgoraRtmClientEventHandler {
   final Function()? onTokenExpired;
 
   /// Occurs when you receive error events.
-  final Function()? onError;
+  final Function(dynamic error)? onError;
 
   /// Callback to the caller: occurs when the caller receives the call invitation.
   final Function(AgoraRtmLocalInvitation)? onLocalInvitationReceivedByPeer;

lib/models/agora_rtm_mute_request.dart

@@ -99,7 +99,7 @@ class AgoraUIKit {
   String platform = platformStr();
 
   String framework = "flutter";
-  String version = "1.0.0";
+  String version = "1.0.1";
 
   AgoraUIKit.fromJson(Map<String, dynamic> json)
       : platform = json['platform'],
@@ -116,8 +116,10 @@ class AgoraUIKit {
 /// Class to store and share the Agora version for RTC and RTM
 class AgoraVersions {
   AgoraVersions();
-  String rtm = '1.1.0';
-  String rtc = '5.1.0';
+  static String staticRTM = '1.1.1';
+  static String staticRTC = '5.2.0';
+  String rtm = AgoraVersions.staticRTM;
+  String rtc = AgoraVersions.staticRTC;
 
   AgoraVersions.fromJson(Map<String, dynamic> json)
       : rtm = json['rtm'],

pubspec.yaml

@@ -1,7 +1,7 @@
 name: agora_uikit
 description: Flutter plugin to simply integrate Agora Video Calling or Live
   Video Streaming to your app with just a few lines of code.
-version: 1.0.0
+version: 1.0.1
 homepage: https://www.agora.io/en/
 repository: https://github.com/AgoraIO-Community/Flutter-UIKit
 
@@ -11,7 +11,7 @@ environment:
 
 dependencies:
   agora_rtc_engine: ^5.2.0
-  agora_rtm: ^1.1.0
+  agora_rtm: ^1.1.1
   flutter:
     sdk: flutter
   http: ^0.13.4