iOS Core project to house common iOS code between app and extension

2025-12-21 18:53:29 +00:00 · 2016-05-28 16:06:53 -04:00
parent 46f480740c
commit cb82fdf31b
12 changed files with 281 additions and 7 deletions
--- a/src/iOS.Extension/ActionViewController.cs
+++ b/src/iOS.Extension/ActionViewController.cs
@@ -1,8 +1,17 @@
 using System;
+using System.Diagnostics;
+using System.Linq;
+using Bit.App.Abstractions;
+using Bit.App.Repositories;
+using Bit.App.Services;
+using Bit.iOS.Core.Services;
 using CoreGraphics;
 using Foundation;
+using Microsoft.Practices.Unity;
 using MobileCoreServices;
 using UIKit;
+using XLabs.Ioc;
+using XLabs.Ioc.Unity;

 namespace Bit.iOS.Extension
 {
@@ -10,18 +19,52 @@ namespace Bit.iOS.Extension
    {
        public ActionViewController() : base("ActionViewController", null)
        {
+            if(!Resolver.IsSet)
+            {
+                SetIoc();
+            }
        }

        public string HtmlContent { get; set; }
        public Uri BaseUri { get; set; }
        public Uri Url { get; set; }

+        private void SetIoc()
+        {
+            var container = new UnityContainer();
+
+            container
+                // Services
+                .RegisterType<IDatabaseService, DatabaseService>(new ContainerControlledLifetimeManager())
+                .RegisterType<ISqlService, SqlService>(new ContainerControlledLifetimeManager())
+                //.RegisterType<ISecureStorageService, KeyChainStorageService>(new ContainerControlledLifetimeManager())
+                .RegisterType<ICryptoService, CryptoService>(new ContainerControlledLifetimeManager())
+                .RegisterType<IAuthService, AuthService>(new ContainerControlledLifetimeManager())
+                .RegisterType<IFolderService, FolderService>(new ContainerControlledLifetimeManager())
+                .RegisterType<ISiteService, SiteService>(new ContainerControlledLifetimeManager())
+                .RegisterType<ISyncService, SyncService>(new ContainerControlledLifetimeManager())
+                //.RegisterType<IClipboardService, ClipboardService>(new ContainerControlledLifetimeManager())
+                // Repositories
+                .RegisterType<IFolderRepository, FolderRepository>(new ContainerControlledLifetimeManager())
+                .RegisterType<IFolderApiRepository, FolderApiRepository>(new ContainerControlledLifetimeManager())
+                .RegisterType<ISiteRepository, SiteRepository>(new ContainerControlledLifetimeManager())
+                .RegisterType<ISiteApiRepository, SiteApiRepository>(new ContainerControlledLifetimeManager())
+                .RegisterType<IAuthApiRepository, AuthApiRepository>(new ContainerControlledLifetimeManager());
+                // Other
+                //.RegisterInstance(CrossSettings.Current, new ContainerControlledLifetimeManager())
+                //.RegisterInstance(CrossConnectivity.Current, new ContainerControlledLifetimeManager())
+                //.RegisterInstance(UserDialogs.Instance, new ContainerControlledLifetimeManager())
+                //.RegisterInstance(CrossFingerprint.Current, new ContainerControlledLifetimeManager());
+
+            Resolver.SetResolver(new UnityResolver(container));
+        }
+
        public override void DidReceiveMemoryWarning()
        {
            base.DidReceiveMemoryWarning();
        }

-        public override void LoadView()
+        public async override void LoadView()
        {
            View = new UIView(new CGRect(x: 0.0, y: 0, width: 320.0, height: 200.0));
            var button = new UIButton(new CGRect(x: 10.0, y: 50.0, width: 200.0, height: 30.0));
--- a/src/iOS.Extension/Entitlements.plist
+++ b/src/iOS.Extension/Entitlements.plist
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict/>
+<dict>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>group.com.bitwarden.vault</string>
+	</array>
+	<key>keychain-access-groups</key>
+	<array>
+		<string>$(AppIdentifierPrefix)keychain.com.bitwarden.vault</string>
+	</array>
+</dict>
 </plist>
--- a/src/iOS.Extension/iOS.Extension.csproj
+++ b/src/iOS.Extension/iOS.Extension.csproj
@@ -10,6 +10,8 @@
    <AssemblyName>BitiOSExtension</AssemblyName>
    <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
    <DebugSymbols>true</DebugSymbols>
@@ -97,17 +99,53 @@
    <None Include="Info.plist" />
    <None Include="Entitlements.plist" />
    <Compile Include="Properties\AssemblyInfo.cs" />
+    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
+    <Reference Include="Microsoft.Practices.Unity, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Unity.3.5.1405-prerelease\lib\portable-net45+wp80+win8+wpa81+MonoAndroid10+MonoTouch10\Microsoft.Practices.Unity.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLite-net, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\sqlite-net-pcl.1.1.1\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLite-net.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Xml" />
    <Reference Include="System.Core" />
    <Reference Include="Xamarin.iOS" />
+    <Reference Include="XLabs.Ioc, Version=2.0.5782.12218, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.IoC.2.0.5782\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\XLabs.Ioc.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.Ioc.Unity, Version=2.0.5782.12230, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.IoC.Unity.2.0.5782\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\XLabs.Ioc.Unity.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
  </ItemGroup>
  <ItemGroup>
    <Content Include="extension.js">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\App\App.csproj">
+      <Project>{b490c5da-639e-4994-abd2-54222b8a348e}</Project>
+      <Name>App</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\iOS.Core\iOS.Core.csproj">
+      <Project>{b2538ada-b605-4d6f-acd2-62a409680f84}</Project>
+      <Name>iOS.Core</Name>
+      <IsAppExtension>false</IsAppExtension>
+      <IsWatchApp>false</IsWatchApp>
+    </ProjectReference>
+  </ItemGroup>
  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.AppExtension.CSharp.targets" />
+  <Import Project="..\..\packages\SQLitePCL.raw.0.8.6\build\Xamarin.iOS10\SQLitePCL.raw.targets" Condition="Exists('..\..\packages\SQLitePCL.raw.0.8.6\build\Xamarin.iOS10\SQLitePCL.raw.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\SQLitePCL.raw.0.8.6\build\Xamarin.iOS10\SQLitePCL.raw.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCL.raw.0.8.6\build\Xamarin.iOS10\SQLitePCL.raw.targets'))" />
+  </Target>
 </Project>
--- a/src/iOS.Extension/packages.config
+++ b/src/iOS.Extension/packages.config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="sqlite-net-pcl" version="1.1.1" targetFramework="xamarinios10" />
+  <package id="SQLitePCL.raw" version="0.8.6" targetFramework="xamarinios10" />
+  <package id="Unity" version="3.5.1405-prerelease" targetFramework="xamarinios10" />
+  <package id="XLabs.IoC" version="2.0.5782" targetFramework="xamarinios10" />
+  <package id="XLabs.IoC.Unity" version="2.0.5782" targetFramework="xamarinios10" />
+</packages>