Merge pull request #191 from cybex-dev/feat_event_reconnected

Feat: Add reconnect status events
cybex-dev · Nov 7, 2023 · bb002d0 · bb002d0
2 parents bce5d30 + 1a3c88f
commit bb002d0
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
-## Next release
+## 0.1.2
+* Added: CallEvents: 
+  * `Reconnected`
+  * `Reconnecting`
 
 ## 0.1.1
 

diff --git a/README.md b/README.md
@@ -321,6 +321,8 @@ The events sent are the following
 - incoming // web, MacOS only
 - ringing
 - connected
+- reconnected
+- reconnecting
 - callEnded
 - unhold
 - hold

diff --git a/android/src/main/kotlin/com/twilio/twilio_voice/TwilioVoicePlugin.kt b/android/src/main/kotlin/com/twilio/twilio_voice/TwilioVoicePlugin.kt
@@ -1771,7 +1771,7 @@ class TwilioVoicePlugin : FlutterPlugin, MethodCallHandler, EventChannel.StreamH
             }
 
             TVNativeCallEvents.EVENT_RECONNECTING -> {
-                logEvent("", "Reconnecting...");
+                logEvent("", "Reconnecting");
             }
 
             TVNativeCallEvents.EVENT_RECONNECTED -> {

diff --git a/ios/Classes/SwiftTwilioVoicePlugin.swift b/ios/Classes/SwiftTwilioVoicePlugin.swift
@@ -651,12 +651,12 @@ public class SwiftTwilioVoicePlugin: NSObject, FlutterPlugin,  FlutterStreamHand
     }
 
     public func call(call: Call, isReconnectingWithError error: Error) {
-        self.sendPhoneCallEvents(description: "LOG|call:isReconnectingWithError:", isError: false)
+        self.sendPhoneCallEvents(description: "Reconnecting", isError: false)
 
     }
 
     public func callDidReconnect(call: Call) {
-        self.sendPhoneCallEvents(description: "LOG|callDidReconnect:", isError: false)
+        self.sendPhoneCallEvents(description: "Reconnected", isError: false)
     }
 
     public func callDidFailToConnect(call: Call, error: Error) {

diff --git a/lib/_internal/method_channel/twilio_voice_method_channel.dart b/lib/_internal/method_channel/twilio_voice_method_channel.dart
@@ -370,6 +370,8 @@ class MethodChannelTwilioVoice extends TwilioVoicePlatform {
       }
 
       return CallEvent.returningCall;
+    } else if (state.startsWith("Reconnecting")) {
+      return CallEvent.reconnecting;
     }
     switch (state) {
       case 'Ringing':
@@ -397,6 +399,8 @@ class MethodChannelTwilioVoice extends TwilioVoicePlatform {
         return CallEvent.bluetoothOn;
       case 'Bluetooth Off':
         return CallEvent.bluetoothOff;
+      case 'Reconnected':
+        return CallEvent.reconnected;
       default:
         if (kDebugMode) {
           printDebug('$state is not a valid CallState.');

diff --git a/lib/_internal/twilio_voice_web.dart b/lib/_internal/twilio_voice_web.dart
@@ -985,7 +985,7 @@ class Call extends MethodChannelTwilioCall {
 
   /// On active call reconnecting to Twilio network
   void _onCallReconnecting(dynamic twilioError) {
-    Logger.logLocalEvent("Reconnecting...");
+    Logger.logLocalEvent("Reconnecting");
   }
 
   /// On active call reconnecting to Twilio network

diff --git a/lib/models/call_event.dart b/lib/models/call_event.dart
@@ -4,6 +4,8 @@ enum CallEvent {
   incoming,
   ringing,
   connected,
+  reconnected,
+  reconnecting,
   callEnded,
   unhold,
   hold,