From c6a40bac036e050d92eb6897b09693b42b254968 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 19 Mar 2018 21:07:27 -0400 Subject: [PATCH] null checks on dialogs --- src/Android/Resources/Resource.Designer.cs | 33 ++++----------------- src/Android/Services/DeviceActionService.cs | 5 ++++ src/App/Utilities/Helpers.cs | 2 +- 3 files changed, 12 insertions(+), 28 deletions(-) diff --git a/src/Android/Resources/Resource.Designer.cs b/src/Android/Resources/Resource.Designer.cs index 81cb43c92..0b96097c2 100644 --- a/src/Android/Resources/Resource.Designer.cs +++ b/src/Android/Resources/Resource.Designer.cs @@ -6506,17 +6506,17 @@ namespace Bit.Android // aapt resource value: 0x7f0a0051 public const int ApplicationName = 2131361873; - // aapt resource value: 0x7f0a00b2 - public const int AutoFillServiceDescription = 2131361970; + // aapt resource value: 0x7f0a00ab + public const int AutoFillServiceDescription = 2131361963; - // aapt resource value: 0x7f0a00b1 - public const int AutoFillServiceSummary = 2131361969; + // aapt resource value: 0x7f0a00aa + public const int AutoFillServiceSummary = 2131361962; // aapt resource value: 0x7f0a0050 public const int Hello = 2131361872; - // aapt resource value: 0x7f0a00b3 - public const int MyVault = 2131361971; + // aapt resource value: 0x7f0a00ac + public const int MyVault = 2131361964; // aapt resource value: 0x7f0a0027 public const int abc_action_bar_home_description = 2131361831; @@ -6671,27 +6671,6 @@ namespace Bit.Android // aapt resource value: 0x7f0a000f public const int common_signin_button_text_long = 2131361807; - // aapt resource value: 0x7f0a00ac - public const int default_web_client_id = 2131361964; - - // aapt resource value: 0x7f0a00ad - public const int firebase_database_url = 2131361965; - - // aapt resource value: 0x7f0a00aa - public const int gcm_defaultSenderId = 2131361962; - - // aapt resource value: 0x7f0a00ae - public const int google_api_key = 2131361966; - - // aapt resource value: 0x7f0a00ab - public const int google_app_id = 2131361963; - - // aapt resource value: 0x7f0a00af - public const int google_crash_reporting_api_key = 2131361967; - - // aapt resource value: 0x7f0a00b0 - public const int google_storage_bucket = 2131361968; - // aapt resource value: 0x7f0a0052 public const int hockeyapp_crash_dialog_app_name_fallback = 2131361874; diff --git a/src/Android/Services/DeviceActionService.cs b/src/Android/Services/DeviceActionService.cs index 5493d604c..db3d833c6 100644 --- a/src/Android/Services/DeviceActionService.cs +++ b/src/Android/Services/DeviceActionService.cs @@ -474,6 +474,11 @@ namespace Bit.Android.Services public Task DisplayPromptAync(string title = null, string description = null, string text = null) { var activity = (MainActivity)CurrentContext; + if(activity == null) + { + return Task.FromResult(null); + } + var alertBuilder = new AlertDialog.Builder(activity); alertBuilder.SetTitle(title); alertBuilder.SetMessage(description); diff --git a/src/App/Utilities/Helpers.cs b/src/App/Utilities/Helpers.cs index d7fc50310..e1c9c35e9 100644 --- a/src/App/Utilities/Helpers.cs +++ b/src/App/Utilities/Helpers.cs @@ -405,7 +405,7 @@ namespace Bit.App.Utilities { selectedVal = exactingMatchVal; } - else if(val != AppResources.Default) + else if(val != null && val != AppResources.Default) { selectedVal = UriMatchOptionsMap.ElementAt(Array.IndexOf(optionsArr, val) - 1).Key; }