From 7a19c50ec019e32fbc39c1dae6c20f5873f94226 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Fri, 22 Dec 2017 18:34:46 -0500 Subject: [PATCH] autofill fixes --- src/Android/Autofill/AutofillService.cs | 5 +++- src/Android/Resources/Resource.Designer.cs | 33 ++++------------------ src/Android/Services/AppInfoService.cs | 2 +- 3 files changed, 11 insertions(+), 29 deletions(-) diff --git a/src/Android/Autofill/AutofillService.cs b/src/Android/Autofill/AutofillService.cs index d348c310c..12adf851d 100644 --- a/src/Android/Autofill/AutofillService.cs +++ b/src/Android/Autofill/AutofillService.cs @@ -88,7 +88,10 @@ namespace Bit.Android.Autofill switch(savedItem.Type) { case CipherType.Login: - intent.PutExtra("autofillFrameworkName", parser.Uri.Replace(Constants.AndroidAppProtocol, string.Empty)); + intent.PutExtra("autofillFrameworkName", parser.Uri + .Replace(Constants.AndroidAppProtocol, string.Empty) + .Replace("https://", string.Empty) + .Replace("http://", string.Empty)); intent.PutExtra("autofillFrameworkUri", parser.Uri); intent.PutExtra("autofillFrameworkUsername", savedItem.Login.Username); intent.PutExtra("autofillFrameworkPassword", savedItem.Login.Password); diff --git a/src/Android/Resources/Resource.Designer.cs b/src/Android/Resources/Resource.Designer.cs index cfc2115d4..8677cf1ee 100644 --- a/src/Android/Resources/Resource.Designer.cs +++ b/src/Android/Resources/Resource.Designer.cs @@ -4375,17 +4375,17 @@ namespace Bit.Android // aapt resource value: 0x7f090051 public const int ApplicationName = 2131296337; - // aapt resource value: 0x7f0900b2 - public const int AutoFillServiceDescription = 2131296434; + // aapt resource value: 0x7f0900ab + public const int AutoFillServiceDescription = 2131296427; - // aapt resource value: 0x7f0900b1 - public const int AutoFillServiceSummary = 2131296433; + // aapt resource value: 0x7f0900aa + public const int AutoFillServiceSummary = 2131296426; // aapt resource value: 0x7f090050 public const int Hello = 2131296336; - // aapt resource value: 0x7f0900b3 - public const int MyVault = 2131296435; + // aapt resource value: 0x7f0900ac + public const int MyVault = 2131296428; // aapt resource value: 0x7f090027 public const int abc_action_bar_home_description = 2131296295; @@ -4540,27 +4540,6 @@ namespace Bit.Android // aapt resource value: 0x7f09000f public const int common_signin_button_text_long = 2131296271; - // aapt resource value: 0x7f0900ac - public const int default_web_client_id = 2131296428; - - // aapt resource value: 0x7f0900ad - public const int firebase_database_url = 2131296429; - - // aapt resource value: 0x7f0900aa - public const int gcm_defaultSenderId = 2131296426; - - // aapt resource value: 0x7f0900ae - public const int google_api_key = 2131296430; - - // aapt resource value: 0x7f0900ab - public const int google_app_id = 2131296427; - - // aapt resource value: 0x7f0900af - public const int google_crash_reporting_api_key = 2131296431; - - // aapt resource value: 0x7f0900b0 - public const int google_storage_bucket = 2131296432; - // aapt resource value: 0x7f090052 public const int hockeyapp_crash_dialog_app_name_fallback = 2131296338; diff --git a/src/Android/Services/AppInfoService.cs b/src/Android/Services/AppInfoService.cs index bc491939c..01ccdbbc4 100644 --- a/src/Android/Services/AppInfoService.cs +++ b/src/Android/Services/AppInfoService.cs @@ -35,7 +35,7 @@ namespace Bit.Android.Services var activity = (MainActivity)CrossCurrentActivity.Current.Activity; var afm = (AutofillManager)activity.GetSystemService(Java.Lang.Class.FromType(typeof(AutofillManager))); - return afm.IsEnabled; + return afm.IsEnabled && afm.HasEnabledAutofillServices; } } }