From afbd1e08175f51b441cd357919b6346b62320e56 Mon Sep 17 00:00:00 2001
From: Andy Howard <ahoward@sarand.com>
Date: Wed, 5 May 2021 12:31:28 +0100
Subject: [PATCH] Jan-2021 Added VPN URL connection option.

---
 .../Properties/AndroidManifest.xml            |  2 +-
 .../LogisticsMgrMobile/Mobile/App/App.xaml.cs |  1 +
 .../Mobile/Core/App/SlmCommand_Mobile.cs      | 22 ++++++++++++++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/LogisticsMgrMobile/LogisticsMgrMobile.Android/Properties/AndroidManifest.xml b/LogisticsMgrMobile/LogisticsMgrMobile.Android/Properties/AndroidManifest.xml
index 4c86378..0fa8ad9 100644
--- a/LogisticsMgrMobile/LogisticsMgrMobile.Android/Properties/AndroidManifest.xml
+++ b/LogisticsMgrMobile/LogisticsMgrMobile.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.2.4" package="LogisticsMgrMobile.LogisticsMgrMobile" android:installLocation="auto" android:versionCode="7" android:icon="@drawable/icon_solent_stevedores">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.2.5" package="LogisticsMgrMobile.LogisticsMgrMobile" android:installLocation="auto" android:icon="@drawable/icon_solent_stevedores" android:versionCode="8">
 	<uses-sdk android:minSdkVersion="27" android:targetSdkVersion="27" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
diff --git a/LogisticsMgrMobile/LogisticsMgrMobile/Mobile/App/App.xaml.cs b/LogisticsMgrMobile/LogisticsMgrMobile/Mobile/App/App.xaml.cs
index feb4085..36dd283 100644
--- a/LogisticsMgrMobile/LogisticsMgrMobile/Mobile/App/App.xaml.cs
+++ b/LogisticsMgrMobile/LogisticsMgrMobile/Mobile/App/App.xaml.cs
@@ -95,6 +95,7 @@ namespace Sarand.LogisticsMgr.Mobile.App
 		{
 			if (sites.Count < 1)
 			{
+				sites.Add(new SlmSiteDefinition_App(Slm.Site.Southampton, "STN [DNS]", "http://vpn-s.solentstevedores.com:34568/SaLogMgr"));
 				sites.Add(new SlmSiteDefinition_App(Slm.Site.Southampton, "STN [IP4 ext]", "http://37.48.230.34:34568/SaLogMgr"));
 				sites.Add(new SlmSiteDefinition_App(Slm.Site.Southampton, "STN [IP4 int]", "http://10.1.4.13:34567/SaLogMgr"));
 				sites.Add(new SlmSiteDefinition_App(Slm.Site.Southampton, "STN [IP6 int]", "http://[fe80:f4c9:7720:45d8:f1b0]:34567/SaLogMgr"));
diff --git a/SaLogMgrMobCore/Mobile/Core/App/SlmCommand_Mobile.cs b/SaLogMgrMobCore/Mobile/Core/App/SlmCommand_Mobile.cs
index 0b6d04b..0d9c064 100644
--- a/SaLogMgrMobCore/Mobile/Core/App/SlmCommand_Mobile.cs
+++ b/SaLogMgrMobCore/Mobile/Core/App/SlmCommand_Mobile.cs
@@ -13,7 +13,20 @@ namespace Sarand.LogisticsMgr.Mobile.Core.App
 
 		//-------------------------------------------------------------------
 		// Construction.
-		public SlmCommand_Mobile (ExecuteFn executeFn, CanExecuteFn canExecuteFn = null) :
+		/// <summary>
+		/// Command with only Execute method - can always be executed.
+		/// </summary>
+		/// <param name="executeFn"></param>
+		public SlmCommand_Mobile (ExecuteFn executeFn) :
+			this(executeFn, CanAlwaysExecute)
+		{
+		}
+		/// <summary>
+		/// Command with Execute and CanExecute methods.
+		/// </summary>
+		/// <param name="executeFn"></param>
+		/// <param name="canExecuteFn"></param>
+		public SlmCommand_Mobile (ExecuteFn executeFn, CanExecuteFn canExecuteFn) :
 			base(executeFn, canExecuteFn)
 		{
 		}
@@ -29,6 +42,13 @@ namespace Sarand.LogisticsMgr.Mobile.Core.App
 		protected SlmUserContext_Mobile UserContext { get { return SessionProfile.UserContext_Mobile; } }
 		protected SlmSecurityProfile SecurityProfile { get { return UserContext.SecurityProfile; } }
 
+		//-------------------------------------------------------------------
+		// Execution.
+		public static bool CanAlwaysExecute (object commandParam)
+		{
+			return true;
+		}
+
 		//-------------------------------------------------------------------
 	}
 	//=======================================================================