From 59804101824aadc076fe929dca05cfe8d973e7d0 Mon Sep 17 00:00:00 2001
From: Oliver Hauff <ochauu@hotmail.com>
Date: Tue, 27 Dec 2022 21:08:09 +0100
Subject: [PATCH] Version 3.0.356

---
 .../Properties/AndroidManifest.xml            |   2 +-
 LastenradBayern/TINK.iOS/Info.plist           |   5 +-
 .../TINK/View/Account/AccountPage.xaml        |  14 +-
 .../TINK/View/Bike/ILockItBike.xaml           |  11 +-
 .../TINK/View/Contact/ContactPage.xaml        |  16 +--
 .../View/CopriWebView/ManageAccountPage.xaml  |  16 +--
 .../CopriWebView/PasswordForgottenPage.xaml   |  16 +--
 .../TINK/View/CopriWebView/RegisterPage.xaml  |  16 +--
 .../TINK/View/Login/LoginPage.xaml            | 100 +-------------
 .../Properties/AndroidManifest.xml            |   2 +-
 Meinkonrad/TINK.iOS/Info.plist                |   5 +-
 .../Properties/AndroidManifest.xml            |   2 +-
 TINK/TINK.iOS/Info.plist                      |   5 +-
 TINKLib/Model/Connector/Command/Command.cs    |   6 +-
 .../Connector/Command/CommandLoggedIn.cs      |   6 +-
 TINKLib/Model/Connector/Command/ICommand.cs   |  15 +-
 TINKLib/Model/WhatsNew.cs                     |  10 ++
 .../AppResources.Designer.cs                  |   9 ++
 .../AppResources.de.resx                      |   3 +
 .../MultilingualResources/AppResources.resx   |   3 +
 TINKLib/MultilingualResources/TINKLib.de.xlf  |   4 +
 TINKLib/Repository/CopriCallsHttps.cs         |  11 +-
 TINKLib/Repository/CopriCallsMemory.cs        |   3 +-
 TINKLib/Repository/CopriCallsMonkeyStore.cs   |   3 +-
 TINKLib/Repository/ICopriServer.cs            |   9 +-
 TINKLib/Repository/Request/IRequestBuilder.cs |   4 +-
 TINKLib/Repository/Request/RequestBuilder.cs  |   3 +-
 .../Request/RequestBuilderHelper.cs           |  19 ++-
 .../Request/RequestBuilderLoggedIn.cs         |  13 +-
 .../Services/CopriApi/CopriProviderHttps.cs   |   7 +-
 .../CopriApi/CopriProviderMonkeyStore.cs      |   5 +-
 .../RequestHandler/DisposableDisconnected.cs  |   2 +-
 .../RequestHandler/DisposableOpen.cs          |   2 +-
 .../RequestHandler/ReservedClosed.cs          |   2 +-
 .../RequestHandler/ReservedDisconnected.cs    |   2 +-
 .../RequestHandler/ReservedOpen.cs            |   2 +-
 TINKLib/ViewModel/Map/MapPageViewModel.cs     | 129 ------------------
 .../Repository/CopriCallMemoryBase.cs         |   3 +-
 TestFramework/Repository/ExceptionServer.cs   |   3 +-
 .../CopriApi/CopriCallsCacheMemory001.cs      |   3 +-
 .../Request/TestRequestBuilderHelper.cs       |  36 +++++
 .../Request/TestRequestBuilderLoggedIn.cs     |  24 +++-
 .../TestDisposableDisconnected.cs             |   2 +-
 .../RequestHandler/TestDisposableOpen.cs      |  10 +-
 .../RequestHandler/TestReservedClosed.cs      |  26 ++--
 .../TestReservedDisconnected.cs               |   2 +-
 .../RequestHandler/TestReservedOpen.cs        |  10 +-
 .../Mocks/Connector/CopriCallsCacheMemory.cs  |   3 +-
 48 files changed, 242 insertions(+), 362 deletions(-)
 create mode 100644 TestShareeLib/Repository/Request/TestRequestBuilderHelper.cs

diff --git a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
index 6487f48..471f80b 100644
--- a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
+++ b/LastenradBayern/TINK.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:installLocation="internalOnly" package="com.TeilRad.LastenradBayern" android:versionName="3.0.354" android:versionCode="354">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.LastenradBayern" android:versionName="3.0.356" android:versionCode="356">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="31" />
 	<!-- Google Maps related permissions -->
 	<!-- Permission to receive remote notifications from Google Play Services -->
diff --git a/LastenradBayern/TINK.iOS/Info.plist b/LastenradBayern/TINK.iOS/Info.plist
index 2c61032..654604a 100644
--- a/LastenradBayern/TINK.iOS/Info.plist
+++ b/LastenradBayern/TINK.iOS/Info.plist
@@ -5,6 +5,7 @@
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>bluetooth-peripheral</string>
+		<string>bluetooth-central</string>
 	</array>
 	<key>UIUserInterfaceStyle</key>
 	<string>Light</string>
@@ -55,8 +56,8 @@
 	<key>CFBundleDisplayName</key>
 	<string>LastenradBayern</string>
 	<key>CFBundleVersion</key>
-	<string>354</string>
+	<string>356</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.354</string>
+	<string>3.0.356</string>
 </dict>
 </plist>
diff --git a/LastenradBayern/TINK/View/Account/AccountPage.xaml b/LastenradBayern/TINK/View/Account/AccountPage.xaml
index 9cf00b6..324cfc8 100644
--- a/LastenradBayern/TINK/View/Account/AccountPage.xaml
+++ b/LastenradBayern/TINK/View/Account/AccountPage.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
             xmlns:d="http://xamarin.com/schemas/2014/forms/design"
@@ -23,19 +23,13 @@
                         <Button Text="{x:Static resources:AppResources.MessageAccountPageManagePersonalData}" 
                                 Command="{Binding OnManageAccount}"
                                 IsEnabled="{Binding IsLogoutPossible}"/>
-                        <Button
+						<Button
                                 Text="{x:Static resources:AppResources.MessageAccountPageManageLogout}" 
                                 Command="{Binding OnLogoutRequest}"
                                 IsEnabled="{Binding IsLogoutPossible}"/>
-                        <!--Possible SecondaryButton Style-->
-                        <!--<Button
-                                Style="{StaticResource SecondaryButton}"
-                                Text="{x:Static resources:AppResources.MessageAccountPageManageLogout}" 
-                                Command="{Binding OnLogoutRequest}"
-                                IsEnabled="{Binding IsLogoutPossible}"/>-->
-                    </StackLayout>
+					</StackLayout>
                 </Frame>
             </StackLayout>
         </Frame>
     </ContentPage.Content>
-</ContentPage>
\ No newline at end of file
+</ContentPage>
diff --git a/LastenradBayern/TINK/View/Bike/ILockItBike.xaml b/LastenradBayern/TINK/View/Bike/ILockItBike.xaml
index c7146d4..b882ec6 100644
--- a/LastenradBayern/TINK/View/Bike/ILockItBike.xaml
+++ b/LastenradBayern/TINK/View/Bike/ILockItBike.xaml
@@ -46,19 +46,12 @@
                 IsEnabled="{Binding IsIdle}"
                 Command="{Binding OnButtonClicked}"/>
             <!-- Button for Find Lock / Open & Rent / Close -->
-            <Button 
+			<Button 
                 Text="{Binding LockitButtonText}"
                 IsVisible="{Binding IsLockitButtonVisible}"
                 IsEnabled="{Binding IsIdle}"
                 Command="{Binding OnLockitButtonClicked}"/>
-            <!--Possible SecondaryButton Style-->
-            <!--<Button 
-                Style="{StaticResource SecondaryButton}"
-                Text="{Binding LockitButtonText}"
-                IsVisible="{Binding IsLockitButtonVisible}"
-                IsEnabled="{Binding IsIdle}"
-                Command="{Binding OnLockitButtonClicked}"/>-->
-            <!-- Copri Lock Label -->
+			<!-- Copri Lock Label -->
             <Label 
                 Text="{x:Static resources:AppResources.StatusTextCopriLock}"
                 FontSize="Small"
diff --git a/LastenradBayern/TINK/View/Contact/ContactPage.xaml b/LastenradBayern/TINK/View/Contact/ContactPage.xaml
index eca477a..c3abaeb 100644
--- a/LastenradBayern/TINK/View/Contact/ContactPage.xaml
+++ b/LastenradBayern/TINK/View/Contact/ContactPage.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
             xmlns:conv="clr-namespace:TINK.View"
             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
@@ -55,21 +55,13 @@
                             <Label 
                                 IsVisible="{Binding PhoneNumberText, Converter={StaticResource StringNotNullOrEmpty_Converter}}"
                                 FormattedText="{Binding PhoneContactText}"/>
