bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2025-12-26 05:03:39 +00:00
Code Issues Releases Wiki Activity

Cleanup hacks because of Intent LaunchedFromHistory bug

Browse Source
This commit is contained in:
Kyle Spearrin
2017-02-06 19:39:07 -05:00
parent 749508871b
commit c7af81bf0c
4 changed files with 36 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/Android/AutofillActivity.cs
View File

@@ -51,39 +51,37 @@ namespace Bit.Android
if(data == null)
{
LastCredentials = null;
return;
}
try
else
{
if(data.GetStringExtra("canceled") != null)
try
{
if(data.GetStringExtra("canceled") != null)
{
LastCredentials = null;
}
else
{
var uri = data.GetStringExtra("uri");
var username = data.GetStringExtra("username");
var password = data.GetStringExtra("password");
LastCredentials = new AutofillCredentials
{
Username = username,
Password = password,
Uri = uri,
LastUri = _lastQueriedUri
};
}
}
catch
{
LastCredentials = null;
}
else
{
var uri = data.GetStringExtra("uri");
var username = data.GetStringExtra("username");
var password = data.GetStringExtra("password");
}
LastCredentials = new AutofillCredentials
{
Username = username,
Password = password,
Uri = uri,
LastUri = _lastQueriedUri
};
}
}
catch
{
LastCredentials = null;
}
finally
{
Xamarin.Forms.MessagingCenter.Send(Xamarin.Forms.Application.Current, "SetMainPage");
Finish();
}
Finish();
}
private void LaunchMainActivity(Intent callingIntent, int requestCode)

3
src/Android/MainActivity.cs
View File

@@ -28,7 +28,7 @@ namespace Bit.Android
protected override void OnCreate(Bundle bundle)
{
var uri = Intent.GetStringExtra("uri");
var uri = Intent.Flags.HasFlag(ActivityFlags.LaunchedFromHistory) ? null : Intent.GetStringExtra("uri");
if(Intent.HasExtra("uri"))
{
Intent.RemoveExtra("uri");
@@ -99,7 +99,6 @@ namespace Bit.Android
private void ReturnCredentials(VaultListPageModel.Login login)
{
App.App.FromAutofillService = true;
Intent data = new Intent();
if(login == null)
{