mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-10-31 15:15:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

ios resumed

Browse source
This commit is contained in:
Kyle Spearrin 2019-06-24 17:02:05 -04:00
parent 4bc837509d
commit 4b4757d0e5
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/App/App.xaml.cs
View file

@ -114,7 +114,7 @@ namespace Bit.App
{ {
if(Device.RuntimePlatform == Device.iOS) if(Device.RuntimePlatform == Device.iOS)
{ {
SyncIfNeeded(); ResumedAsync();
} }
} }
else if(message.Command == "migrated") else if(message.Command == "migrated")
@ -179,13 +179,18 @@ namespace Bit.App
protected async override void OnResume() protected async override void OnResume()
{ {
System.Diagnostics.Debug.WriteLine("XF App: OnResume"); System.Diagnostics.Debug.WriteLine("XF App: OnResume");
if(Device.RuntimePlatform == Device.Android)
{
ResumedAsync();
}
}
private async void ResumedAsync()
{
_messagingService.Send("cancelLockTimer"); _messagingService.Send("cancelLockTimer");
await ClearCacheIfNeededAsync(); await ClearCacheIfNeededAsync();
Prime(); Prime();
if(Device.RuntimePlatform == Device.Android) SyncIfNeeded();
{
SyncIfNeeded();
}
if(Current.MainPage is NavigationPage navPage && navPage.CurrentPage is LockPage lockPage) if(Current.MainPage is NavigationPage navPage && navPage.CurrentPage is LockPage lockPage)
{ {
await lockPage.PromptFingerprintAfterResumeAsync(); await lockPage.PromptFingerprintAfterResumeAsync();

4
src/iOS/AppDelegate.cs
View file

@ -146,7 +146,7 @@ namespace Bit.iOS
public override void WillEnterForeground(UIApplication uiApplication) public override void WillEnterForeground(UIApplication uiApplication)
{ {
_messagingService.Send("Resumed"); _messagingService.Send("resumed");
base.WillEnterForeground(uiApplication); base.WillEnterForeground(uiApplication);
} }
@ -194,7 +194,7 @@ namespace Bit.iOS
_pushHandler = new iOSPushNotificationHandler( _pushHandler = new iOSPushNotificationHandler(
ServiceContainer.Resolve<IPushNotificationListenerService>("pushNotificationListenerService")); ServiceContainer.Resolve<IPushNotificationListenerService>("pushNotificationListenerService"));
_nfcDelegate = new NFCReaderDelegate((success, message) => _nfcDelegate = new NFCReaderDelegate((success, message) =>
_messagingService.Send("GotYubiKeyOTP", message)); _messagingService.Send("gotYubiKeyOTP", message));
var crashManagerDelegate = new HockeyAppCrashManagerDelegate( var crashManagerDelegate = new HockeyAppCrashManagerDelegate(
ServiceContainer.Resolve<IAppIdService>("appIdService"), ServiceContainer.Resolve<IAppIdService>("appIdService"),