-                            <Button
+							<Button
                                 x:Name="PhoneNumberButton"
                                 IsVisible="{Binding PhoneNumberText, Converter={StaticResource StringNotNullOrEmpty_Converter}}"
                                 Text="{Binding PhoneNumberText}"
                                 IsEnabled="{Binding IsDoPhoncallAvailable}"
                                 Command="{Binding OnPhoneRequest}"/>
-                            <!--Possible SecondaryButton Style-->
-                            <!--<Button
-                                Style="{StaticResource SecondaryButton}"
-                                x:Name="PhoneNumberButton"
-                                IsVisible="{Binding PhoneNumberText, Converter={StaticResource StringNotNullOrEmpty_Converter}}"
-                                Text="{Binding PhoneNumberText}"
-                                IsEnabled="{Binding IsDoPhoncallAvailable}"
-                                Command="{Binding OnPhoneRequest}"/>-->
-                        </StackLayout>
+						</StackLayout>
                     </Frame>
                     <Frame>
                         <StackLayout>
@@ -96,4 +88,4 @@
             </Frame>
         </ScrollView>
     </ContentPage.Content>
-</ContentPage>
\ No newline at end of file
+</ContentPage>
diff --git a/LastenradBayern/TINK/View/CopriWebView/ManageAccountPage.xaml b/LastenradBayern/TINK/View/CopriWebView/ManageAccountPage.xaml
index 9fe1f86..5dcfa87 100644
--- a/LastenradBayern/TINK/View/CopriWebView/ManageAccountPage.xaml
+++ b/LastenradBayern/TINK/View/CopriWebView/ManageAccountPage.xaml
@@ -3,17 +3,13 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib" 
              x:Class="TINK.View.CopriWebView.ManageAccountPage">
-    <Shell.TitleView>
-        <Grid ColumnDefinitions="Auto, 1*">
-            <Label Style="{StaticResource Label-Navbar}"
+	<Shell.TitleView>
+		<Grid ColumnDefinitions="Auto, 1*">
+			<Label Style="{StaticResource Label-Navbar}"
                    Text="{x:Static resources:AppResources.MessageAccountPageManagePersonalData}"/>
-        </Grid>
-    </Shell.TitleView>
-    <!-- Cross as BackButton -->
-    <!--<Shell.BackButtonBehavior>
-        <BackButtonBehavior IconOverride="{FontImage FontFamily=FA-S, Glyph={StaticResource IconClose}, Color=White, Size=16}" />
-    </Shell.BackButtonBehavior>-->
-    <ContentPage.Content>
+		</Grid>
+	</Shell.TitleView>
+	<ContentPage.Content>
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="*"/>
diff --git a/LastenradBayern/TINK/View/CopriWebView/PasswordForgottenPage.xaml b/LastenradBayern/TINK/View/CopriWebView/PasswordForgottenPage.xaml
index 7c54cf5..19ee3a8 100644
--- a/LastenradBayern/TINK/View/CopriWebView/PasswordForgottenPage.xaml
+++ b/LastenradBayern/TINK/View/CopriWebView/PasswordForgottenPage.xaml
@@ -3,17 +3,13 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib" 
              x:Class="TINK.View.CopriWebView.PasswordForgottenPage">
-    <Shell.TitleView>
-        <Grid ColumnDefinitions="Auto, 1*">
-            <Label Style="{StaticResource Label-Navbar}"
+	<Shell.TitleView>
+		<Grid ColumnDefinitions="Auto, 1*">
+			<Label Style="{StaticResource Label-Navbar}"
                    Text="{x:Static resources:AppResources.ActionLoginPasswordForgotten}"/>
-        </Grid>
-    </Shell.TitleView>
-    <!-- Cross as BackButton -->
-    <!--<Shell.BackButtonBehavior>
-        <BackButtonBehavior IconOverride="{FontImage FontFamily=FA-S, Glyph={StaticResource IconClose}, Color=White, Size=16}" />
-    </Shell.BackButtonBehavior>-->
-    <ContentPage.Content>
+		</Grid>
+	</Shell.TitleView>
+	<ContentPage.Content>
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="*"/>
diff --git a/LastenradBayern/TINK/View/CopriWebView/RegisterPage.xaml b/LastenradBayern/TINK/View/CopriWebView/RegisterPage.xaml
index 3b39d6e..b9b2d35 100644
--- a/LastenradBayern/TINK/View/CopriWebView/RegisterPage.xaml
+++ b/LastenradBayern/TINK/View/CopriWebView/RegisterPage.xaml
@@ -3,17 +3,13 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib" 
              x:Class="TINK.View.CopriWebView.RegisterPage">
-    <Shell.TitleView>
-        <Grid ColumnDefinitions="Auto, 1*">
-            <Label Style="{StaticResource Label-Navbar}"
+	<Shell.TitleView>
+		<Grid ColumnDefinitions="Auto, 1*">
+			<Label Style="{StaticResource Label-Navbar}"
                    Text="{x:Static resources:AppResources.ActionLoginRegister}"/>
-        </Grid>
-    </Shell.TitleView>
-    <!-- Cross as BackButton -->
-    <!--<Shell.BackButtonBehavior>
-        <BackButtonBehavior IconOverride="{FontImage FontFamily=FA-S, Glyph={StaticResource IconClose}, Color=White, Size=16}" />
-    </Shell.BackButtonBehavior>-->
-    <ContentPage.Content>
+		</Grid>
+	</Shell.TitleView>
+	<ContentPage.Content>
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="*"/>
diff --git a/LastenradBayern/TINK/View/Login/LoginPage.xaml b/LastenradBayern/TINK/View/Login/LoginPage.xaml
index 532b2e2..72cf9ea 100644
--- a/LastenradBayern/TINK/View/Login/LoginPage.xaml
+++ b/LastenradBayern/TINK/View/Login/LoginPage.xaml
@@ -58,103 +58,5 @@
             </StackLayout>
         </Frame>
     </ScrollView>
-    
-    <!-- Possible New Design -->
-    <!--<ScrollView>
-        <Frame>
-            <StackLayout x:Name="LoginPageView">
-                <Frame>
-                    <StackLayout>
-                        <Label Text="{x:Static resources:AppResources.MarkingLoginEmailAddressLabel}"
-                               Margin="0,0,0,-10">
-                            <Label.Triggers>
-                                <DataTrigger
-                                        TargetType="Label"
-                                        Binding="{Binding Source={x:Reference EMailEntry}, Path=Text, TargetNullValue=''}"
-                                        Value="">
-                                    <Setter Property="IsVisible" Value="False" />
-                                </DataTrigger>
-                            </Label.Triggers>
-                        </Label>
-                        <Entry 
-                                Placeholder="{x:Static resources:AppResources.MarkingLoginEmailAddressPlaceholder}" 
-                                Keyboard="Email" 
-                                AutomationId="mail_address_text"
-                                x:Name="EMailEntry" 
-                                Text="{Binding MailAddress}"
-                                IsEnabled="{Binding IsLoggedOut}"/>
-                        <Label Text="{x:Static resources:AppResources.MarkingLoginPasswordPlaceholder}"
-                               Margin="0,0,0,-10">
-                            <Label.Triggers>
-                                <DataTrigger
-                                        TargetType="Label"
-                                        Binding="{Binding Source={x:Reference PasswordEntry}, Path=Text, TargetNullValue=''}"
-                                        Value="">
-                                    <Setter Property="IsVisible" Value="False" />
-                                </DataTrigger>
-                            </Label.Triggers>
-                        </Label>
-                        <Entry Placeholder="{x:Static resources:AppResources.MarkingLoginPasswordPlaceholder}" 
-                                AutomationId="password_text"
-                                IsPassword="true" 
-                                x:Name="PasswordEntry" 
-                                Text="{Binding Password}"
-                                IsEnabled="{Binding IsLoggedOut}"/>
-                        <Label Text="{x:Static resources:AppResources.MarkingLoginPasswordLabel}"
-                               HorizontalOptions="End"
-                               Margin="0,-10,0,5"
-                               FontSize="Small">
-                            <Label.Triggers>
-                                <DataTrigger
-                                        TargetType="Label"
-                                        Binding="{Binding Source={x:Reference PasswordEntry}, Path=Text, TargetNullValue=''}"
-                                        Value="">
-                                    <Setter Property="IsVisible" Value="False" />
-                                </DataTrigger>
-                            </Label.Triggers>
-                        </Label>
-                        <Button 
-                            Text="{x:Static resources:AppResources.ActionLoginLogin}"
-                            AutomationId="login_button"
-                            Command="{Binding OnLoginRequest}"
-                            IsEnabled="{Binding IsLoginRequestAllowed}">
-                        </Button>
-                        <Button 
-                            Text="{x:Static resources:AppResources.ActionLoginRegister}"
-                            AutomationId="register_button"
-                            Command="{Binding OnRegisterRequest}"
-                            IsVisible="{Binding IsWebViewElementsVisible}">
-                        </Button>
-                        <Button 
-                            Style="{StaticResource SecondaryButton}"
-                            Text="{x:Static resources:AppResources.ActionLoginRegister}"
-                            AutomationId="register_button"
-                            Command="{Binding OnRegisterRequest}"
-                            IsVisible="{Binding IsWebViewElementsVisible}">
-                        </Button>
-                        <Label 
-                            IsVisible="{Binding IsRegisterTargetsInfoVisible}"
-                            FormattedText="{Binding RegisterTargetsInfo}">
-                        </Label>
-                        <Button 
-                            Text="{x:Static resources:AppResources.ActionLoginPasswordForgotten}"
-                            AutomationId="password_forgotten_button"
-                            Command="{Binding OnPasswordForgottonRequest}">
-                        </Button>
-                        <Label 
-                            Margin="0,10,0,0"
-                            TextType="Html"
-                            AutomationId="password_forgotten_button"
-                            HorizontalOptions="Center"
-                            TextColor="{DynamicResource primary-back-title-color}"
-                            Text="{x:Static resources:AppResources.ActionLoginPasswordForgotten}">
-                            <Label.GestureRecognizers>
-                                <TapGestureRecognizer Command="{Binding OnPasswordForgottonRequest}"/>
-                            </Label.GestureRecognizers>
-                        </Label>
-                    </StackLayout>
-                </Frame>
-            </StackLayout>
-        </Frame>
-    </ScrollView>-->
+
 </ContentPage>
