Version 3.0.362

TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/IBikeInfoMutable.cs

@@ -1,6 +1,6 @@
-namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
+namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
 {
-	public interface IBikeInfoMutable : BikeInfoNS.BC.IBikeInfoMutable
+	public interface IBikeInfoMutable : BC.IBikeInfoMutable
 	{
 		ILockInfoMutable LockInfo { get; }
 	}

TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/ILockInfoMutable.cs

@@ -1,4 +1,5 @@
 using System;
+using TINK.Services.Geolocation;
 
 namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
 {
@@ -20,6 +21,14 @@ namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
 
 		byte[] Seed { get; }
 
+		/// <summary> Timestamp of the last locking state change.</summary>
+		DateTime? LastLockingStateChange { get; }
+
+		/// <summary>
+		/// Gets or sets the current location of the bike, null if location is unknown.
+		/// </summary>
+		IGeolocation Location { get; set; }
+
 		/// <summary>
 		/// Gets the version info of the locks.
 		/// </summary>

TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/LockInfoMutable.cs

@@ -1,4 +1,5 @@
 using System;
+using TINK.Services.Geolocation;
 
 namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
 {
@@ -7,16 +8,24 @@ namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
 		/// <summary> Lock info object. </summary>
 		private LockInfo LockInfo { get; set; }
 
+		/// <summary>
+		/// Delegate to create time stamp.
+		/// </summary>
+		private Func<DateTime> _nowDelegate;
+
 		/// <summary> Constructs a bluetooth lock info object. </summary>
 		/// <param name="id">Id of lock must always been known when constructing an lock info object.</param>
+		/// <param name="nowDelegate">Delegate to create time stamp if null DateTime.Now is used.</param>
 		public LockInfoMutable(
 			int id,
 			Guid guid,
 			byte[] userKey,
 			byte[] adminKey,
 			byte[] seed,
-			LockingState state)
+			LockingState state,
+			Func<DateTime> nowDelegate = null)
 		{
+			_nowDelegate = nowDelegate ?? (() => DateTime.Now);
 			LockInfo = new LockInfo.Builder() { Id = id, Guid = guid, UserKey = userKey, AdminKey = adminKey, Seed = seed, State = state }.Build();
 		}
 
@@ -35,12 +44,34 @@ namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
 
 		public byte[] AdminKey => LockInfo.AdminKey;
 
+		/// <summary>
+		/// Gets or sets the locking state.
+		/// </summary>
 		public LockingState State
 		{
 			get => LockInfo.State;
-			set => LockInfo = new LockInfo.Builder(LockInfo) { State = value }.Build();
+			set
+			{
+				if (LockInfo.State == value)
+				{
+					// State does not change, nothing to do.
+					return;
+				}
+
+				Location = null; // Invalidate location.
+				LastLockingStateChange = _nowDelegate(); // Get time stamp when state change happened.
+				LockInfo = new LockInfo.Builder(LockInfo) { State = value }.Build();
+			}
 		}
 
+		/// <summary> Gets the timestamp of the last locking state change.</summary>
+		public DateTime? LastLockingStateChange { get; private set; }
+
+		/// <summary>
+		/// Gets or sets the current location of the bike, null if location is unknown.
+		/// </summary>
+		public IGeolocation Location { get; set; }
+
 		/// <summary> Holds the percentage of lock battery.</summary>
 		public double BatteryPercentage { get; set; } = double.NaN;
 

TINKLib/Model/IPosition.cs

@@ -1,7 +1,10 @@
-using System;
+using System;
 
 namespace TINK.Model
 {
+	/// <summary>
+	/// Holds a exact position.
+	/// </summary>
 	public interface IPosition : IEquatable<IPosition>
 	{
 		double Latitude { get; }

TINKLib/Model/Settings/JsonSettingsDictionary.cs

@@ -409,7 +409,7 @@ namespace TINK.Model.Settings
 
 			return targetDictionary.Union(new Dictionary<string, string>
 			{
-				{ typeof(IGeolocation).Name, activeGeolocationService },
+				{ typeof(IGeolocationService).Name, activeGeolocationService },
 			}).ToDictionary(key => key.Key, value => value.Value);
 		}
 
@@ -419,7 +419,7 @@ namespace TINK.Model.Settings
 		public static string GetActiveGeolocationService(this IDictionary<string, string> settingsJSON)
 		{
 			// Get uri of corpi server.
-			if (!settingsJSON.TryGetValue(typeof(IGeolocation).Name, out string activeGeolocationService)
+			if (!settingsJSON.TryGetValue(typeof(IGeolocationService).Name, out string activeGeolocationService)
 				|| string.IsNullOrEmpty(activeGeolocationService))
 			{
 				// File holds no entry.

TINKLib/Model/TinkApp.cs

@@ -176,7 +176,7 @@ namespace TINK.Model
 			string merchantId,
 			IBluetoothLE bluetoothService,
 			ILocationPermission locationPermissionsService,
-			IServicesContainer<IGeolocation> locationServicesContainer,
+			IServicesContainer<IGeolocationService> locationServicesContainer,
 			ILocksService locksService,
 			ISmartDevice device,
 			ISpecialFolder specialFolder,
@@ -406,7 +406,7 @@ namespace TINK.Model
 		public LocksServicesContainerMutable LocksServices { get; set; }
 
 		/// <summary> Holds available app themes.</summary>
-		public IServicesContainer<IGeolocation> GeolocationServices { get; }
+		public IServicesContainer<IGeolocationService> GeolocationServices { get; }
 
 		/// <summary> Holds the flavor of the app, i.e. specifies if app is sharee.bike, Mein konrad or Lastenrad Bayern.</summary>
 		public AppFlavor Flavor { get; private set; }

TINKLib/Model/WhatsNew.cs

@@ -672,16 +672,21 @@ namespace TINK.Model
 					new Version(3, 0, 356),
 					AppResources.ChangeLog3_0_231
 				},
-								{
+				{
 					new Version(3, 0, 360),
 					AppResources.ChangeLog_3_0_358_MK_SB,
 					new List<AppFlavor> { AppFlavor.MeinKonrad, AppFlavor.ShareeBike }
 				},
-												{
+				{
 					new Version(3, 0, 361),
 					AppResources.ChangeLog_3_0_361_MK_SB,
 					new List<AppFlavor> { AppFlavor.MeinKonrad, AppFlavor.ShareeBike }
 				},
+				{
+					new Version(3, 0, 362),
+					AppResources.ChangeLog_3_0_362_MK_SB,
+					new List<AppFlavor> { AppFlavor.MeinKonrad, AppFlavor.ShareeBike }
+				},
 		};
 
 		/// <summary> Manges the whats new information.</summary>