Removed Obsolete ConnectionSettings class

Client now switches to RestClient after RPCTransport Connect (stability workaround)

prs.mobile.new/PRS.Mobile.sln

@@ -35,6 +35,12 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "InABox.Mobile.iOS", "..\..\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "websocket-sharp-standard", "..\..\3rdpartylibs\websocket-sharp-master\websocket-sharp-standard\websocket-sharp-standard.csproj", "{9A7C1E4B-1774-4900-9BCE-9CD7BCF405CF}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InABox.Client.Rest", "..\..\inabox\inabox.client.rest\InABox.Client.Rest\InABox.Client.Rest.csproj", "{5CAB52DF-F219-43FC-AC36-E9F10F0FFBFF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InABox.Client.WebSocket", "..\..\inabox\inabox.client.websocket\InABox.Client.WebSocket.csproj", "{29C542AC-20D6-4582-90FB-E2583CC91DB7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InABox.WebSocket.Shared", "..\..\inabox\inabox.websocket.shared\InABox.WebSocket.Shared.csproj", "{BEAE1362-5709-4F84-8966-D837647F2BDA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Ad-Hoc|iPhone = Ad-Hoc|iPhone
@@ -255,6 +261,54 @@ Global
 		{9A7C1E4B-1774-4900-9BCE-9CD7BCF405CF}.Release|iPhone.Build.0 = Release|Any CPU
 		{9A7C1E4B-1774-4900-9BCE-9CD7BCF405CF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{9A7C1E4B-1774-4900-9BCE-9CD7BCF405CF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{5CAB52DF-F219-43FC-AC36-E9F10F0FFBFF}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{5CAB52DF-F219-43FC-AC36-E9F10F0FFBFF}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{5CAB52DF-F219-43FC-AC36-E9F10F0FFBFF}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{5CAB52DF-F219-43FC-AC36-E9F10F0FFBFF}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{5CAB52DF-F219-43FC-AC36-E9F10F0FFBFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5CAB52DF-F219-43FC-AC36-E9F10F0FFBFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5CAB52DF-F219-43FC-AC36-E9F10F0FFBFF}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{5CAB52DF-F219-43FC-AC36-E9F10F0FFBFF}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{5CAB52DF-F219-43FC-AC36-E9F10F0FFBFF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{5CAB52DF-F219-43FC-AC36-E9F10F0FFBFF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{5CAB52DF-F219-43FC-AC36-E9F10F0FFBFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5CAB52DF-F219-43FC-AC36-E9F10F0FFBFF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5CAB52DF-F219-43FC-AC36-E9F10F0FFBFF}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{5CAB52DF-F219-43FC-AC36-E9F10F0FFBFF}.Release|iPhone.Build.0 = Release|Any CPU
+		{5CAB52DF-F219-43FC-AC36-E9F10F0FFBFF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{5CAB52DF-F219-43FC-AC36-E9F10F0FFBFF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{29C542AC-20D6-4582-90FB-E2583CC91DB7}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{29C542AC-20D6-4582-90FB-E2583CC91DB7}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{29C542AC-20D6-4582-90FB-E2583CC91DB7}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{29C542AC-20D6-4582-90FB-E2583CC91DB7}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{29C542AC-20D6-4582-90FB-E2583CC91DB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{29C542AC-20D6-4582-90FB-E2583CC91DB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{29C542AC-20D6-4582-90FB-E2583CC91DB7}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{29C542AC-20D6-4582-90FB-E2583CC91DB7}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{29C542AC-20D6-4582-90FB-E2583CC91DB7}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{29C542AC-20D6-4582-90FB-E2583CC91DB7}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{29C542AC-20D6-4582-90FB-E2583CC91DB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{29C542AC-20D6-4582-90FB-E2583CC91DB7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{29C542AC-20D6-4582-90FB-E2583CC91DB7}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{29C542AC-20D6-4582-90FB-E2583CC91DB7}.Release|iPhone.Build.0 = Release|Any CPU
+		{29C542AC-20D6-4582-90FB-E2583CC91DB7}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{29C542AC-20D6-4582-90FB-E2583CC91DB7}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{BEAE1362-5709-4F84-8966-D837647F2BDA}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{BEAE1362-5709-4F84-8966-D837647F2BDA}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{BEAE1362-5709-4F84-8966-D837647F2BDA}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{BEAE1362-5709-4F84-8966-D837647F2BDA}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{BEAE1362-5709-4F84-8966-D837647F2BDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BEAE1362-5709-4F84-8966-D837647F2BDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BEAE1362-5709-4F84-8966-D837647F2BDA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{BEAE1362-5709-4F84-8966-D837647F2BDA}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{BEAE1362-5709-4F84-8966-D837647F2BDA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{BEAE1362-5709-4F84-8966-D837647F2BDA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{BEAE1362-5709-4F84-8966-D837647F2BDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BEAE1362-5709-4F84-8966-D837647F2BDA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BEAE1362-5709-4F84-8966-D837647F2BDA}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{BEAE1362-5709-4F84-8966-D837647F2BDA}.Release|iPhone.Build.0 = Release|Any CPU
+		{BEAE1362-5709-4F84-8966-D837647F2BDA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{BEAE1362-5709-4F84-8966-D837647F2BDA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{2E807D8C-659F-464D-89FE-3889019BE8EA} = {45D05CAD-26CA-4F1F-86F1-560B0C7C5177}
@@ -271,5 +325,6 @@ Global
 		{DF11E3A5-F670-4B09-AD37-01D9ED5ED3BA} = {0FAD249B-2C90-4ABC-B14D-8D1C44D071C2}
 		{DAA14944-1DA1-4E7A-B9D2-A6545EBBF2FF} = {0FAD249B-2C90-4ABC-B14D-8D1C44D071C2}
 		{9A7C1E4B-1774-4900-9BCE-9CD7BCF405CF} = {D70FB71D-5C9D-44FC-AF66-3B9A23AD7FFD}
+		{5CAB52DF-F219-43FC-AC36-E9F10F0FFBFF} = {0FAD249B-2C90-4ABC-B14D-8D1C44D071C2}
 	EndGlobalSection
 EndGlobal

prs.mobile.new/PRS.Mobile/App.xaml.cs

@@ -10,8 +10,6 @@ using InABox.Rpc;
 using Xamarin.Essentials;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
-using XF.Material.Forms;
-using XF.Material.Forms.UI;
 
 [assembly: XamlCompilation(XamlCompilationOptions.Compile)]
 namespace PRS.Mobile
@@ -49,6 +47,9 @@ namespace PRS.Mobile
 
             Transport = transport;
             ClientFactory.SetClientType(typeof(RpcClient<>), InABox.Core.Platform.TimeBench, MobileUtils.AppVersion.InstalledVersionNumber + App.DeviceString, Transport);
+            var info = new Client<User>().Info();
+            var resturl = $"{transport.ServerName()}:{info.RestPort}";
+            ClientFactory.SetClientType(typeof(RestClient<>), InABox.Core.Platform.TimeBench, MobileUtils.AppVersion.InstalledVersionNumber + App.DeviceString, resturl);
             return TransportStatus.OK;
         }
 

prs.mobile.new/PRS.Mobile/Main/ConnectionSettings.cs

@@ -1,15 +0,0 @@
-using InABox.Clients;
-using InABox.Configuration;
-
-namespace PRS.Mobile
-{
-    public class ConnectionSettings : ILocalConfigurationSettings
-    {
-        public string URL { get; set; }
-        public int Port { get; set; }
-        public SerializerProtocol Protocol { get; set; }
-        public string UserID { get; set; }
-        public string Password { get; set; }
-
-    }
-}

prs.mobile.new/PRS.Mobile/Main/PINLoginPage.xaml.cs

@@ -209,22 +209,8 @@ namespace PRS.Mobile
             
             _settings = new LocalConfiguration<DatabaseSettings>().Load();
                          
-             if (!_settings.URLs.Any())
-             {
-                 // Do we have old-style settings we can migrate from?
-                 var Settings = new LocalConfiguration<ConnectionSettings>().Load();
-                 if (!String.IsNullOrWhiteSpace(Settings.URL))
-                 {
-                     _settings.URLs = new string[] { Settings.URL };
-                     _settings.UserID = Settings.UserID;
-                     _settings.Password = Settings.Password;
-                     // Get rid of the old ConnectionSettings storage
-                     new LocalConfiguration<ConnectionSettings>().Delete();
-                 }
-             }
-
             
-             // Still nothing?  Populate with Defaults
+             // Nothing?  Populate with Defaults
              if (!_settings.URLs.Any())
              {
                  _settings.URLs = new String[]

prs.mobile.new/PRS.Mobile/PRS.Mobile.csproj

@@ -63,6 +63,7 @@
     </ItemGroup>
 
     <ItemGroup>
+      <ProjectReference Include="..\..\..\inabox\inabox.client.rest\InABox.Client.Rest\InABox.Client.Rest.csproj" />
       <ProjectReference Include="..\..\..\inabox\InABox.Client.RPC\InABox.Client.RPC.csproj" />
       <ProjectReference Include="..\..\..\inabox\InABox.Configuration\InABox.Configuration.csproj" />
       <ProjectReference Include="..\..\..\inabox\InABox.Core\InABox.Core.csproj" />