diff --git a/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml b/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
index bbadc8b..88b40a1 100644
--- a/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
+++ b/Meinkonrad/TINK.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:installLocation="internalOnly" package="com.TeilRad.Meinkonrad" android:versionName="3.0.354" android:versionCode="354">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.Meinkonrad" android:versionName="3.0.356" android:versionCode="356">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="31" />
 	<!-- Google Maps related permissions -->
 	<!-- Permission to receive remote notifications from Google Play Services -->
diff --git a/Meinkonrad/TINK.iOS/Info.plist b/Meinkonrad/TINK.iOS/Info.plist
index 4c91c1d..c39ef41 100644
--- a/Meinkonrad/TINK.iOS/Info.plist
+++ b/Meinkonrad/TINK.iOS/Info.plist
@@ -5,6 +5,7 @@
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>bluetooth-peripheral</string>
+		<string>bluetooth-central</string>
 	</array>
 	<key>UIUserInterfaceStyle</key>
 	<string>Light</string>
@@ -55,8 +56,8 @@
 	<key>CFBundleDisplayName</key>
 	<string>Mein konrad</string>
 	<key>CFBundleVersion</key>
-	<string>354</string>
+	<string>356</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.354</string>
+	<string>3.0.356</string>
 </dict>
 </plist>
diff --git a/TINK/TINK.Android/Properties/AndroidManifest.xml b/TINK/TINK.Android/Properties/AndroidManifest.xml
index 94f420a..0ae51e7 100644
--- a/TINK/TINK.Android/Properties/AndroidManifest.xml
+++ b/TINK/TINK.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:installLocation="internalOnly" package="com.hauffware.sharee" android:versionName="3.0.354" android:versionCode="354">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.hauffware.sharee" android:versionName="3.0.356" android:versionCode="356">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="31" />
 	<!-- Google Maps related permissions -->
 	<!-- Permission to receive remote notifications from Google Play Services -->
diff --git a/TINK/TINK.iOS/Info.plist b/TINK/TINK.iOS/Info.plist
index 3c5d40a..ffb1805 100644
--- a/TINK/TINK.iOS/Info.plist
+++ b/TINK/TINK.iOS/Info.plist
@@ -5,6 +5,7 @@
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>bluetooth-peripheral</string>
+		<string>bluetooth-central</string>
 	</array>
 	<key>UIUserInterfaceStyle</key>
 	<string>Light</string>
@@ -55,8 +56,8 @@
 	<key>CFBundleDisplayName</key>
 	<string>sharee.bike</string>
 	<key>CFBundleVersion</key>
-	<string>354</string>
+	<string>356</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.354</string>
+	<string>3.0.356</string>
 </dict>
 </plist>
diff --git a/TINKLib/Model/Connector/Command/Command.cs b/TINKLib/Model/Connector/Command/Command.cs
index db9a38a..5876224 100644
--- a/TINKLib/Model/Connector/Command/Command.cs
+++ b/TINKLib/Model/Connector/Command/Command.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Serilog;
@@ -127,7 +127,7 @@ namespace TINK.Model.Connector
 			await Task.CompletedTask;
 		}
 
-		public async Task DoBook(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike)
+		public async Task DoBookAsync(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike, LockingAction? nextAction = null)
 		{
 			Log.ForContext<Command>().Error("Unexpected booking request detected. No user logged in.");
 			await Task.CompletedTask;
@@ -184,4 +184,4 @@ namespace TINK.Model.Connector
 		public Task CloseLockAsync(Bikes.BikeInfoNS.CopriLock.IBikeInfoMutable bike)
 			=> throw new NotImplementedException();
 	}
-}
\ No newline at end of file
+}
diff --git a/TINKLib/Model/Connector/Command/CommandLoggedIn.cs b/TINKLib/Model/Connector/Command/CommandLoggedIn.cs
index 138a966..1a13eca 100644
--- a/TINKLib/Model/Connector/Command/CommandLoggedIn.cs
+++ b/TINKLib/Model/Connector/Command/CommandLoggedIn.cs
@@ -238,7 +238,8 @@ namespace TINK.Model.Connector
 
 		/// <summary> Request to book a bike. </summary>
 		/// <param name="bike">Bike to book.</param>
-		public async Task DoBook(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike)
+		/// <param name="nextAction">If not null next locking action which is performed after booking.</param>
+		public async Task DoBookAsync(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike, LockingAction? nextAction = null)
 		{
 			if (bike == null)
 			{
@@ -251,10 +252,11 @@ namespace TINK.Model.Connector
 			double batteryPercentage = btBike != null ? btBike.LockInfo.BatteryPercentage : double.NaN;
 
 			response = (await CopriServer.DoBookAsync(
+				bike.OperatorUri,
 				bike.Id,
 				guid,
 				batteryPercentage,
-				bike.OperatorUri)).GetIsBookingResponseOk(bike.Id);
+				nextAction)).GetIsBookingResponseOk(bike.Id);
 
 			bike.Load(
 				response,
diff --git a/TINKLib/Model/Connector/Command/ICommand.cs b/TINKLib/Model/Connector/Command/ICommand.cs
index a005f35..8098e7d 100644
--- a/TINKLib/Model/Connector/Command/ICommand.cs
+++ b/TINKLib/Model/Connector/Command/ICommand.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using TINK.Model.Device;
@@ -49,7 +49,8 @@ namespace TINK.Model.Connector
 
 		/// <summary> Request to book a bike.</summary>
 		/// <param name="bike">Bike to book.</param>
-		Task DoBook(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike);
+		/// <param name="nextAction">If not null next locking action which is performed after booking.</param>
+		Task DoBookAsync(Bikes.BikeInfoNS.BC.IBikeInfoMutable bike, LockingAction? nextAction = null);
 
 		/// <summary> Request to book a bike and open its lock.</summary>
 		/// <param name="bike">Bike to book and to open lock for.</param>
@@ -163,4 +164,14 @@ namespace TINK.Model.Connector
 
 		public string Mail { get; }
 	}
+
+	/// <summary>
+	/// Describes a action to be performed with an lock.
+	/// </summary>
+	public enum LockingAction
+	{
+		Close,
+		Open,
+	}
+		
 }
diff --git a/TINKLib/Model/WhatsNew.cs b/TINKLib/Model/WhatsNew.cs
index ee75e07..f0c533d 100644
--- a/TINKLib/Model/WhatsNew.cs
+++ b/TINKLib/Model/WhatsNew.cs
@@ -662,6 +662,16 @@ namespace TINK.Model
 					AppResources.ChangeLog_PackageUpdates,
 					new List<AppFlavor> { AppFlavor.MeinKonrad, AppFlavor.ShareeBike }
 				},
+				{
+					new Version(3, 0, 355),
+					AppResources.ChangeLog_3_0_355_MK_SB_iOS,
+					new List<AppFlavor> { AppFlavor.MeinKonrad, AppFlavor.ShareeBike },
+					new List<DevicePlatform> { DevicePlatform.iOS }
+				},
+				{
+					new Version(3, 0, 356),
+					AppResources.ChangeLog3_0_231
+				},
 		};
 
 		/// <summary> Manges the whats new information.</summary>
