From da847f6567fba2638aa8c5f616c9d7d608df679b Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 28 Sep 2017 22:54:46 -0400
Subject: [PATCH] ios extension autofill fixes

---
 src/iOS.Extension/LoadingViewController.cs | 5 ++++-
 src/iOS.Extension/Models/LoginViewModel.cs | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/iOS.Extension/LoadingViewController.cs b/src/iOS.Extension/LoadingViewController.cs
index ddeeb5d60..36e3edf4b 100644
--- a/src/iOS.Extension/LoadingViewController.cs
+++ b/src/iOS.Extension/LoadingViewController.cs
@@ -260,7 +260,10 @@ namespace Bit.iOS.Extension
                 NSRunLoop.Main.BeginInvokeOnMainThread(() =>
                 {
                     Resolver.ResetResolver();
-                    ExtensionContext.CompleteRequest(returningItems, null);
+                    if(ExtensionContext != null)
+                    {
+                        ExtensionContext.CompleteRequest(returningItems, null);
+                    }
                 });
             });
         }
diff --git a/src/iOS.Extension/Models/LoginViewModel.cs b/src/iOS.Extension/Models/LoginViewModel.cs
index 924e4d908..319002dc4 100644
--- a/src/iOS.Extension/Models/LoginViewModel.cs
+++ b/src/iOS.Extension/Models/LoginViewModel.cs
@@ -17,7 +17,7 @@ namespace Bit.iOS.Extension.Models
             Totp = new Lazy<string>(() => login.Totp?.Decrypt(login.OrganizationId));
             Fields = new Lazy<List<Tuple<string, string>>>(() =>
             {
-                if(login.Fields?.Any() ?? true)
+                if(!login.Fields?.Any() ?? true)
                 {
                     return null;
                 }