From 127adc5bf429254a59fc7df105f98cd54f4f74f4 Mon Sep 17 00:00:00 2001 From: Robert Sutton Date: Mon, 28 Oct 2019 11:04:11 +1100 Subject: [PATCH 1/2] add converter from string to enum to enumhelper --- lib/src/enum_helper.dart | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/src/enum_helper.dart b/lib/src/enum_helper.dart index b8b8a52d..55f8949e 100644 --- a/lib/src/enum_helper.dart +++ b/lib/src/enum_helper.dart @@ -30,4 +30,14 @@ class EnumHelper { static String reCase(String value) { return ReCase(value).titleCase; } + + static T getEnum(String enumName, List values) { + String cleanedName = reCase(enumName); + for (int i = 0; i < values.length; i++) { + if (cleanedName == getName(values[i])) { + return values[i]; + } + } + throw Exception("$cleanedName doesn't exist in the list of enums $values"); + } } From 52cd848a7e3ce429ed1173078a18b6a7a8d8b733 Mon Sep 17 00:00:00 2001 From: Robert Sutton Date: Mon, 28 Oct 2019 11:10:53 +1100 Subject: [PATCH 2/2] remove Socket from Transport event, it was the wrong type and should never be seen at this level --- lib/src/sip_ua_helper.dart | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/src/sip_ua_helper.dart b/lib/src/sip_ua_helper.dart index ba2e92ff..ed1aec15 100644 --- a/lib/src/sip_ua_helper.dart +++ b/lib/src/sip_ua_helper.dart @@ -129,22 +129,20 @@ class SIPUAHelper extends EventManager { this._ua = UA(_settings); this._ua.on(EventSocketConnecting(), (EventSocketConnecting event) { logger.debug('connecting => ' + event.toString()); - _notifyTransportStateListeners(TransportState( - TransportStateEnum.CONNECTING, - socket: event.socket)); + _notifyTransportStateListeners( + TransportState(TransportStateEnum.CONNECTING)); }); this._ua.on(EventSocketConnected(), (EventSocketConnected event) { logger.debug('connected => ' + event.toString()); _notifyTransportStateListeners( - TransportState(TransportStateEnum.CONNECTED, socket: event.socket)); + TransportState(TransportStateEnum.CONNECTED)); }); this._ua.on(EventSocketDisconnected(), (EventSocketDisconnected event) { logger.debug('disconnected => ' + (event.cause.toString())); _notifyTransportStateListeners(TransportState( TransportStateEnum.DISCONNECTED, - socket: event.socket, cause: event.cause)); }); @@ -422,9 +420,8 @@ enum TransportStateEnum { class TransportState { TransportStateEnum state; - Socket socket; ErrorCause cause; - TransportState(this.state, {this.socket = null, this.cause}); + TransportState(this.state, {this.cause}); } abstract class SipUaHelperListener {