diff --git a/TINKLib/MultilingualResources/AppResources.Designer.cs b/TINKLib/MultilingualResources/AppResources.Designer.cs
index fe966ba..6ff4a47 100644
--- a/TINKLib/MultilingualResources/AppResources.Designer.cs
+++ b/TINKLib/MultilingualResources/AppResources.Designer.cs
@@ -738,6 +738,15 @@ namespace TINK.MultilingualResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Bluetooth communication improved..
+        /// </summary>
+        public static string ChangeLog_3_0_355_MK_SB_iOS {
+            get {
+                return ResourceManager.GetString("ChangeLog_3_0_355_MK_SB_iOS", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to We have fixed some bugs. Enjoy the ride!.
         /// </summary>
diff --git a/TINKLib/MultilingualResources/AppResources.de.resx b/TINKLib/MultilingualResources/AppResources.de.resx
index ba474c5..8334e29 100644
--- a/TINKLib/MultilingualResources/AppResources.de.resx
+++ b/TINKLib/MultilingualResources/AppResources.de.resx
@@ -1111,4 +1111,7 @@ Probieren Sie es aus!</value>
   <data name="ChangeLog_PackageUpdates" xml:space="preserve">
     <value>Softwarepakete wurden aktualisiert.</value>
   </data>
+  <data name="ChangeLog_3_0_355_MK_SB_iOS" xml:space="preserve">
+    <value>Bluetooth-Kommunikation verbessert.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TINKLib/MultilingualResources/AppResources.resx b/TINKLib/MultilingualResources/AppResources.resx
index e92a040..e707c26 100644
--- a/TINKLib/MultilingualResources/AppResources.resx
+++ b/TINKLib/MultilingualResources/AppResources.resx
@@ -1201,4 +1201,7 @@ Try it out!</value>
   <data name="ChangeLog_PackageUpdates" xml:space="preserve">
     <value>Software packages were updated.</value>
   </data>
+  <data name="ChangeLog_3_0_355_MK_SB_iOS" xml:space="preserve">
+    <value>Bluetooth communication improved.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TINKLib/MultilingualResources/TINKLib.de.xlf b/TINKLib/MultilingualResources/TINKLib.de.xlf
index 0af4343..cbc0357 100644
--- a/TINKLib/MultilingualResources/TINKLib.de.xlf
+++ b/TINKLib/MultilingualResources/TINKLib.de.xlf
@@ -1520,6 +1520,10 @@ Probieren Sie es aus!</target>
           <source>Software packages were updated.</source>
           <target state="translated">Softwarepakete wurden aktualisiert.</target>
         </trans-unit>
+        <trans-unit id="ChangeLog_3_0_355_MK_SB_iOS" translate="yes" xml:space="preserve">
+          <source>Bluetooth communication improved.</source>
+          <target state="translated">Bluetooth-Kommunikation verbessert.</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/TINKLib/Repository/CopriCallsHttps.cs b/TINKLib/Repository/CopriCallsHttps.cs
index 3ba1cde..187ef20 100644
--- a/TINKLib/Repository/CopriCallsHttps.cs
+++ b/TINKLib/Repository/CopriCallsHttps.cs
@@ -7,6 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Serilog;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
+using TINK.Model.Connector;
 using TINK.Model.Device;
 using TINK.Model.Logging;
 using TINK.Repository.Exception;
@@ -181,19 +182,21 @@ namespace TINK.Repository
 					UserAgent);
 
 		/// <summary> Gets booking request request. </summary>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
 		/// <param name="bikeId">Id of the bike to book.</param>
 		/// <param name="guid">Used to publish GUID from app to copri. Used for initial setup of bike in copri.</param>
 		/// <param name="batteryPercentage">Holds the filling level percentage of the battery.</param>
-		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <param name="nextAction">If not null next locking action which is performed after booking.</param>
 		/// <returns>Requst on booking request.</returns>
 		public async Task<ReservationBookingResponse> DoBookAsync(
+			Uri operatorUri,
 			string bikeId,
 			Guid guid,
-			double batteryPercentage,
-			Uri operatorUri)
+			double batteryPercentage,			
+			LockingAction? nextAction = null)
 			=> await DoBookAsync(
 				operatorUri?.AbsoluteUri ?? m_oCopriHost.AbsoluteUri,
-				requestBuilder.DoBook(bikeId, guid, batteryPercentage),
+				requestBuilder.DoBook(bikeId, guid, batteryPercentage, nextAction),
 				UserAgent);
 
 		/// <summary> Books a bike and starts opening bike. </summary>
diff --git a/TINKLib/Repository/CopriCallsMemory.cs b/TINKLib/Repository/CopriCallsMemory.cs
index 12ebce4..f2bce52 100644
--- a/TINKLib/Repository/CopriCallsMemory.cs
+++ b/TINKLib/Repository/CopriCallsMemory.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
+using TINK.Model.Connector;
 using TINK.Model.Device;
 using TINK.Repository.Request;
 using TINK.Repository.Response;
@@ -1640,7 +1641,7 @@ namespace TINK.Repository
             double batteryLevel,
 			IVersionInfo versionInfo) => null;
 
-        public Task<ReservationBookingResponse> DoBookAsync(string bikeId, Guid guid, double batteryPercentage, Uri operatorUri)
+        public Task<ReservationBookingResponse> DoBookAsync(Uri operatorUri, string bikeId, Guid guid, double batteryPercentage, LockingAction? nextAction = null)
             => null;
 
         public Task<ReservationBookingResponse> BookAvailableAndStartOpeningAsync(
diff --git a/TINKLib/Repository/CopriCallsMonkeyStore.cs b/TINKLib/Repository/CopriCallsMonkeyStore.cs
index a00de3b..edc8e0b 100644
--- a/TINKLib/Repository/CopriCallsMonkeyStore.cs
+++ b/TINKLib/Repository/CopriCallsMonkeyStore.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using MonkeyCache.FileStore;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
+using TINK.Model.Connector;
 using TINK.Model.Device;
 using TINK.Model.Services.CopriApi;
 using TINK.Repository.Request;
@@ -176,7 +177,7 @@ namespace TINK.Repository
 			IVersionInfo versionInfo)
 			=> throw new System.Exception("Aktualisierung des Schlossstatuses im Offlinemodus nicht möglich!");
 
-		public Task<ReservationBookingResponse> DoBookAsync(string bikeId, Guid guid, double batteryPercentage, Uri operatorUri)
+		public Task<ReservationBookingResponse> DoBookAsync(Uri operatorUri, string bikeId, Guid guid, double batteryPercentage, LockingAction? nextAction = null)
 			=> throw new System.Exception("Buchung im Offlinemodus nicht möglich!");
 
 		/// <summary> Books a bike and starts opening bike. </summary>
diff --git a/TINKLib/Repository/ICopriServer.cs b/TINKLib/Repository/ICopriServer.cs
index a1d7fe7..d791582 100644
--- a/TINKLib/Repository/ICopriServer.cs
+++ b/TINKLib/Repository/ICopriServer.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
+using TINK.Model.Connector;
 using TINK.Model.Device;
 using TINK.Repository.Request;
 using TINK.Repository.Response;
@@ -74,16 +75,18 @@ namespace TINK.Repository
 			IVersionInfo versionInfo = null);
 
 		/// <summary> Books a bluetooth bike. </summary>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
 		/// <param name="bikeId">Id of the bike to book.</param>
 		/// <param name="guid">Used to publish GUID from app to copri. Used for initial setup of bike in copri.</param>
 		/// <param name="batteryPercentage">Holds the filling level percentage of the battery.</param>
-		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
+		/// <param name="nextAction">If not null next locking action which is performed after booking.</param>
 		/// <returns>Response on booking request.</returns>
 		Task<ReservationBookingResponse> DoBookAsync(
+			Uri operatorUri,
 			string bikeId,
 			Guid guid,
-			double batteryPercentage,
-			Uri operatorUri);
+			double batteryPercentage,						
+			LockingAction? nextAction = null);
 
 		/// <summary> Books a bike and starts opening bike. </summary>
 		/// <param name="bikeId">Id of the bike to book.</param>
diff --git a/TINKLib/Repository/Request/IRequestBuilder.cs b/TINKLib/Repository/Request/IRequestBuilder.cs
index 5a25287..12380e0 100644
--- a/TINKLib/Repository/Request/IRequestBuilder.cs
+++ b/TINKLib/Repository/Request/IRequestBuilder.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
+using TINK.Model.Connector;
 using TINK.Model.Device;
 
 namespace TINK.Repository.Request
@@ -79,8 +80,9 @@ namespace TINK.Repository.Request
 		/// <param name="bikeId">Id of the bike to book.</param>
 		/// <param name="guid">Used to publish GUID from app to copri. Used for initial setup of bike in copri.</param>
 		/// <param name="batteryPercentage">Holds the filling level percentage of the battery.</param>
+		/// <param name="nextAction">If not null next locking action which is performed after booking.</param>
 		/// <returns>Request to booking bike.</returns>
