Added local video stream to localStreaMedia so you can mute your video on an upgrade, and now can await unregister

Author: Mikael Wills

lib/src/registrator.dart

@@ -276,11 +276,11 @@ class Registrator {
     request_sender.send();
   }
 
-  void unregister(bool unregister_all) {
+  Future<bool> unregister(bool unregister_all) async {
     if (_registered == false) {
       logger.d('already unregistered');
 
-      return;
+      return true;
     }
 
     _registered = false;
@@ -314,11 +314,14 @@ class Registrator {
         extraHeaders);
 
     EventManager handlers = EventManager();
+    Completer<bool> completer = Completer<bool>();
     handlers.on(EventOnRequestTimeout(), (EventOnRequestTimeout value) {
       _unregistered(null, DartSIP_C.CausesType.REQUEST_TIMEOUT);
+      completer.complete(false);
     });
     handlers.on(EventOnTransportError(), (EventOnTransportError value) {
       _unregistered(null, DartSIP_C.CausesType.CONNECTION_ERROR);
+      completer.complete(false);
     });
     handlers.on(EventOnAuthenticated(), (EventOnAuthenticated response) {
       // Increase the CSeq on authentication.
@@ -329,17 +332,20 @@ class Registrator {
       String status_code = event.response!.status_code.toString();
       if (utils.test2XX(status_code)) {
         _unregistered(event.response);
+        completer.complete(true);
       } else if (utils.test1XX(status_code)) {
         // Ignore provisional responses.
       } else {
         String cause = utils.sipErrorCause(event.response!.status_code);
         _unregistered(event.response, cause);
+        completer.complete(true);
       }
     });
 
     RequestSender request_sender = RequestSender(_ua, request, handlers);
 
     request_sender.send();
+    return completer.future;
   }
 
   void close() {

lib/src/rtc_session.dart

@@ -2091,10 +2091,13 @@ class RTCSession extends EventManager implements Owner {
         for (MediaStreamTrack track in localStream.getTracks()) {
           if (track.kind == 'video') {
             _connection!.addTrack(track, localStream);
+            _localMediaStream?.addTrack(track);
           }
         }
         emit(EventStream(
-            session: this, originator: Originator.local, stream: localStream));
+            session: this,
+            originator: Originator.local,
+            stream: _localMediaStream));
       } else {
         logger.w(
             'Remote wants to upgrade to video but no camera available to send');
@@ -3249,17 +3252,27 @@ class RTCSession extends EventManager implements Owner {
 
   void _toggleMuteAudio(bool mute) {
     if (_localMediaStream != null) {
+      if (_localMediaStream!.getAudioTracks().isEmpty) {
+        logger.w('Went to mute video but local stream has no video tracks');
+      }
       for (MediaStreamTrack track in _localMediaStream!.getAudioTracks()) {
         track.enabled = !mute;
       }
+    } else {
+      logger.w('Went to mute audio but local stream is null');
     }
   }
 
   void _toggleMuteVideo(bool mute) {
     if (_localMediaStream != null) {
+      if (_localMediaStream!.getVideoTracks().isEmpty) {
+        logger.w('Went to mute video but local stream has no video tracks');
+      }
       for (MediaStreamTrack track in _localMediaStream!.getVideoTracks()) {
         track.enabled = !mute;
       }
+    } else {
+      logger.w('Went to mute video but local stream is null');
     }
   }
 

lib/src/sip_ua_helper.dart

@@ -86,12 +86,13 @@ class SIPUAHelper extends EventManager {
     _ua!.register();
   }
 
-  void unregister([bool all = true]) {
+  Future<bool> unregister([bool all = true]) async {
     if (_ua != null) {
       assert(registered, 'ERROR: you must call register first.');
-      _ua!.unregister(all: all);
+      return _ua!.unregister(all: all);
     } else {
       logger.e('ERROR: unregister called, you must call start first.');
+      return false;
     }
   }
 

lib/src/ua.dart

@@ -185,11 +185,11 @@ class UA extends EventManager {
   /**
    * Unregister.
    */
-  void unregister({bool all = false}) {
+  Future<bool> unregister({bool all = false}) {
     logger.d('unregister()');
 
     _dynConfiguration!.register = false;
-    _registrator.unregister(all);
+    return _registrator.unregister(all);
   }
 
   /**

pubspec.yaml

@@ -9,7 +9,7 @@ environment:
 dependencies:
   collection: ^1.18.0
   crypto: ^3.0.3
-  flutter_webrtc: ^0.12.4
+  flutter_webrtc: ^0.12.6
   intl: ^0.20.1
   logger: ^2.0.2+1
   path: ^1.6.4
@@ -18,7 +18,6 @@ dependencies:
   text: ^0.2.0
   uuid: ^4.2.1
 
-
 dev_dependencies:
   import_sorter: ^4.6.0
   lints: ^4.0.0