Upstream/bitwarden-mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile.git synced 2024-11-23 11:45:38 +01:00
Code Issues Projects Releases Wiki Activity

cleanup push

Browse Source
This commit is contained in:
Kyle Spearrin 2017-10-10 10:55:54 -04:00
parent 04e42c4a75
commit bcbdbb4932
2 changed files with 14 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/iOS/AppDelegate.cs
View File

@ -21,7 +21,6 @@ using Google.Analytics;
using FFImageLoading.Forms.Touch; using FFImageLoading.Forms.Touch;
using SimpleInjector; using SimpleInjector;
using XLabs.Ioc.SimpleInjectorContainer; using XLabs.Ioc.SimpleInjectorContainer;
using UserNotifications;
namespace Bit.iOS namespace Bit.iOS
{ {
@ -35,9 +34,7 @@ namespace Bit.iOS
public override bool FinishedLaunching(UIApplication app, NSDictionary options) public override bool FinishedLaunching(UIApplication app, NSDictionary options)
{ {
global::Xamarin.Forms.Forms.Init(); Forms.Init();
UNUserNotificationCenter.Current.Delegate = new UserNotificationCenterDelegate();
if(!Resolver.IsSet) if(!Resolver.IsSet)
{ {
@ -80,7 +77,7 @@ namespace Bit.iOS
UINavigationBar.Appearance.ShadowImage = new UIImage(); UINavigationBar.Appearance.ShadowImage = new UIImage();
UINavigationBar.Appearance.SetBackgroundImage(new UIImage(), UIBarMetrics.Default); UINavigationBar.Appearance.SetBackgroundImage(new UIImage(), UIBarMetrics.Default);
UIBarButtonItem.AppearanceWhenContainedIn(new Type[] { typeof(UISearchBar) }).TintColor = primaryColor; UIBarButtonItem.AppearanceWhenContainedIn(new Type[] { typeof(UISearchBar) }).TintColor = primaryColor;
UIButton.AppearanceWhenContainedIn(new Type[] { typeof(UISearchBar) }).SetTitleColor(primaryColor, UIButton.AppearanceWhenContainedIn(new Type[] { typeof(UISearchBar) }).SetTitleColor(primaryColor,
UIControlState.Normal); UIControlState.Normal);
UIButton.AppearanceWhenContainedIn(new Type[] { typeof(UISearchBar) }).TintColor = primaryColor; UIButton.AppearanceWhenContainedIn(new Type[] { typeof(UISearchBar) }).TintColor = primaryColor;
UIStepper.Appearance.TintColor = grayLight; UIStepper.Appearance.TintColor = grayLight;
@ -113,7 +110,7 @@ namespace Bit.iOS
UIApplication.SharedApplication.StatusBarHidden = false; UIApplication.SharedApplication.StatusBarHidden = false;
UIApplication.SharedApplication.StatusBarStyle = UIStatusBarStyle.LightContent; UIApplication.SharedApplication.StatusBarStyle = UIStatusBarStyle.LightContent;
MessagingCenter.Subscribe<Xamarin.Forms.Application, bool>(Xamarin.Forms.Application.Current, MessagingCenter.Subscribe<Xamarin.Forms.Application, bool>(Xamarin.Forms.Application.Current,
"ShowStatusBar", (sender, show) => "ShowStatusBar", (sender, show) =>
{ {
UIApplication.SharedApplication.SetStatusBarHidden(!show, false); UIApplication.SharedApplication.SetStatusBarHidden(!show, false);
@ -158,7 +155,6 @@ namespace Bit.iOS
Debug.WriteLine("DidEnterBackground"); Debug.WriteLine("DidEnterBackground");
} }
public override void OnResignActivation(UIApplication uiApplication) public override void OnResignActivation(UIApplication uiApplication)
{ {
base.OnResignActivation(uiApplication); base.OnResignActivation(uiApplication);
@ -198,7 +194,7 @@ namespace Bit.iOS
Debug.WriteLine("WillEnterForeground"); Debug.WriteLine("WillEnterForeground");
} }
public override bool OpenUrl(UIApplication application, NSUrl url, string sourceApplication, public override bool OpenUrl(UIApplication application, NSUrl url, string sourceApplication,
NSObject annotation) NSObject annotation)
{ {
return true; return true;
@ -206,40 +202,40 @@ namespace Bit.iOS
public override void FailedToRegisterForRemoteNotifications(UIApplication application, NSError error) public override void FailedToRegisterForRemoteNotifications(UIApplication application, NSError error)
{ {
if(CrossPushNotification.Current is IPushNotificationHandler) if(CrossPushNotification.Current is IPushNotificationHandler handler)
{ {
((IPushNotificationHandler)CrossPushNotification.Current).OnErrorReceived(error); handler.OnErrorReceived(error);
} }
} }
public override void RegisteredForRemoteNotifications(UIApplication application, NSData deviceToken) public override void RegisteredForRemoteNotifications(UIApplication application, NSData deviceToken)
{ {
if(CrossPushNotification.Current is IPushNotificationHandler) if(CrossPushNotification.Current is IPushNotificationHandler handler)
{ {
((IPushNotificationHandler)CrossPushNotification.Current).OnRegisteredSuccess(deviceToken); handler.OnRegisteredSuccess(deviceToken);
} }
} }
public override void DidRegisterUserNotificationSettings(UIApplication application, public override void DidRegisterUserNotificationSettings(UIApplication application,
UIUserNotificationSettings notificationSettings) UIUserNotificationSettings notificationSettings)
{ {
application.RegisterForRemoteNotifications(); application.RegisterForRemoteNotifications();
} }
public override void DidReceiveRemoteNotification(UIApplication application, NSDictionary userInfo, public override void DidReceiveRemoteNotification(UIApplication application, NSDictionary userInfo,
Action<UIBackgroundFetchResult> completionHandler) Action<UIBackgroundFetchResult> completionHandler)
{ {
if(CrossPushNotification.Current is IPushNotificationHandler) if(CrossPushNotification.Current is IPushNotificationHandler handler)
{ {
((IPushNotificationHandler)CrossPushNotification.Current).OnMessageReceived(userInfo); handler.OnMessageReceived(userInfo);
} }
} }
public override void ReceivedRemoteNotification(UIApplication application, NSDictionary userInfo) public override void ReceivedRemoteNotification(UIApplication application, NSDictionary userInfo)
{ {
if(CrossPushNotification.Current is IPushNotificationHandler) if(CrossPushNotification.Current is IPushNotificationHandler handler)
{ {
((IPushNotificationHandler)CrossPushNotification.Current).OnMessageReceived(userInfo); handler.OnMessageReceived(userInfo);
} }
} }

14
src/iOS/Services/iOSPushNotificationService.cs
View File

@ -105,20 +105,6 @@ namespace Bit.iOS.Services
void OnUnregisteredSuccess(); void OnUnregisteredSuccess();
} }
public class UserNotificationCenterDelegate : UNUserNotificationCenterDelegate
{
public override void WillPresentNotification(UNUserNotificationCenter center,
UNNotification notification, Action<UNNotificationPresentationOptions> completionHandler)
{
Debug.WriteLine("WillPresentNotification: {0}", notification);
if(CrossPushNotification.Current is IPushNotificationHandler)
{
//((IPushNotificationHandler)CrossPushNotification.Current).OnMessageReceived();
}
}
}
internal class CrossPushNotification internal class CrossPushNotification
{ {
private static Lazy<IPushNotificationService> Implementation = new Lazy<IPushNotificationService>( private static Lazy<IPushNotificationService> Implementation = new Lazy<IPushNotificationService>(