From faf68061f4ca520d73ce4bc2322e851ddaa2b359 Mon Sep 17 00:00:00 2001 From: Anja Date: Wed, 22 Feb 2023 14:03:35 +0100 Subject: [PATCH] Version 3.0.360 --- LastenradBayern/LastenradBayern.sln | 209 +---------- .../LastenradBayern.Android.csproj | 20 +- .../Properties/AndroidManifest.xml | 2 +- LastenradBayern/TINK.iOS/Info.plist | 4 +- .../TINK.iOS/LastenradBayern.iOS.csproj | 4 +- LastenradBayern/TINK/App.xaml.cs | 9 +- .../TINK/View/Bike/ILockItBike.xaml | 4 +- .../BikesAtStation/BikesAtStationPage.xaml.cs | 9 +- .../TINK/View/FindBike/FindBikePage.xaml.cs | 9 +- .../TINK/View/MyBikes/MyBikesPage.xaml.cs | 13 +- LockItBLE/LockItBLE.csproj | 2 +- .../BluetoothLock/BLE/LockItEventBased.cs | 9 +- .../BluetoothLock/BLE/LockItPolling.cs | 22 +- .../Resources.Designer.cs | 12 +- .../CouldntCloseBoldBlockedException.cs | 15 +- .../CouldntOpenBoldIsBlockedException.cs | 4 +- ...ouldntOpenBoldStatusIsUnknownException.cs} | 8 +- Meinkonrad/MeinKonrad.sln | 201 +---------- .../TINK.Android/Meinkonrad.Android.csproj | 20 +- .../Properties/AndroidManifest.xml | 2 +- Meinkonrad/TINK.iOS/Info.plist | 4 +- Meinkonrad/TINK.iOS/Meinkonrad.iOS.csproj | 4 +- Meinkonrad/TINK/App.xaml | 8 +- Meinkonrad/TINK/App.xaml.cs | 9 +- Meinkonrad/TINK/View/Bike/ILockItBike.xaml | 27 +- .../BikesAtStation/BikesAtStationPage.xaml | 159 ++++---- .../BikesAtStation/BikesAtStationPage.xaml.cs | 9 +- .../TINK/View/FindBike/FindBikePage.xaml | 42 ++- .../TINK/View/FindBike/FindBikePage.xaml.cs | 9 +- Meinkonrad/TINK/View/Map/MapPage.xaml | 53 +-- Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml | 42 ++- .../TINK/View/MyBikes/MyBikesPage.xaml.cs | 13 +- .../ShareeSharedGuiLib.projitems | 19 + .../View/HintForRefreshingPageView.xaml | 41 +++ .../View/HintForRefreshingPageView.xaml.cs | 23 ++ .../View/NotConnectedToNetView.xaml | 31 ++ .../View/NotConnectedToNetView.xaml.cs | 25 ++ .../ViewModel/NotConnectedToNetViewModel.cs | 54 +++ TINK/ShareeBike.sln | 209 +---------- .../Properties/AndroidManifest.xml | 2 +- TINK/TINK.Android/TINK.Android.csproj | 20 +- TINK/TINK.iOS/Info.plist | 4 +- TINK/TINK.iOS/TINK.iOS.csproj | 8 +- TINK/TINK/App.xaml | 9 +- TINK/TINK/App.xaml.cs | 9 +- TINK/TINK/View/Bike/ILockItBike.xaml | 340 ++++++++++-------- .../BikesAtStation/BikesAtStationPage.xaml | 115 +++--- .../BikesAtStation/BikesAtStationPage.xaml.cs | 9 +- TINK/TINK/View/FindBike/FindBikePage.xaml | 76 ++-- TINK/TINK/View/FindBike/FindBikePage.xaml.cs | 9 +- TINK/TINK/View/Map/MapPage.xaml | 54 +-- TINK/TINK/View/MyBikes/MyBikesPage.xaml | 48 ++- TINK/TINK/View/MyBikes/MyBikesPage.xaml.cs | 13 +- .../BluetoothLock/BikeInfoMutable.cs | 2 +- .../Bikes/BikeInfoNS/RentalDescription.cs | 12 +- .../Connector/Command/CommandLoggedIn.cs | 2 +- TINKLib/Model/Connector/Connector.cs | 21 +- TINKLib/Model/Connector/ConnectorCache.cs | 15 +- TINKLib/Model/Connector/ConnectorFactory.cs | 15 +- .../Model/Settings/JsonSettingsDictionary.cs | 66 ++-- TINKLib/Model/Settings/PollingParameters.cs | 14 +- TINKLib/Model/TinkApp.cs | 15 +- TINKLib/Model/WhatsNew.cs | 4 +- .../AppResources.Designer.cs | 38 +- .../AppResources.de.resx | 36 +- .../MultilingualResources/AppResources.resx | 24 +- TINKLib/MultilingualResources/TINKLib.de.xlf | 52 ++- TINKLib/Repository/CopriCallsHttps.cs | 48 ++- TINKLib/Repository/CopriCallsMemory.cs | 18 +- TINKLib/Repository/CopriCallsMonkeyStore.cs | 11 +- TINKLib/Repository/ICopriServer.cs | 3 - TINKLib/Repository/Request/IRequestBuilder.cs | 7 +- TINKLib/Repository/Request/RequestBuilder.cs | 14 +- .../Request/RequestBuilderHelper.cs | 13 + .../Request/RequestBuilderLoggedIn.cs | 31 +- .../Services/CopriApi/CopriProviderHttps.cs | 15 +- .../CopriApi/CopriProviderMonkeyStore.cs | 13 +- TINKLib/Services/CopriApi/Polling.cs | 24 +- TINKLib/TINKLib.csproj | 4 +- TINKLib/View/Themes/Konrad.xaml | 3 + TINKLib/View/Themes/ShareeBike.xaml | 3 + .../Bikes/Bike/BluetoothLock/BikeViewModel.cs | 34 +- .../RequestHandler/BookedClosed.cs | 10 +- .../RequestHandler/BookedUnknown.cs | 10 +- .../RequestHandler/DisposableDisconnected.cs | 10 +- .../RequestHandler/ReservedClosed.cs | 10 +- .../RequestHandler/ReservedDisconnected.cs | 10 +- .../RequestHandler/ReservedUnknown.cs | 12 +- .../Bikes/Bike/TariffDescriptionViewModel.cs | 15 +- TINKLib/ViewModel/Bikes/BikesViewModel.cs | 7 - .../BikesAtStationPageViewModel.cs | 21 +- .../Contact/SelectStationPageViewModel.cs | 8 +- .../FindBike/FindBikePageViewModel.cs | 39 +- TINKLib/ViewModel/Map/MapPageViewModel.cs | 39 +- .../ViewModel/MyBikes/MyBikesPageViewModel.cs | 29 +- .../Repository/CopriCallMemoryBase.cs | 10 +- TestFramework/Repository/ExceptionServer.cs | 4 +- .../CopriApi/CopriCallsCacheMemory001.cs | 3 +- .../BluetoothLock/BLE/TestLockItEventBased.cs | 7 +- TestLockItBLE/TestLockItBLE.csproj | 6 +- TestLockItShared/TestLockItShared.csproj | 4 +- TestSharee/TestSharee.csproj | 6 +- .../Bike/BluetoothLock/TestBikeInfoMutalbe.cs | 27 -- .../BikeInfoNS}/BC/TestBikeInfo.cs | 0 .../BikeInfoNS}/BC/TestBikeInfoMutable.cs | 0 .../BikeInfoNS}/BC/TestBikeMutable.cs | 0 .../BikeInfoNS}/BC/TestBikeSerializeJSON.cs | 0 .../BikeInfoNS}/BluetoothLock/TestBikeInfo.cs | 0 .../BluetoothLock/TestBikeInfoMutalbe.cs | 57 +++ .../BikeInfoNS}/BluetoothLock/TestLockInfo.cs | 0 .../BluetoothLock/TestLockInfoHelper.cs | 0 .../BluetoothLock/TestLockInfoMutable.cs | 0 .../BikeInfoNS}/CopriLock/TestBikeInfo.cs | 0 .../CopriLock/TestBikeInfoMutable.cs | 0 .../DriveNS/BatteryNS/TestBattery.cs | 0 .../BikeInfoNS}/DriveNS/TestDriveMutable.cs | 0 .../{Bike => Bikes/BikeInfoNS}/TestBike.cs | 0 .../BikeInfoNS}/TestBikeCollection.cs | 0 .../BikeInfoNS}/TestBikeCollectionMutable.cs | 0 .../TestBikeCollectionSerializeJSON.cs | 0 .../BikeInfoNS}/TestBikeExtension.cs | 0 .../Model/Connector/TestCachetimings.cs | 8 +- .../Model/Connector/TestCopriProviderHttps.cs | 16 +- .../Settings/TestJsonSettingsDictionary.cs | 48 +-- TestShareeLib/Model/TestTinkApp.cs | 6 +- TestShareeLib/Model/TestTinkAppLogin.cs | 6 +- .../Repository/Request/TestRequestBuilder.cs | 13 + .../Request/TestRequestBuilderHelper.cs | 18 + .../Request/TestRequestBuilderLoggedIn.cs | 76 +++- .../Services/CopriApi/TestPolling.cs | 105 ++++++ TestShareeLib/TestShareeLib.csproj | 25 +- .../RequestHandler/TestBookedClosed.cs | 64 ++-- .../RequestHandler/TestBookedDisconnected.cs | 22 +- .../RequestHandler/TestBookedOpen.cs | 66 ++-- .../RequestHandler/TestBookedUnknown.cs | 52 +-- .../TestDisposableDisconnected.cs | 22 +- .../RequestHandler/TestDisposableOpen.cs | 20 +- .../RequestHandler/TestReservedClosed.cs | 44 +-- .../TestReservedDisconnected.cs | 38 +- .../RequestHandler/TestReservedOpen.cs | 32 +- .../RequestHandler/TestReservedUnknown.cs | 50 +-- .../RequestHandler/TestBookedClosed.cs | 10 +- .../RequestHandler/TestBookedOpen.cs | 10 +- .../RequestHandler/TestDisposableClosed.cs | 24 +- .../RequestHandler/TestFeedbackPending.cs | 10 +- .../RequestHandler/TestReservedClosed.cs | 24 +- .../Bike/TestTariffDescriptionViewModel.cs | 76 +++- .../TestBikesAtStationPageViewModel.cs | 50 +-- .../TestShareeSharedGuiLib.csproj | 4 +- .../Connector/CopriCallsHttpReference.cs | 42 +-- .../Connector/TestConnectorCache.cs | 10 +- .../ObjectTests/Connector/TestFilter.cs | 6 +- .../Fixtures/ObjectTests/User/TestUser.cs | 4 +- .../Account/TestAccountPageViewModel.cs | 8 +- .../ViewModel/Map/TestMapPageViewModel.cs | 10 +- .../ViewModel/TestMyBikesPageViewModel.cs | 32 +- .../UseCases/ConnectedOffline/TestTinkApp.cs | 4 +- .../UseCases/SelectStation/TestTinkApp.cs | 4 +- .../Mocks/Connector/CopriCallsCacheMemory.cs | 3 +- TestTINKLib/TestTINKLib.csproj | 8 +- 160 files changed, 2114 insertions(+), 1932 deletions(-) rename LockItShared/Services/BluetoothLock/Exception/{CouldntOpenBoldWasBlockedException.cs => CouldntOpenBoldStatusIsUnknownException.cs} (52%) create mode 100644 ShareeSharedGuiLib/View/HintForRefreshingPageView.xaml create mode 100644 ShareeSharedGuiLib/View/HintForRefreshingPageView.xaml.cs create mode 100644 ShareeSharedGuiLib/View/NotConnectedToNetView.xaml create mode 100644 ShareeSharedGuiLib/View/NotConnectedToNetView.xaml.cs create mode 100644 ShareeSharedGuiLib/ViewModel/NotConnectedToNetViewModel.cs delete mode 100644 TestShareeLib/Model/Bike/BluetoothLock/TestBikeInfoMutalbe.cs rename TestShareeLib/Model/{Bike => Bikes/BikeInfoNS}/BC/TestBikeInfo.cs (100%) rename {TestTINKLib/Fixtures/ObjectTests/Bike => TestShareeLib/Model/Bikes/BikeInfoNS}/BC/TestBikeInfoMutable.cs (100%) rename TestShareeLib/Model/{Bike => Bikes/BikeInfoNS}/BC/TestBikeMutable.cs (100%) rename TestShareeLib/Model/{Bike => Bikes/BikeInfoNS}/BC/TestBikeSerializeJSON.cs (100%) rename TestShareeLib/Model/{Bike => Bikes/BikeInfoNS}/BluetoothLock/TestBikeInfo.cs (100%) create mode 100644 TestShareeLib/Model/Bikes/BikeInfoNS/BluetoothLock/TestBikeInfoMutalbe.cs rename TestShareeLib/Model/{Bike => Bikes/BikeInfoNS}/BluetoothLock/TestLockInfo.cs (100%) rename TestShareeLib/Model/{Bike => Bikes/BikeInfoNS}/BluetoothLock/TestLockInfoHelper.cs (100%) rename TestShareeLib/Model/{Bike => Bikes/BikeInfoNS}/BluetoothLock/TestLockInfoMutable.cs (100%) rename TestShareeLib/Model/{Bike => Bikes/BikeInfoNS}/CopriLock/TestBikeInfo.cs (100%) rename TestShareeLib/Model/{Bike => Bikes/BikeInfoNS}/CopriLock/TestBikeInfoMutable.cs (100%) rename TestShareeLib/Model/{BikeInfo => Bikes/BikeInfoNS}/DriveNS/BatteryNS/TestBattery.cs (100%) rename TestShareeLib/Model/{BikeInfo => Bikes/BikeInfoNS}/DriveNS/TestDriveMutable.cs (100%) rename TestShareeLib/Model/{Bike => Bikes/BikeInfoNS}/TestBike.cs (100%) rename TestShareeLib/Model/{Bike => Bikes/BikeInfoNS}/TestBikeCollection.cs (100%) rename TestShareeLib/Model/{Bike => Bikes/BikeInfoNS}/TestBikeCollectionMutable.cs (100%) rename TestShareeLib/Model/{Bike => Bikes/BikeInfoNS}/TestBikeCollectionSerializeJSON.cs (100%) rename TestShareeLib/Model/{Bike => Bikes/BikeInfoNS}/TestBikeExtension.cs (100%) create mode 100644 TestShareeLib/Services/CopriApi/TestPolling.cs diff --git a/LastenradBayern/LastenradBayern.sln b/LastenradBayern/LastenradBayern.sln index 938e6ab..21bc332 100644 --- a/LastenradBayern/LastenradBayern.sln +++ b/LastenradBayern/LastenradBayern.sln @@ -11,25 +11,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LockItShared", "..\LockItSh EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LockItBLE", "..\LockItBLE\LockItBLE.csproj", "{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestLockItShared", "..\TestLockItShared\TestLockItShared.csproj", "{7E25F58E-62E3-48D7-8115-E33DA67C511E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestShareeLib", "..\TestShareeLib\TestShareeLib.csproj", "{38F340AD-EC12-4BB2-8633-AC5B55C32B77}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestLockItBLE", "..\TestLockItBLE\TestLockItBLE.csproj", "{2581E9AD-4F56-431A-AB87-1B6D80D546AA}" -EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "LastenradBayern", "TINK\LastenradBayern.shproj", "{8D4F2CDD-32C6-4AA1-A9E1-7B27BDCEB3A5}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LastenradBayern.iOS", "TINK.iOS\LastenradBayern.iOS.csproj", "{3A0EF953-1501-4155-B0A0-265EB5FB2975}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestFramework", "..\TestFramework\TestFramework.csproj", "{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestSharee", "..\TestSharee\TestSharee.csproj", "{9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}" -EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - TINK\LastenradBayern.projitems*{3a0ef953-1501-4155-b0a0-265eb5fb2975}*SharedItemsImports = 4 - TINK\LastenradBayern.projitems*{8d4f2cdd-32c6-4aa1-a9e1-7b27bdceb3a5}*SharedItemsImports = 13 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Ad-Hoc|Any CPU = Ad-Hoc|Any CPU Ad-Hoc|ARM = Ad-Hoc|ARM @@ -249,150 +237,6 @@ Global {BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Release|x64.Build.0 = Release|Any CPU {BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Release|x86.ActiveCfg = Release|Any CPU {BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Release|x86.Build.0 = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Ad-Hoc|ARM.Build.0 = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Ad-Hoc|x64.Build.0 = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Ad-Hoc|x86.Build.0 = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.AppStore|Any CPU.ActiveCfg = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.AppStore|Any CPU.Build.0 = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.AppStore|ARM.ActiveCfg = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.AppStore|ARM.Build.0 = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.AppStore|iPhone.ActiveCfg = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.AppStore|iPhone.Build.0 = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.AppStore|x64.ActiveCfg = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.AppStore|x64.Build.0 = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.AppStore|x86.ActiveCfg = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.AppStore|x86.Build.0 = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Debug|ARM.ActiveCfg = Debug|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Debug|ARM.Build.0 = Debug|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Debug|iPhone.Build.0 = Debug|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Debug|x64.ActiveCfg = Debug|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Debug|x64.Build.0 = Debug|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Debug|x86.ActiveCfg = Debug|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Debug|x86.Build.0 = Debug|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Release|Any CPU.Build.0 = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Release|ARM.ActiveCfg = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Release|ARM.Build.0 = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Release|iPhone.ActiveCfg = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Release|iPhone.Build.0 = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Release|x64.ActiveCfg = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Release|x64.Build.0 = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Release|x86.ActiveCfg = Release|Any CPU - {7E25F58E-62E3-48D7-8115-E33DA67C511E}.Release|x86.Build.0 = Release|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Ad-Hoc|x64.Build.0 = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Ad-Hoc|x86.Build.0 = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.AppStore|Any CPU.Build.0 = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.AppStore|ARM.ActiveCfg = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.AppStore|ARM.Build.0 = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.AppStore|iPhone.ActiveCfg = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.AppStore|iPhone.Build.0 = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.AppStore|x64.ActiveCfg = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.AppStore|x64.Build.0 = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.AppStore|x86.ActiveCfg = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.AppStore|x86.Build.0 = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Debug|Any CPU.Build.0 = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Debug|ARM.ActiveCfg = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Debug|ARM.Build.0 = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Debug|iPhone.Build.0 = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Debug|x64.ActiveCfg = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Debug|x64.Build.0 = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Debug|x86.ActiveCfg = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Debug|x86.Build.0 = Debug|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Release|Any CPU.ActiveCfg = Release|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Release|Any CPU.Build.0 = Release|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Release|ARM.ActiveCfg = Release|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Release|ARM.Build.0 = Release|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Release|iPhone.ActiveCfg = Release|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Release|iPhone.Build.0 = Release|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Release|x64.ActiveCfg = Release|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Release|x64.Build.0 = Release|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Release|x86.ActiveCfg = Release|Any CPU - {38F340AD-EC12-4BB2-8633-AC5B55C32B77}.Release|x86.Build.0 = Release|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Ad-Hoc|x64.Build.0 = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Ad-Hoc|x86.Build.0 = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.AppStore|Any CPU.Build.0 = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.AppStore|ARM.ActiveCfg = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.AppStore|ARM.Build.0 = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.AppStore|iPhone.ActiveCfg = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.AppStore|iPhone.Build.0 = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.AppStore|x64.ActiveCfg = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.AppStore|x64.Build.0 = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.AppStore|x86.ActiveCfg = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.AppStore|x86.Build.0 = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Debug|ARM.ActiveCfg = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Debug|ARM.Build.0 = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Debug|iPhone.Build.0 = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Debug|x64.ActiveCfg = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Debug|x64.Build.0 = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Debug|x86.ActiveCfg = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Debug|x86.Build.0 = Debug|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Release|Any CPU.Build.0 = Release|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Release|ARM.ActiveCfg = Release|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Release|ARM.Build.0 = Release|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Release|iPhone.ActiveCfg = Release|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Release|iPhone.Build.0 = Release|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Release|x64.ActiveCfg = Release|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Release|x64.Build.0 = Release|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Release|x86.ActiveCfg = Release|Any CPU - {2581E9AD-4F56-431A-AB87-1B6D80D546AA}.Release|x86.Build.0 = Release|Any CPU {3A0EF953-1501-4155-B0A0-265EB5FB2975}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhoneSimulator {3A0EF953-1501-4155-B0A0-265EB5FB2975}.Ad-Hoc|ARM.ActiveCfg = Ad-Hoc|iPhoneSimulator {3A0EF953-1501-4155-B0A0-265EB5FB2975}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone @@ -473,54 +317,6 @@ Global {9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Release|x64.Build.0 = Release|Any CPU {9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Release|x86.ActiveCfg = Release|Any CPU {9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Release|x86.Build.0 = Release|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Ad-Hoc|x64.Build.0 = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Ad-Hoc|x86.Build.0 = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.AppStore|Any CPU.Build.0 = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.AppStore|ARM.ActiveCfg = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.AppStore|ARM.Build.0 = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.AppStore|iPhone.ActiveCfg = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.AppStore|iPhone.Build.0 = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.AppStore|x64.ActiveCfg = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.AppStore|x64.Build.0 = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.AppStore|x86.ActiveCfg = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.AppStore|x86.Build.0 = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Debug|ARM.ActiveCfg = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Debug|ARM.Build.0 = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Debug|iPhone.Build.0 = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Debug|x64.ActiveCfg = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Debug|x64.Build.0 = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Debug|x86.ActiveCfg = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Debug|x86.Build.0 = Debug|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Release|Any CPU.Build.0 = Release|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Release|ARM.ActiveCfg = Release|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Release|ARM.Build.0 = Release|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Release|iPhone.ActiveCfg = Release|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Release|iPhone.Build.0 = Release|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Release|x64.ActiveCfg = Release|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Release|x64.Build.0 = Release|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Release|x86.ActiveCfg = Release|Any CPU - {9C80A989-4BBB-4F00-AB5D-45B1F99D5A08}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -528,6 +324,11 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C6529CD7-C3F7-4E80-89B5-002E2B8E3EB5} EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + TINK\LastenradBayern.projitems*{3a0ef953-1501-4155-b0a0-265eb5fb2975}*SharedItemsImports = 4 + ..\ShareeSharedGuiLib\ShareeSharedGuiLib.projitems*{3a0ef953-1501-4155-b0a0-265eb5fb2975}*SharedItemsImports = 4 + TINK\LastenradBayern.projitems*{8d4f2cdd-32c6-4aa1-a9e1-7b27bdceb3a5}*SharedItemsImports = 13 + EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution Policies = $0 $0.DotNetNamingPolicy = $1 diff --git a/LastenradBayern/TINK.Android/LastenradBayern.Android.csproj b/LastenradBayern/TINK.Android/LastenradBayern.Android.csproj index d7106b1..2d558b7 100644 --- a/LastenradBayern/TINK.Android/LastenradBayern.Android.csproj +++ b/LastenradBayern/TINK.Android/LastenradBayern.Android.csproj @@ -57,7 +57,7 @@ prompt 4 False - SdkOnly + None false false false @@ -176,16 +176,16 @@ - 1.9.0.1 + 1.9.0.2 - 1.3.1.1 + 1.3.1.2 - 1.0.0.15 + 1.0.0.16 - 1.2.1.8 + 1.2.1.9 @@ -193,7 +193,7 @@ 2.0.5 - 1.7.4 + 1.7.5 @@ -203,10 +203,10 @@ 5.0.0 - - - - + + + + diff --git a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml index 053158e..975753a 100644 --- a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml +++ b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + diff --git a/LastenradBayern/TINK.iOS/Info.plist b/LastenradBayern/TINK.iOS/Info.plist index 28521b8..b4cc507 100644 --- a/LastenradBayern/TINK.iOS/Info.plist +++ b/LastenradBayern/TINK.iOS/Info.plist @@ -56,8 +56,8 @@ CFBundleDisplayName LastenradBayern CFBundleVersion - 357 + 360 CFBundleShortVersionString - 3.0.357 + 3.0.360 diff --git a/LastenradBayern/TINK.iOS/LastenradBayern.iOS.csproj b/LastenradBayern/TINK.iOS/LastenradBayern.iOS.csproj index fb56822..8315c9d 100644 --- a/LastenradBayern/TINK.iOS/LastenradBayern.iOS.csproj +++ b/LastenradBayern/TINK.iOS/LastenradBayern.iOS.csproj @@ -25,7 +25,7 @@ 4 false x86_64 - None + SdkOnly true VS: com.TeilRad.LastenradBayern Development Apple Development: Oliver Hauff (8SZ7J9P24J) @@ -200,7 +200,7 @@ 2.0.5 - 1.7.4 + 1.7.5 5.0.0 diff --git a/LastenradBayern/TINK/App.xaml.cs b/LastenradBayern/TINK/App.xaml.cs index a6b270b..4736382 100644 --- a/LastenradBayern/TINK/App.xaml.cs +++ b/LastenradBayern/TINK/App.xaml.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Globalization; using System.Linq; @@ -126,6 +126,8 @@ namespace TINK Log.Debug("Get auth cookie."); IStore store = null; + // Version of last version used or null for initial installation. + // Used for updating purposes. var lastVersion = JsonSettingsDictionary.GetAppVersion(settingsJSON); if (new Version(3, 0, 290) <= lastVersion) { @@ -139,9 +141,11 @@ namespace TINK Barrel.ApplicationId = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name; + // Get main thread synchronization context to be able to update gui elements from worker threads. var context = SynchronizationContext.Current; var appInfoService = DependencyService.Get(); + var smartDevice = DependencyService.Get(); const string MERCHANTID = "0000000000"; @@ -158,13 +162,14 @@ namespace TINK CultureInfo.CurrentUICulture.TwoLetterISOLanguageName, sessionCookie, mail, + smartDevice, expiresAfter), merchantId: MERCHANTID, bluetoothService: BluetoothService, /* locksService */ locationPermissionsService: PermissionsService, locationServicesContainer: LocationServicesContainer, locksService: null, - device: DependencyService.Get(), + device: smartDevice, specialFolder: specialFolders, cipher: new Cipher(), new TINK.Services.ThemeNS.Theme(Application.Current.Resources.MergedDictionaries), diff --git a/LastenradBayern/TINK/View/Bike/ILockItBike.xaml b/LastenradBayern/TINK/View/Bike/ILockItBike.xaml index b882ec6..8f433c8 100644 --- a/LastenradBayern/TINK/View/Bike/ILockItBike.xaml +++ b/LastenradBayern/TINK/View/Bike/ILockItBike.xaml @@ -199,8 +199,8 @@ Grid.Row="13" Grid.ColumnSpan="2"/>