-		string DoBook(string bikeId, Guid guid, double batteryPercentage);
+		string DoBook(string bikeId, Guid guid, double batteryPercentage, LockingAction? nextAction = null);
 
 		/// <summary> Gets the request to book and start opening the bike (synonym: booking == renting == mieten). </summary>
 		/// <param name="bikeId">Id of the bike to book.</param>
diff --git a/TINKLib/Repository/Request/RequestBuilder.cs b/TINKLib/Repository/Request/RequestBuilder.cs
index 214e59f..d98305c 100644
--- a/TINKLib/Repository/Request/RequestBuilder.cs
+++ b/TINKLib/Repository/Request/RequestBuilder.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Net;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
+using TINK.Model.Connector;
 using TINK.Model.Device;
 using TINK.Repository.Exception;
 
@@ -109,7 +110,7 @@ namespace TINK.Repository.Request
 		public string UpateLockingState(string bikeId, lock_state state, LocationDto geolocation, double batteryPercentage, IVersionInfo versionInfo)
 			=> throw new NotSupportedException();
 
-		public string DoBook(string bikeId, Guid guid, double batteryPercentage)
+		public string DoBook(string bikeId, Guid guid, double batteryPercentage, LockingAction? nextAction = null)
 			=> throw new NotSupportedException();
 
 		/// <summary> Gets the request to book and start opening the bike (synonym: booking == renting == mieten). </summary>
diff --git a/TINKLib/Repository/Request/RequestBuilderHelper.cs b/TINKLib/Repository/Request/RequestBuilderHelper.cs
index 3a94700..86bb0ca 100644
--- a/TINKLib/Repository/Request/RequestBuilderHelper.cs
+++ b/TINKLib/Repository/Request/RequestBuilderHelper.cs
@@ -1,4 +1,6 @@
-
+
+using TINK.Model.Connector;
+
 namespace TINK.Repository.Request
 {
 	public static class RequestBuilderHelper
@@ -12,5 +14,20 @@ namespace TINK.Repository.Request
 			=> !string.IsNullOrEmpty(uiIsoLangugageName)
 				? $"&lang={uiIsoLangugageName}"
 				: string.Empty;
+
+		public static lock_state? GetLockState(this  LockingAction? action)
+		{
+			switch (action)
+			{
+				case LockingAction.Open:
+					return lock_state.unlocking;
+
+				case LockingAction.Close:
+					return lock_state.locking;
+
+				default:
+					return null;
+			}
+		}
 	}
 }
diff --git a/TINKLib/Repository/Request/RequestBuilderLoggedIn.cs b/TINKLib/Repository/Request/RequestBuilderLoggedIn.cs
index 936ca0c..569da49 100644
--- a/TINKLib/Repository/Request/RequestBuilderLoggedIn.cs
+++ b/TINKLib/Repository/Request/RequestBuilderLoggedIn.cs
@@ -4,6 +4,7 @@ using System.Globalization;
 using System.Linq;
 using System.Net;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
+using TINK.Model.Connector;
 using TINK.Model.Device;
 using TINK.Repository.Exception;
 using TINK.Services.Logging;
@@ -153,14 +154,15 @@ namespace TINK.Repository.Request
 		/// <param name="bikeId">Id of the bike to book.</param>
 		/// <param name="guid">Used to publish GUID from app to copri. Used for initial setup of bike in copri.</param>
 		/// <param name="batteryPercentage">Holds the filling level percentage of the battery.</param>
+		/// <param name="nextAction">If not null next locking action which is performed after booking.</param>
 		/// <returns>Request to booking bike.</returns>
-		public string DoBook(string bikeId, Guid guid, double batteryPercentage)
+		public string DoBook(string bikeId, Guid guid, double batteryPercentage, LockingAction? nextAction = null)
 			=> "request=booking_update" +
 				GetBikeIdParameter(bikeId) +
 				AuthCookieParameter +
 				$"&Ilockit_GUID={guid}" +
 				"&state=occupied" +
-				GetLockStateParameter(lock_state.unlocked) +
+				GetLockStateParameter(nextAction.GetLockState()) +
 				GetBatteryPercentageParameters(batteryPercentage) +
 				UiIsoLanguageNameParameter;
 
@@ -269,9 +271,12 @@ namespace TINK.Repository.Request
 		private static string GetBikeIdParameter(string bikeId)
 			=> $"&bike={bikeId}";
 
-		private static string GetLockStateParameter(lock_state lockState)
-			=> $"&lock_state={lockState}";
+		private static string GetLockStateParameter(lock_state? lockState)
+			=> lockState.HasValue ? $"&lock_state={lockState}" : string.Empty;
 
+		/// <summary>
+		/// Gets the battery level percentage parameter if percentage is not NaN an empty string otherwise.
+		/// </summary>
 		private static string GetBatteryPercentageParameters(double batteryPercentage) => !double.IsNaN(batteryPercentage)
 			? $"&voltage={batteryPercentage.ToString(CultureInfo.InvariantCulture)}"
 			: string.Empty;
diff --git a/TINKLib/Services/CopriApi/CopriProviderHttps.cs b/TINKLib/Services/CopriApi/CopriProviderHttps.cs
index 8ed9724..1951de4 100644
--- a/TINKLib/Services/CopriApi/CopriProviderHttps.cs
+++ b/TINKLib/Services/CopriApi/CopriProviderHttps.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Serilog;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
+using TINK.Model.Connector;
 using TINK.Model.Connector.Updater;
 using TINK.Model.Device;
 using TINK.Repository;
@@ -243,12 +244,14 @@ namespace TINK.Model.Services.CopriApi
 					versionInfo);
 
 		/// <summary> Books a bike. </summary>
+		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
 		/// <param name="bikeId">Id of the bike to book.</param>
 		/// <param name="guid">Used to publish GUID from app to copri. Used for initial setup of bike in copri.</param>
 		/// <param name="batteryPercentage">Holds the filling level percentage of the battery.</param>
+		/// <param name="nextAction">If not null next locking action which is performed after booking.</param>
 		/// <returns>Response on booking request.</returns>
-		public async Task<ReservationBookingResponse> DoBookAsync(string bikeId, Guid guid, double batteryPercentage, Uri operatorUri)
-			=> await HttpsServer.DoBookAsync(bikeId, guid, batteryPercentage, operatorUri);
+		public async Task<ReservationBookingResponse> DoBookAsync(Uri operatorUri, string bikeId, Guid guid, double batteryPercentage, LockingAction? nextAction = null)
+			=> await HttpsServer.DoBookAsync(operatorUri, bikeId, guid, batteryPercentage, nextAction);
 
 		/// <summary> Books a bike and starts opening bike. </summary>
 		/// <param name="bikeId">Id of the bike to book.</param>
diff --git a/TINKLib/Services/CopriApi/CopriProviderMonkeyStore.cs b/TINKLib/Services/CopriApi/CopriProviderMonkeyStore.cs
index 45dd7ca..4bfb630 100644
--- a/TINKLib/Services/CopriApi/CopriProviderMonkeyStore.cs
+++ b/TINKLib/Services/CopriApi/CopriProviderMonkeyStore.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
+using TINK.Model.Connector;
 using TINK.Model.Device;
 using TINK.Repository;
 using TINK.Repository.Request;
@@ -65,8 +66,8 @@ namespace TINK.Model.Services.CopriApi
 				batteryLevel,
 				versionInfo);
 
