null checks on dialogs

bitwarden · Mar 20, 2018 · c6a40ba · c6a40ba
1 parent aa38e79
commit c6a40ba
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 28 deletions.
diff --git a/src/Android/Resources/Resource.Designer.cs b/src/Android/Resources/Resource.Designer.cs
diff --git a/src/Android/Services/DeviceActionService.cs b/src/Android/Services/DeviceActionService.cs
@@ -474,6 +474,11 @@ public void HideLoading()
         public Task<string> DisplayPromptAync(string title = null, string description = null, string text = null)
         {
             var activity = (MainActivity)CurrentContext;
+            if(activity == null)
+            {
+                return Task.FromResult<string>(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
@@ -405,7 +405,7 @@ public static FormEntryCell MakeUriCell(string value, UriMatchType? match, Table
                     {
                         selectedVal = exactingMatchVal;
                     }
-                    else if(val != AppResources.Default)
+                    else if(val != null && val != AppResources.Default)
                     {
                         selectedVal = UriMatchOptionsMap.ElementAt(Array.IndexOf(optionsArr, val) - 1).Key;
                     }