1
0
mirror of https://github.com/bitwarden/mobile synced 2026-01-10 12:33:28 +00:00

fix error when login token expires

This commit is contained in:
Kyle Spearrin
2019-10-22 16:30:28 -04:00
parent 0400d79f43
commit e1983a7d66
6 changed files with 39 additions and 10 deletions

View File

@@ -97,7 +97,8 @@ namespace Bit.App
}
else if(message.Command == "logout")
{
Device.BeginInvokeOnMainThread(async () => await LogOutAsync(false));
Device.BeginInvokeOnMainThread(async () =>
await LogOutAsync((message.Data as bool?).GetValueOrDefault()));
}
else if(message.Command == "loggedOut")
{
@@ -240,6 +241,10 @@ namespace Bit.App
_authService.LogOut(() =>
{
Current.MainPage = new HomePage();
if(expired)
{
_platformUtilsService.ShowToast("warning", null, AppResources.LoginExpired);
}
});
}

View File

@@ -456,7 +456,10 @@ namespace Bit.App.Pages
catch(ApiException e)
{
await _deviceActionService.HideLoadingAsync();
await Page.DisplayAlert(AppResources.AnErrorHasOccurred, e.Error.GetSingleMessage(), AppResources.Ok);
if(e?.Error != null)
{
await Page.DisplayAlert(AppResources.AnErrorHasOccurred, e.Error.GetSingleMessage(), AppResources.Ok);
}
}
return false;
}

View File

@@ -2274,6 +2274,15 @@ namespace Bit.App.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Your login session has expired..
/// </summary>
public static string LoginExpired {
get {
return ResourceManager.GetString("LoginExpired", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Login.
/// </summary>

View File

@@ -1575,4 +1575,7 @@
<data name="ToggleVisibility" xml:space="preserve">
<value>Toggle Visibility</value>
</data>
<data name="LoginExpired" xml:space="preserve">
<value>Your login session has expired.</value>
</data>
</root>