-		public async Task<ReservationBookingResponse> DoBookAsync(string bikeId, Guid guid, double batteryPercentage, Uri operatorUri)
-			=> await monkeyStore.DoBookAsync(bikeId, guid, batteryPercentage, operatorUri);
+		public async Task<ReservationBookingResponse> DoBookAsync(Uri operatorUri, string bikeId, Guid guid, double batteryPercentage, LockingAction? nextAction = null)
+			=> await monkeyStore.DoBookAsync(operatorUri, bikeId, guid, batteryPercentage, nextAction);
 
 		public async Task<ReservationBookingResponse> BookAvailableAndStartOpeningAsync(
 			string bikeId,
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableDisconnected.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableDisconnected.cs
index b3a3200..a19a897 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableDisconnected.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableDisconnected.cs
@@ -222,7 +222,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			IsConnected = IsConnectedDelegate();
 			try
 			{
-				await ConnectorFactory(IsConnected).Command.DoBook(SelectedBike);
+				await ConnectorFactory(IsConnected).Command.DoBookAsync(SelectedBike, LockingAction.Open);
 			}
 			catch (Exception l_oException)
 			{
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableOpen.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableOpen.cs
index 66cb8e2..b996671 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableOpen.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableOpen.cs
@@ -194,7 +194,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			IsConnected = IsConnectedDelegate();
 			try
 			{
-				await ConnectorFactory(IsConnected).Command.DoBook(SelectedBike);
+				await ConnectorFactory(IsConnected).Command.DoBookAsync(SelectedBike);
 			}
 			catch (Exception l_oException)
 			{
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedClosed.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedClosed.cs
index c95ac62..80482bf 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedClosed.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedClosed.cs
@@ -187,7 +187,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			IsConnected = IsConnectedDelegate();
 			try
 			{
-				await ConnectorFactory(IsConnected).Command.DoBook(SelectedBike);
+				await ConnectorFactory(IsConnected).Command.DoBookAsync(SelectedBike, LockingAction.Open);
 			}
 			catch (Exception l_oException)
 			{
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedDisconnected.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedDisconnected.cs
index a0803de..fd37a2a 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedDisconnected.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedDisconnected.cs
@@ -350,7 +350,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			IsConnected = IsConnectedDelegate();
 			try
 			{
-				await ConnectorFactory(IsConnected).Command.DoBook(SelectedBike);
+				await ConnectorFactory(IsConnected).Command.DoBookAsync(SelectedBike, LockingAction.Open);
 			}
 			catch (Exception l_oException)
 			{
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedOpen.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedOpen.cs
index 8554a73..c30d78e 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedOpen.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedOpen.cs
@@ -106,7 +106,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				IsConnected = IsConnectedDelegate();
 				try
 				{
-					await ConnectorFactory(IsConnected).Command.DoBook(SelectedBike);
+					await ConnectorFactory(IsConnected).Command.DoBookAsync(SelectedBike);
 				}
 				catch (Exception l_oException)
 				{
diff --git a/TINKLib/ViewModel/Map/MapPageViewModel.cs b/TINKLib/ViewModel/Map/MapPageViewModel.cs
index fbd4aa6..606cdbc 100644
--- a/TINKLib/ViewModel/Map/MapPageViewModel.cs
+++ b/TINKLib/ViewModel/Map/MapPageViewModel.cs
@@ -858,98 +858,6 @@ namespace TINK.ViewModel.Map
 			}
 		}
 
-		/// <summary> Command object to bind CurrentLocation Button to view model.</summary>
-		public System.Windows.Input.ICommand OnCurrentLocationButtonClicked => new Xamarin.Forms.Command(async () => await CenterToCurrentLocation());
-
-		/// <summary> User request to center to currentLocation. </summary>
-		public async Task CenterToCurrentLocation()
-		{
-			try
-			{
-				ActionText = AppResources.ActivityTextCenterMap;
-
-				IsMapPageEnabled = false;
-
-				Log.ForContext<MapPageViewModel>().Information($"Request to center to current position.");
-
-				// Stop polling.
-				//ActionText = AppResources.ActivityTextOneMomentPlease;
-				await m_oViewUpdateManager.StopUpdatePeridically();
-
-				// Clear error info.
-				Exception = null;
-
-				ActiveFilterMap = tinkKonradToggleViewModel.FilterDictionary;
-				TinkApp.GroupFilterMapPage = ActiveFilterMap;
-				TinkApp.Save();
-
-				TinkApp.UpdateConnector();
-
-				// Check location permission
-				var status = await RequestLocationPermission();
-				if (status == Status.Granted)
-				{
-					// Move and scale.
-					Location currentLocation = null;
-					try
-					{
-						currentLocation = await GeolocationService.GetAsync();
-					}
-					catch (Exception ex)
-					{
-						Log.ForContext<MapPageViewModel>().Error("Getting location failed. {Exception}", ex);
-					}
-
-					if (currentLocation != null)
-					{
-						ActionText = AppResources.ActivityTextCenterMap;
-
-						TinkApp.UserMapSpan = MapSpan.FromCenterAndRadius(
-						new Xamarin.Forms.GoogleMaps.Position(currentLocation.Latitude, currentLocation.Longitude),
-						TinkApp.ActiveMapSpan.Radius);
-
-						TinkApp.Save();
-
-						MoveAndScale(m_oMoveToRegionDelegate, TinkApp.ActiveMapSpan);
-
-						try
-						{
-							// Update bikes at station or my bikes depending on context.
-							await m_oViewUpdateManager.StartUpdateAyncPeridically(Polling);
-						}
-						catch (Exception)
-						{
-							// Excpetions are handled insde update task;
-						}
-					}
-					else
-					{
-						await ViewService.DisplayAlert(
-						AppResources.MessageTitleHint,
-						AppResources.MessageErrorLocationIsOff,
-						AppResources.MessageAnswerOk);
-					}
-				}
-
-				IsMapPageEnabled = true;
-				Log.ForContext<MapPageViewModel>().Information($"Center to current Position done.");
-				ActionText = String.Empty;
-			}
-			catch (Exception l_oException)
-			{
-				Log.ForContext<MapPageViewModel>().Error("An error occurred while centering to current position.");
-				ActionText = String.Empty;
-
-				await ViewService.DisplayAlert(
-					"Fehler",
-					AppResources.MessageMapPageErrorSwitch,
-					String.Format(AppResources.MessageErrorQueryLocationMessage, l_oException.Message),
-					AppResources.MessageAnswerOk);
-
-				IsMapPageEnabled = true;
-			}
-		}
-
 		/// <summary> Command object to bind login button to view model.</summary>
 		public System.Windows.Input.ICommand OnToggleTinkToKonrad => new Xamarin.Forms.Command(async () => await ToggleTinkToKonrad());
 
@@ -1015,43 +923,6 @@ namespace TINK.ViewModel.Map
 
 				Pins.Clear();
 
-				//// Move and scale before getting stations and bikes which takes some time.
-				//if (TinkApp.CenterMapToCurrentLocation)
-				//{
-				//	// Check location permission
-				//	//ActionText = AppResources.ActivityTextRequestingLocationPermissions;
-				//	var status = await RequestLocationPermission();
-				//	if (status == Status.Granted)
-				//	{
-				//		//ActionText = AppResources.ActivityTextCenterMap;
-
-					//		Location currentLocation = null;
-					//		try
-					//		{
-					//			currentLocation = await GeolocationService.GetAsync();
-					//		}
-					//		catch (Exception ex)
-					//		{
-					//			Log.ForContext<MapPageViewModel>().Error("Getting location failed. {Exception}", ex);
-					//		}
-
-					//		if (currentLocation != null)
-					//		{
-					//			TinkApp.UserMapSpan = MapSpan.FromCenterAndRadius(
-					//			new Xamarin.Forms.GoogleMaps.Position(currentLocation.Latitude, currentLocation.Longitude),
-					//			TinkApp.ActiveMapSpan.Radius);
-
-					//			TinkApp.Save();
-
-					//			//MoveAndScale(m_oMoveToRegionDelegate, TinkApp.ActiveMapSpan);
-					//		}
-					//		else
-					//		{
-					//			ActionText = AppResources.ActivityTextErrorQueryLocationWhenAny;
-					//		}
-				//	}
-				//}
-
 				// Update stations
 				ActionText = AppResources.ActivityTextMapLoadingStationsAndBikes;
 				IsConnected = TinkApp.GetIsConnected();
diff --git a/TestFramework/Repository/CopriCallMemoryBase.cs b/TestFramework/Repository/CopriCallMemoryBase.cs
index b37eb14..ffe8678 100644
--- a/TestFramework/Repository/CopriCallMemoryBase.cs
+++ b/TestFramework/Repository/CopriCallMemoryBase.cs
@@ -5,6 +5,7 @@ using System.Reflection;
 using System.Threading.Tasks;
 using TINK.Model;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
+using TINK.Model.Connector;
 using TINK.Model.Device;
 using TINK.Repository;
 using TINK.Repository.Request;
@@ -263,7 +264,7 @@ namespace TestFramework.Repository
 			IVersionInfo versionInfo)
 			=> null;
 
-		public Task<ReservationBookingResponse> DoBookAsync(string bikeId, Guid guid, double batteryPercentage, Uri operatorUri)
+		public Task<ReservationBookingResponse> DoBookAsync(Uri operatorUri, string bikeId, Guid guid, double batteryPercentage, LockingAction? nextAction = null)
 			=> null;
 		public Task<ReservationBookingResponse> BookAvailableAndStartOpeningAsync(string bikeId, Uri operatorUri)
 			=> null;
diff --git a/TestFramework/Repository/ExceptionServer.cs b/TestFramework/Repository/ExceptionServer.cs
index d3066a1..08b6760 100644
--- a/TestFramework/Repository/ExceptionServer.cs
+++ b/TestFramework/Repository/ExceptionServer.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
+using TINK.Model.Connector;
 using TINK.Model.Device;
 using TINK.Repository;
 using TINK.Repository.Request;
@@ -64,7 +65,7 @@ namespace TestFramework.Repository
 			IVersionInfo versionInfo)
 			=> throw new NotImplementedException();
 
-		public Task<ReservationBookingResponse> DoBookAsync(string bikeId, Guid guid, double batteryPercentage, Uri operatorUri)
+		public Task<ReservationBookingResponse> DoBookAsync(Uri operatorUri, string bikeId, Guid guid, double batteryPercentage, LockingAction? nextAction = null)
 			=> throw new NotImplementedException();
 
 		public Task<ReservationBookingResponse> BookAvailableAndStartOpeningAsync(string bikeId, Uri operatorUri)
diff --git a/TestFramework/Services/CopriApi/CopriCallsCacheMemory001.cs b/TestFramework/Services/CopriApi/CopriCallsCacheMemory001.cs
index 7469036..81a9b58 100644
--- a/TestFramework/Services/CopriApi/CopriCallsCacheMemory001.cs
+++ b/TestFramework/Services/CopriApi/CopriCallsCacheMemory001.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using TestFramework.Repository;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
+using TINK.Model.Connector;
 using TINK.Model.Device;
 using TINK.Model.Services.CopriApi;
 using TINK.Repository.Request;
@@ -84,7 +85,7 @@ namespace TestFramework.Services.CopriApi.Connector
 			IVersionInfo versionInfo)
 			=> throw new NotImplementedException();
 
-		public Task<ReservationBookingResponse> DoBookAsync(string bikeId, Guid guid, double batteryPercentage, Uri operatorUri)
+		public Task<ReservationBookingResponse> DoBookAsync(Uri operatorUri, string bikeId, Guid guid, double batteryPercentage, LockingAction? nextAction = null)
 			=> throw new NotImplementedException();
 
 		public Task<ReservationBookingResponse> BookAvailableAndStartOpeningAsync(string bikeId, Uri operatorUri)
diff --git a/TestShareeLib/Repository/Request/TestRequestBuilderHelper.cs b/TestShareeLib/Repository/Request/TestRequestBuilderHelper.cs
new file mode 100644
index 0000000..c896bde
--- /dev/null
+++ b/TestShareeLib/Repository/Request/TestRequestBuilderHelper.cs
@@ -0,0 +1,36 @@
+using System;
+using NUnit.Framework;
+using TINK.Model.Connector;
+using TINK.Repository.Request;
+
+namespace TestShareeLib.Repository.Request
+{
+	[TestFixture]
+	public class TestRequestBuilderHelper
+	{
+		[Test]
+		public void TestGetLockStateNull()
+			=> Assert.That(
+				RequestBuilderHelper.GetLockState(null),
+				Is.Null);
+
+		[Test]
+		public void TestGetLockState([Values] LockingAction action)
+		{
+			switch (action)
+			{
+				case LockingAction.Open:
+				case LockingAction.Close:
+					break;
+
+				default:
+					throw new ArgumentException("Tests need possibly exended.");
+
+			}
+
+			Assert.That(
+				RequestBuilderHelper.GetLockState(action),
+				Is.EqualTo(action == LockingAction.Open ? lock_state.unlocking : lock_state.locking));
+		}
+	}
+}
diff --git a/TestShareeLib/Repository/Request/TestRequestBuilderLoggedIn.cs b/TestShareeLib/Repository/Request/TestRequestBuilderLoggedIn.cs
index c595b66..165d919 100644
--- a/TestShareeLib/Repository/Request/TestRequestBuilderLoggedIn.cs
+++ b/TestShareeLib/Repository/Request/TestRequestBuilderLoggedIn.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Net;
 using NUnit.Framework;
+using TINK.Model.Connector;
 using TINK.Repository.Exception;
 using TINK.Repository.Request;
 
@@ -117,18 +118,35 @@ namespace TestShareeLib.Repository.Request
 		public void TestDoBook()
 		{
 			Assert.AreEqual(
-				"request=booking_update&bike=42&authcookie=456123&Ilockit_GUID=0000f00d-1212-efde-1523-785fef13d123&state=occupied&lock_state=unlocked&voltage=33.21",
-				new RequestBuilderLoggedIn("123", null /*UI language */, "456").DoBook("42", new Guid("0000f00d-1212-efde-1523-785fef13d123"), 33.21));
+				"request=booking_update&bike=42&authcookie=456123&Ilockit_GUID=0000f00d-1212-efde-1523-785fef13d123&state=occupied&lock_state=unlocking&voltage=33.21",
+				new RequestBuilderLoggedIn("123", null /*UI language */, "456").DoBook("42", new Guid("0000f00d-1212-efde-1523-785fef13d123"), 33.21, LockingAction.Open));
 		}
 
 		[Test]
 		public void TestDoBookNoBatery()
 		{
 			Assert.AreEqual(
-				"request=booking_update&bike=42&authcookie=456123&Ilockit_GUID=0000f00d-1212-efde-1523-785fef13d123&state=occupied&lock_state=unlocked",
+				"request=booking_update&bike=42&authcookie=456123&Ilockit_GUID=0000f00d-1212-efde-1523-785fef13d123&state=occupied",
 				new RequestBuilderLoggedIn("123", null /*UI language */, "456").DoBook("42", new Guid("0000f00d-1212-efde-1523-785fef13d123"), double.NaN));
 		}
 
