diff --git a/src/iOS.Extension/ActionViewController.cs b/src/iOS.Extension/ActionViewController.cs index 6df60942c..f1d008983 100644 --- a/src/iOS.Extension/ActionViewController.cs +++ b/src/iOS.Extension/ActionViewController.cs @@ -40,7 +40,7 @@ namespace Bit.iOS.Extension var siteService = Resolver.Resolve(); var sites = await siteService.GetAllAsync(); var siteModels = sites.Select(s => new SiteViewModel(s)); - filteredSiteModels = siteModels.Where(s => s.Domain.BaseDomain == domain.BaseDomain); + filteredSiteModels = siteModels.Where(s => s.Domain != null && s.Domain.BaseDomain == domain.BaseDomain); } tableView.RowHeight = UITableView.AutomaticDimension; diff --git a/src/iOS.Extension/LoadingViewController.cs b/src/iOS.Extension/LoadingViewController.cs index 82304ee91..66ab250f8 100644 --- a/src/iOS.Extension/LoadingViewController.cs +++ b/src/iOS.Extension/LoadingViewController.cs @@ -15,6 +15,7 @@ using Newtonsoft.Json; using Bit.iOS.Extension.Models; using MobileCoreServices; using Plugin.Settings.Abstractions; +using Plugin.Connectivity; namespace Bit.iOS.Extension { @@ -101,9 +102,9 @@ namespace Bit.iOS.Extension .RegisterType(new ContainerControlledLifetimeManager()) .RegisterType(new ContainerControlledLifetimeManager()) .RegisterType(new ContainerControlledLifetimeManager()) - .RegisterType(new ContainerControlledLifetimeManager()); + .RegisterType(new ContainerControlledLifetimeManager()) // Other - //.RegisterInstance(CrossConnectivity.Current, new ContainerControlledLifetimeManager()) + .RegisterInstance(CrossConnectivity.Current, new ContainerControlledLifetimeManager()); //.RegisterInstance(UserDialogs.Instance, new ContainerControlledLifetimeManager()) //.RegisterInstance(CrossFingerprint.Current, new ContainerControlledLifetimeManager()); diff --git a/src/iOS.Extension/iOS.Extension.csproj b/src/iOS.Extension/iOS.Extension.csproj index 292fee013..ba7dfd016 100644 --- a/src/iOS.Extension/iOS.Extension.csproj +++ b/src/iOS.Extension/iOS.Extension.csproj @@ -119,6 +119,14 @@ + + ..\..\packages\Xam.Plugin.Connectivity.2.1.2\lib\Xamarin.iOS10\Plugin.Connectivity.dll + True + + + ..\..\packages\Xam.Plugin.Connectivity.2.1.2\lib\Xamarin.iOS10\Plugin.Connectivity.Abstractions.dll + True + ..\..\packages\Xam.Plugins.Settings.2.1.0\lib\Xamarin.iOS10\Plugin.Settings.dll True diff --git a/src/iOS.Extension/packages.config b/src/iOS.Extension/packages.config index 4cb7a7c74..d35572211 100644 --- a/src/iOS.Extension/packages.config +++ b/src/iOS.Extension/packages.config @@ -5,6 +5,7 @@ +