Parse the target uri and contact uri as soon they are provided in the settings. (#513)

- The lib was juggling between string or URI? and assuming URI the majority of the time

Author: VictorUvarov

lib/src/config.dart

@@ -18,8 +18,8 @@ class Settings {
 
   // SIP account.
   String? display_name;
-  dynamic uri;
-  dynamic contact_uri;
+  URI? uri;
+  URI? contact_uri;
   String user_agent = DartSIP_C.USER_AGENT;
 
   // SIP instance id (GRUU).

lib/src/rtc_session/refer_subscriber.dart

@@ -45,7 +45,7 @@ class ReferSubscriber extends EventManager {
 
     // Referred-By header field.
     String referredBy =
-        'Referred-By: <${_session.ua.configuration.uri.scheme}:${_session.ua.configuration.uri.user}@${_session.ua.configuration.uri.host}>';
+        'Referred-By: <${_session.ua.configuration.uri!.scheme}:${_session.ua.configuration.uri!.user}@${_session.ua.configuration.uri!.host}>';
 
     extraHeaders.add(referredBy);
     extraHeaders.add('Contact: ${_session.contact}');

lib/src/sip_ua_helper.dart

@@ -161,7 +161,7 @@ class SIPUAHelper extends EventManager {
     }
 
     _settings.transportType = uaSettings.transportType!;
-    _settings.uri = uaSettings.uri;
+    _settings.uri = uaSettings.uri != null ? URI.parse(uaSettings.uri!) : null;
     _settings.sip_message_delay = uaSettings.sip_message_delay;
     _settings.realm = uaSettings.realm;
     _settings.password = uaSettings.password;
@@ -181,7 +181,9 @@ class SIPUAHelper extends EventManager {
         uaSettings.sessionTimersRefreshMethod;
     _settings.instance_id = uaSettings.instanceId;
     _settings.registrar_server = uaSettings.registrarServer;
-    _settings.contact_uri = uaSettings.contact_uri;
+    _settings.contact_uri = uaSettings.contact_uri != null
+        ? URI.parse(uaSettings.contact_uri!)
+        : null;
     _settings.connection_recovery_max_interval =
         uaSettings.connectionRecoveryMaxInterval;
     _settings.connection_recovery_min_interval =

lib/src/ua.dart

@@ -595,7 +595,7 @@ class UA extends EventManager {
     DartSIP_C.SipMethod? method = request.method;
 
     // Check that request URI points to us.
-    if (request.ruri!.user != _configuration.uri.user &&
+    if (request.ruri!.user != _configuration.uri!.user &&
         request.ruri!.user != _contact!.uri!.user) {
       logger.d('Request-URI does not point to us');
       if (request.method != SipMethod.ACK) {
@@ -830,7 +830,7 @@ class UA extends EventManager {
     _configuration.jssip_id = Utils.createRandomToken(5);
 
     // String containing _configuration.uri without scheme and user.
-    URI hostport_params = _configuration.uri.clone();
+    URI hostport_params = _configuration.uri!.clone();
 
     _configuration.terminateOnAudioMediaPortZero =
         configuration.terminateOnAudioMediaPortZero;
@@ -865,12 +865,12 @@ class UA extends EventManager {
 
     // Check whether authorization_user is explicitly defined.
     // Take '_configuration.uri.user' value if not.
-    _configuration.authorization_user ??= _configuration.uri.user;
+    _configuration.authorization_user ??= _configuration.uri!.user;
 
     // If no 'registrar_server' is set use the 'uri' value without user portion and
     // without URI params/headers.
     if (_configuration.registrar_server == null) {
-      URI registrar_server = _configuration.uri.clone();
+      URI registrar_server = _configuration.uri!.clone();
       registrar_server.user = null;
       registrar_server.clearParams();
       registrar_server.clearHeaders();
@@ -890,7 +890,7 @@ class UA extends EventManager {
 
     // Via Host.
     if (_configuration.contact_uri != null) {
-      _configuration.via_host = _configuration.contact_uri.host;
+      _configuration.via_host = _configuration.contact_uri!.host;
     }
     // Contact URI.
     else {