+		[Test]
+		public void TestDoBookActionNone()
+		{
+			Assert.AreEqual(
+				"request=booking_update&bike=42&authcookie=456123&Ilockit_GUID=0000f00d-1212-efde-1523-785fef13d123&state=occupied",
+				new RequestBuilderLoggedIn("123", null /*UI language */, "456").DoBook("42", new Guid("0000f00d-1212-efde-1523-785fef13d123"), double.NaN));
+		}
+
+		/// <summary> Hypothetical scenario.</summary>
+		[Test]
+		public void TestDoBookActionClose()
+		{
+			Assert.AreEqual(
+				"request=booking_update&bike=42&authcookie=456123&Ilockit_GUID=0000f00d-1212-efde-1523-785fef13d123&state=occupied&lock_state=locking",
+				new RequestBuilderLoggedIn("123", null /*UI language */, "456").DoBook("42", new Guid("0000f00d-1212-efde-1523-785fef13d123"), double.NaN, LockingAction.Close));
+		}
+
 		[Test]
 		public void TestBookAndStartOpening()
 			=> Assert.That(
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableDisconnected.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableDisconnected.cs
index a35279f..799758a 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableDisconnected.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableDisconnected.cs
@@ -157,7 +157,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
 				bikesViewModel.ActionText = "";
 				bikesViewModel.ActionText = "Renting bike...";
-				connector.Command.DoBook(bike); // Booking must be performed
+				connector.Command.DoBookAsync(bike, LockingAction.Open); // Booking must be performed
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be opened
 				bikesViewModel.ActionText = "Reading charging level...";
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableOpen.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableOpen.cs
index 4446f93..224cc20 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableOpen.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableOpen.cs
@@ -281,7 +281,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				bikesViewModel.ActionText = "Reading charging level...";
 				locks[0].GetBatteryPercentageAsync();
 				bikesViewModel.ActionText = "Renting bike...";
-				connector.Command.DoBook(bike);
+				connector.Command.DoBookAsync(bike);
 				bikesViewModel.ActionText = "Updating...";
 				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
 				bikesViewModel.ActionText = "";
@@ -328,7 +328,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			viewService.DisplayAlert(string.Empty, "Fahrrad Nr. 0 mieten oder Schloss schließen?", "Mieten", "Schloss schließen").Returns(Task.FromResult(true));
 
-			connector.Command.DoBook(bike).Returns(x => throw new WebConnectFailureException("Context info.", new Exception("chub")));
+			connector.Command.DoBookAsync(bike).Returns(x => throw new WebConnectFailureException("Context info.", new Exception("chub")));
 
 			locks[0].CloseAsync().Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Closed));
 
@@ -345,7 +345,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				bikesViewModel.ActionText = "Reading charging level...";
 				locks[0].GetBatteryPercentageAsync();
 				bikesViewModel.ActionText = "Renting bike...";
-				connector.Command.DoBook(bike);
+				connector.Command.DoBookAsync(bike);
 				bikesViewModel.ActionText = "";
 				viewService.DisplayAlert(
 					"Connection error when renting the bike!",
@@ -401,7 +401,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			viewService.DisplayAlert(string.Empty, "Fahrrad Nr. 0 mieten oder Schloss schließen?", "Mieten", "Schloss schließen").Returns(Task.FromResult(true));
 
-			connector.Command.DoBook(bike).Returns(x => throw new Exception("Exception message."));
+			connector.Command.DoBookAsync(bike).Returns(x => throw new Exception("Exception message."));
 
 			locks[0].CloseAsync().Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Closed));
 
@@ -418,7 +418,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				bikesViewModel.ActionText = "Reading charging level...";
 				locks[0].GetBatteryPercentageAsync();
 				bikesViewModel.ActionText = "Renting bike...";
