Refactor call API, move answer, hangup, hold etc methos to Call class.

Author: cloudwebrtc

example/lib/main.dart

@@ -18,6 +18,30 @@ void main() {
 
 class MyApp extends StatelessWidget {
   final SIPUAHelper _helper = SIPUAHelper();
+  var routes = {
+    '/': (helper) => DialPadWidget(helper),
+    '/register': (helper) => RegisterWidget(helper),
+    '/callscreen': (helper, {arguments}) => CallScreenWidget(helper, arguments),
+    '/about': (helper) => AboutWidget(),
+  };
+
+  Route<dynamic> _onGenerateRoute(RouteSettings settings) {
+    final String name = settings.name;
+    final Function pageContentBuilder = routes[name];
+    if (pageContentBuilder != null) {
+      if (settings.arguments != null) {
+        final Route route = MaterialPageRoute(
+            builder: (context) =>
+                pageContentBuilder(_helper, arguments: settings.arguments));
+        return route;
+      } else {
+        final Route route = MaterialPageRoute(
+            builder: (context) => pageContentBuilder(_helper));
+        return route;
+      }
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
@@ -27,12 +51,7 @@ class MyApp extends StatelessWidget {
         fontFamily: 'Roboto',
       ),
       initialRoute: '/',
-      routes: {
-        '/': (context) => DialPadWidget(_helper),
-        '/register': (context) => RegisterWidget(_helper),
-        '/callscreen': (context) => CallScreenWidget(_helper),
-        '/about': (context) => AboutWidget(),
-      },
+      onGenerateRoute: _onGenerateRoute,
     );
   }
 }

example/lib/src/callscreen.dart

@@ -7,7 +7,8 @@ import 'package:sip_ua/sip_ua.dart';
 
 class CallScreenWidget extends StatefulWidget {
   final SIPUAHelper _helper;
-  CallScreenWidget(this._helper, {Key key}) : super(key: key);
+  final Call _call;
+  CallScreenWidget(this._helper, this._call, {Key key}) : super(key: key);
   @override
   _MyCallScreenWidget createState() => _MyCallScreenWidget();
 }
@@ -23,26 +24,25 @@ class _MyCallScreenWidget extends State<CallScreenWidget>
   MediaStream _remoteStream;
 
   bool _showNumPad = false;
-
   String _timeLabel = '00:00';
   Timer _timer;
-
   bool _audioMuted = false;
   bool _videoMuted = false;
   bool _speakerOn = false;
   bool _hold = false;
   String _holdOriginator;
   CallStateEnum _state = CallStateEnum.NONE;
-
   SIPUAHelper get helper => widget._helper;
 
   bool get voiceonly =>
       (_localStream == null || _localStream.getVideoTracks().isEmpty) &&
       (_remoteStream == null || _remoteStream.getVideoTracks().isEmpty);
 
-  String get remote_identity => helper.remote_identity;
+  String get remote_identity => call.remote_identity;
+
+  String get direction => call.direction;
 
-  String get direction => helper.direction;
+  Call get call => widget._call;
 
   @override
   initState() {
@@ -95,7 +95,7 @@ class _MyCallScreenWidget extends State<CallScreenWidget>
   }
 
   @override
-  void callStateChanged(CallState callState) {
+  void callStateChanged(Call call, CallState callState) {
     if (callState.state == CallStateEnum.HOLD ||
         callState.state == CallStateEnum.UNHOLD) {
       _hold = callState.state == CallStateEnum.HOLD;
@@ -191,12 +191,12 @@ class _MyCallScreenWidget extends State<CallScreenWidget>
   }
 
   void _handleHangup() {
-    helper.hangup();
+    call.hangup();
     _timer.cancel();
   }
 
   void _handleAccept() {
-    helper.answer();
+    call.answer(helper.buildCallOptions());
   }
 
   void _switchCamera() {
@@ -207,25 +207,25 @@ class _MyCallScreenWidget extends State<CallScreenWidget>
 
   void _muteAudio() {
     if (_audioMuted) {
-      helper.unmute(true, false);
+      call.unmute(true, false);
     } else {
-      helper.mute(true, false);
+      call.mute(true, false);
     }
   }
 
   void _muteVideo() {
     if (_videoMuted) {
-      helper.unmute(false, true);
+      call.unmute(false, true);
     } else {
-      helper.mute(false, true);
+      call.mute(false, true);
     }
   }
 
   void _handleHold() {
     if (_hold) {
-      helper.unhold();
+      call.unhold();
     } else {
-      helper.hold();
+      call.hold();
     }
   }
 
@@ -252,7 +252,7 @@ class _MyCallScreenWidget extends State<CallScreenWidget>
             FlatButton(
               child: Text('Ok'),
               onPressed: () {
-                helper.refer(_tansfer_target);
+                call.refer(_tansfer_target);
                 Navigator.of(context).pop();
               },
             ),
@@ -270,7 +270,7 @@ class _MyCallScreenWidget extends State<CallScreenWidget>
 
   void _handleDtmf(String tone) {
     print('Dtmf tone => $tone');
-    helper.sendDTMF(tone);
+    call.sendDTMF(tone);
   }
 
   void _handleKeyPad() {

example/lib/src/dialpad.dart

@@ -27,8 +27,7 @@ class _MyDialPadWidget extends State<DialPadWidget>
 
   void _loadSettings() async {
     _preferences = await SharedPreferences.getInstance();
-    _dest =
-        _preferences.getString('dest') ?? 'sip:[email protected]';
+    _dest = _preferences.getString('dest') ?? 'sip:[email protected]';
     _textController = TextEditingController(text: _dest);
     _textController.text = _dest;
     this.setState(() {});
@@ -266,9 +265,9 @@ class _MyDialPadWidget extends State<DialPadWidget>
   void transportStateChanged(TransportState state) {}
 
   @override
-  void callStateChanged(CallState callState) {
+  void callStateChanged(Call call, CallState callState) {
     if (callState.state == CallStateEnum.CALL_INITIATION) {
-      Navigator.pushNamed(context, '/callscreen');
+      Navigator.pushNamed(context, '/callscreen', arguments: call);
     }
   }
 }

example/lib/src/register.dart

@@ -295,7 +295,7 @@ class _MyRegisterWidget extends State<RegisterWidget>
   }
 
   @override
-  void callStateChanged(CallState state) {
+  void callStateChanged(Call call, CallState state) {
     //NO OP
   }
 

lib/sip_ua.dart

@@ -1,3 +1,6 @@
 /// only expose the bare minimum of internals required
 export 'src/enum_helper.dart';
 export 'src/sip_ua_helper.dart';
+
+export 'src/ua.dart';
+

lib/src/event_manager/call_events.dart

@@ -3,93 +3,109 @@ import '../sip_message.dart';
 import '../rtc_session.dart';
 import 'package:flutter_webrtc/webrtc.dart';
 
-class EventNewRTCSession extends EventType {
+class CallEvent extends EventType {
   RTCSession session;
+  String get id => session.id;
+  CallEvent(this.session);
+}
+
+class EventNewRTCSession extends CallEvent {
   String originator;
   dynamic request;
-  EventNewRTCSession({this.session, String originator, dynamic request});
+  EventNewRTCSession({RTCSession session, String originator, dynamic request})
+      : super(session);
 }
 
-class EventCallConnecting extends EventType {
-  EventCallConnecting({dynamic request});
+class EventCallConnecting extends CallEvent {
+  EventCallConnecting({RTCSession session, dynamic request}) : super(session);
 }
 
-class EventCallEnded extends EventType {
+class EventCallEnded extends CallEvent {
   String originator;
   ErrorCause cause;
   IncomingRequest request;
-  EventCallEnded({this.originator, this.cause, this.request});
+  EventCallEnded(
+      {RTCSession session, this.originator, this.cause, this.request})
+      : super(session);
 }
 
-class EventCallProgress extends EventType {
+class EventCallProgress extends CallEvent {
   String originator;
   dynamic response;
-  EventCallProgress({this.originator, this.response});
+  EventCallProgress({RTCSession session, this.originator, this.response})
+      : super(session);
 }
 
-class EventCallConfirmed extends EventType {
+class EventCallConfirmed extends CallEvent {
   String originator;
   dynamic ack;
-  EventCallConfirmed({this.originator, this.ack});
+  EventCallConfirmed({RTCSession session, this.originator, this.ack})
+      : super(session);
 }
 
-class EventCallHold extends EventType {
+class EventCallHold extends CallEvent {
   String originator;
-  EventCallHold({this.originator});
+  EventCallHold({RTCSession session, this.originator}) : super(session);
 }
 
-class EventCallUnhold extends EventType {
+class EventCallUnhold extends CallEvent {
   String originator;
-  EventCallUnhold({String originator});
+  EventCallUnhold({RTCSession session, String originator}) : super(session);
 }
 
-class EventCallMuted extends EventType {
+class EventCallMuted extends CallEvent {
   bool audio;
   bool video;
-  EventCallMuted({this.audio, this.video});
+  EventCallMuted({RTCSession session, this.audio, this.video}) : super(session);
 }
 
-class EventCallUnmuted extends EventType {
+class EventCallUnmuted extends CallEvent {
   bool audio;
   bool video;
-  EventCallUnmuted({this.audio, this.video});
+  EventCallUnmuted({RTCSession session, this.audio, this.video})
+      : super(session);
 }
 
-class EventCallAccepted extends EventType {
+class EventCallAccepted extends CallEvent {
   String originator;
   dynamic response;
-  EventCallAccepted({this.originator, this.response});
+  EventCallAccepted({RTCSession session, this.originator, this.response})
+      : super(session);
 }
 
-class EventCallFailed extends EventType {
+class EventCallFailed extends CallEvent {
   dynamic response;
   String originator;
   ErrorCause cause;
   dynamic request;
   String status_line;
   EventCallFailed(
-      {String state,
+      {RTCSession session,
+      String state,
       this.response,
       this.originator,
       MediaStream stream,
       this.cause,
       this.request,
-      this.status_line});
+      this.status_line})
+      : super(session);
 }
 
-class EventStream extends EventType {
+class EventStream extends CallEvent {
   String originator;
   MediaStream stream;
-  EventStream({this.originator, this.stream});
+  EventStream({RTCSession session, this.originator, this.stream})
+      : super(session);
 }
 
-class EventCallRefer extends EventType {
+class EventCallRefer extends CallEvent {
   String aor;
 
   /// bool Function({Function initCallback, dynamic options}) accept;
   dynamic accept;
 
   /// bool Function(dynamic options) reject;
   dynamic reject;
-  EventCallRefer({this.aor, this.accept, this.reject});
+  EventCallRefer({RTCSession session, this.aor, this.accept, this.reject})
+      : super(session);
 }