-				connector.Command.DoBook(bike);
+				connector.Command.DoBookAsync(bike);
 				bikesViewModel.ActionText = "";
 				viewService.DisplayAlert("Error when renting the bike!", "Attention: Lock is closed!\r\nException message.", "OK");
 				bikesViewModel.ActionText = "Verschließe Schloss...";
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedClosed.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedClosed.cs
index f517ba6..5e10e8d 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedClosed.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedClosed.cs
@@ -472,7 +472,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				bikesViewModel.ActionText = "One moment please...";
 				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
-				connector.Command.DoBook(bike); // Booking must be performed
+				connector.Command.DoBookAsync(bike, LockingAction.Open); // Booking must be performed
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be opened
 				bikesViewModel.ActionText = "Reading charging level...";
@@ -528,7 +528,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			bike.LockInfo.State.Returns(LockingState.Closed); // Locking state does not change.
 
-			connector.Command.DoBook(bike).Returns(x => throw new WebConnectFailureException("Context info", new Exception("Tst")));
+			connector.Command.DoBookAsync(bike, LockingAction.Open).Returns(x => throw new WebConnectFailureException("Context info", new Exception("Tst")));
 
 			bike.State.Value.Returns(InUseStateEnum.Reserved); // State remains reserved because booking request failed.
 
@@ -541,7 +541,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				bikesViewModel.ActionText = "One moment please...";
 				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
-				connector.Command.DoBook(bike); // Booking must be performed
+				connector.Command.DoBookAsync(bike, LockingAction.Open); // Booking must be performed
 				bikesViewModel.ActionText = "";
 				viewService.DisplayAdvancedAlert(
 					"Connection error when renting the bike!",
@@ -597,7 +597,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			bike.LockInfo.State.Returns(LockingState.Closed); // Locking state does not change.
 
-			connector.Command.DoBook(bike).Returns(x => throw new Exception("Exception message."));
+			connector.Command.DoBookAsync(bike, LockingAction.Open).Returns(x => throw new Exception("Exception message."));
 
 			bike.State.Value.Returns(InUseStateEnum.Reserved); // When booking fails state remains reserved.
 
@@ -610,7 +610,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				bikesViewModel.ActionText = "One moment please...";
 				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
-				connector.Command.DoBook(bike); // Booking must be performed
+				connector.Command.DoBookAsync(bike, LockingAction.Open); // Booking must be performed
 				bikesViewModel.ActionText = "";
 				viewService.DisplayAdvancedAlert(
 					"Error when renting the bike!",
@@ -679,7 +679,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				bikesViewModel.ActionText = "One moment please...";
 				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
-				connector.Command.DoBook(bike); // Booking must be performed
+				connector.Command.DoBookAsync(bike, LockingAction.Open); // Booking must be performed
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be opened
 				bikesViewModel.ActionText = "";
@@ -746,7 +746,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				bikesViewModel.ActionText = "One moment please...";
 				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
-				connector.Command.DoBook(bike); // Booking must be performed
+				connector.Command.DoBookAsync(bike, LockingAction.Open); // Booking must be performed
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be opened
 				bikesViewModel.ActionText = "";
@@ -812,7 +812,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				bikesViewModel.ActionText = "One moment please...";
 				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
-				connector.Command.DoBook(bike); // Booking must be performed
+				connector.Command.DoBookAsync(bike, LockingAction.Open); // Booking must be performed
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be opened
 				bikesViewModel.ActionText = "Updating...";
@@ -878,7 +878,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				bikesViewModel.ActionText = "One moment please...";
 				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
-				connector.Command.DoBook(bike); // Booking must be performed
+				connector.Command.DoBookAsync(bike, LockingAction.Open); // Booking must be performed
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be opened
 				bikesViewModel.ActionText = "Reading charging level...";
@@ -949,7 +949,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				bikesViewModel.ActionText = "One moment please...";
 				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
-				connector.Command.DoBook(bike); // Booking must be performed
+				connector.Command.DoBookAsync(bike, LockingAction.Open); // Booking must be performed
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be opened
 				bikesViewModel.ActionText = "Reading charging level...";
@@ -1020,7 +1020,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				bikesViewModel.ActionText = "One moment please...";
 				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
-				connector.Command.DoBook(bike); // Booking must be performed
+				connector.Command.DoBookAsync(bike, LockingAction.Open); // Booking must be performed
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be opened
 				bikesViewModel.ActionText = "Reading charging level...";
@@ -1091,7 +1091,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				bikesViewModel.ActionText = "One moment please...";
 				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
-				connector.Command.DoBook(bike); // Booking must be performed
+				connector.Command.DoBookAsync(bike, LockingAction.Open); // Booking must be performed
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be opened
 				bikesViewModel.ActionText = "Reading charging level...";
@@ -1163,7 +1163,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				bikesViewModel.ActionText = "One moment please...";
 				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
-				connector.Command.DoBook(bike); // Booking must be performed
+				connector.Command.DoBookAsync(bike, LockingAction.Open); // Booking must be performed
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be opened
 				bikesViewModel.ActionText = "Reading charging level...";
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedDisconnected.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedDisconnected.cs
index ea77251..3526bde 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedDisconnected.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedDisconnected.cs
@@ -422,7 +422,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
 				bikesViewModel.ActionText = "";
 				bikesViewModel.ActionText = "Renting bike...";
-				connector.Command.DoBook(bike); // Booking must be performed
+				connector.Command.DoBookAsync(bike, LockingAction.Open); // Booking must be performed
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be opened
 				bikesViewModel.ActionText = "Reading charging level...";
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedOpen.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedOpen.cs
index e952a68..0f526fa 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedOpen.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedOpen.cs
@@ -94,7 +94,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				bikesViewModel.ActionText = "Reading charging level...";
 				locks[0].GetBatteryPercentageAsync();
 				bikesViewModel.ActionText = "Renting bike...";
-				connector.Command.DoBook(bike);
+				connector.Command.DoBookAsync(bike);
 				bikesViewModel.ActionText = "Updating...";
 				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
 				bikesViewModel.ActionText = "";
@@ -139,7 +139,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			viewService.DisplayAlert(string.Empty, "Rad Nr. 0  abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(false));
 
-			connector.Command.DoBook(bike).Returns(x => throw new WebConnectFailureException("Context info.", new Exception("Tst")));
+			connector.Command.DoBookAsync(bike).Returns(x => throw new WebConnectFailureException("Context info.", new Exception("Tst")));
 
 			locks[0].CloseAsync().Returns(LockitLockingState.Closed);
 
@@ -156,7 +156,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				bikesViewModel.ActionText = "Reading charging level...";
 				locks[0].GetBatteryPercentageAsync();
 				bikesViewModel.ActionText = "Renting bike...";
-				connector.Command.DoBook(bike);
+				connector.Command.DoBookAsync(bike);
 				bikesViewModel.ActionText = "";
 				viewService.DisplayAlert(
 					"Connection error when renting the bike!",
@@ -208,7 +208,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			viewService.DisplayAlert(string.Empty, "Rad Nr. 0  abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(false));
 
-			connector.Command.DoBook(bike).Returns(x => throw new Exception("Exception message."));
+			connector.Command.DoBookAsync(bike).Returns(x => throw new Exception("Exception message."));
 
 			locks[0].CloseAsync().Returns(LockitLockingState.Closed);
 
@@ -225,7 +225,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				bikesViewModel.ActionText = "Reading charging level...";
 				locks[0].GetBatteryPercentageAsync();
 				bikesViewModel.ActionText = "Renting bike...";
-				connector.Command.DoBook(bike);
+				connector.Command.DoBookAsync(bike);
 				bikesViewModel.ActionText = "";
 				viewService.DisplayAlert("Error when renting the bike!", "Attention: Lock is closed!\r\nException message.", "OK");
 				bikesViewModel.ActionText = "Wiederverschließe Schloss...";
diff --git a/TestTINKLib/Mocks/Connector/CopriCallsCacheMemory.cs b/TestTINKLib/Mocks/Connector/CopriCallsCacheMemory.cs
index 2e46c92..fa15b1c 100644
--- a/TestTINKLib/Mocks/Connector/CopriCallsCacheMemory.cs
+++ b/TestTINKLib/Mocks/Connector/CopriCallsCacheMemory.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
+using TINK.Model.Connector;
 using TINK.Model.Device;
 using TINK.Model.Services.CopriApi;
 using TINK.Repository;
@@ -89,7 +90,7 @@ namespace TestTINKLib.Mocks.Connector
 			IVersionInfo versionInfo)
 			=> throw new NotImplementedException();
 
-		public Task<ReservationBookingResponse> DoBookAsync(string bikeId, Guid guid, double batteryPercentage, Uri operatorUri)
+		public Task<ReservationBookingResponse> DoBookAsync(Uri operatorUri, string bikeId, Guid guid, double batteryPercentage, LockingAction? nextAction = null)
 			=> throw new NotImplementedException();
 
 		public Task<ReservationBookingResponse> BookAvailableAndStartOpeningAsync(string bikeId, Uri operatorUri)