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

use background tasks to keep timers alive

Browse Source
This commit is contained in:
Kyle Spearrin 2019-07-01 23:44:47 -04:00
parent 4a294d6a77
commit ab3bebf06a
2 changed files with 60 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/App/Pages/Settings/OptionsPageViewModel.cs
View File

@ -46,6 +46,7 @@ namespace Bit.App.Pages
_messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService"); _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
PageTitle = AppResources.Options; PageTitle = AppResources.Options;
var iosIos = Device.RuntimePlatform == Device.iOS;
ClearClipboardOptions = new List<KeyValuePair<int?, string>> ClearClipboardOptions = new List<KeyValuePair<int?, string>>
{ {
@ -53,10 +54,13 @@ namespace Bit.App.Pages
new KeyValuePair<int?, string>(10, AppResources.TenSeconds), new KeyValuePair<int?, string>(10, AppResources.TenSeconds),
new KeyValuePair<int?, string>(20, AppResources.TwentySeconds), new KeyValuePair<int?, string>(20, AppResources.TwentySeconds),
new KeyValuePair<int?, string>(30, AppResources.ThirtySeconds), new KeyValuePair<int?, string>(30, AppResources.ThirtySeconds),
new KeyValuePair<int?, string>(60, AppResources.OneMinute), new KeyValuePair<int?, string>(60, AppResources.OneMinute)
new KeyValuePair<int?, string>(120, AppResources.TwoMinutes),
new KeyValuePair<int?, string>(300, AppResources.FiveMinutes),
}; };
if(!iosIos)
{
ClearClipboardOptions.Add(new KeyValuePair<int?, string>(120, AppResources.TwoMinutes));
ClearClipboardOptions.Add(new KeyValuePair<int?, string>(300, AppResources.FiveMinutes));
}
ThemeOptions = new List<KeyValuePair<string, string>> ThemeOptions = new List<KeyValuePair<string, string>>
{ {
new KeyValuePair<string, string>(null, AppResources.Default), new KeyValuePair<string, string>(null, AppResources.Default),

53
src/iOS/AppDelegate.cs
View File

@ -27,7 +27,9 @@ namespace Bit.iOS
private iOSPushNotificationHandler _pushHandler = null; private iOSPushNotificationHandler _pushHandler = null;
private NFCReaderDelegate _nfcDelegate = null; private NFCReaderDelegate _nfcDelegate = null;
private NSTimer _clipboardTimer = null; private NSTimer _clipboardTimer = null;
private nint _clipboardBackgroundTaskId;
private NSTimer _lockTimer = null; private NSTimer _lockTimer = null;
private nint _lockBackgroundTaskId;
private IDeviceActionService _deviceActionService; private IDeviceActionService _deviceActionService;
private IMessagingService _messagingService; private IMessagingService _messagingService;
@ -65,7 +67,11 @@ namespace Bit.iOS
} }
else if(message.Command == "copiedToClipboard") else if(message.Command == "copiedToClipboard")
{ {
await ClearClipboardTimerAsync(message.Data as Tuple<string, int?, bool>);
Device.BeginInvokeOnMainThread(() =>
{
var task = ClearClipboardTimerAsync(message.Data as Tuple<string, int?, bool>);
});
} }
else if(message.Command == "listenYubiKeyOTP") else if(message.Command == "listenYubiKeyOTP")
{ {
@ -281,11 +287,21 @@ namespace Bit.iOS
private void LockTimer(int lockOptionMinutes) private void LockTimer(int lockOptionMinutes)
{ {
if(_lockBackgroundTaskId > 0)
{
UIApplication.SharedApplication.EndBackgroundTask(_lockBackgroundTaskId);
_lockBackgroundTaskId = 0;
}
_lockBackgroundTaskId = UIApplication.SharedApplication.BeginBackgroundTask(() =>
{
UIApplication.SharedApplication.EndBackgroundTask(_lockBackgroundTaskId);
_lockBackgroundTaskId = 0;
});
var lockOptionMs = lockOptionMinutes * 60000; var lockOptionMs = lockOptionMinutes * 60000;
_lockTimer?.Invalidate(); _lockTimer?.Invalidate();
_lockTimer?.Dispose(); _lockTimer?.Dispose();
_lockTimer = null; _lockTimer = null;
var lockMsSpan = TimeSpan.FromMilliseconds(lockOptionMs + 10); var lockMsSpan = TimeSpan.FromMilliseconds(10000 + 10);
Device.BeginInvokeOnMainThread(() => Device.BeginInvokeOnMainThread(() =>
{ {
_lockTimer = NSTimer.CreateScheduledTimer(lockMsSpan, timer => _lockTimer = NSTimer.CreateScheduledTimer(lockMsSpan, timer =>
@ -296,6 +312,11 @@ namespace Bit.iOS
_lockTimer?.Invalidate(); _lockTimer?.Invalidate();
_lockTimer?.Dispose(); _lockTimer?.Dispose();
_lockTimer = null; _lockTimer = null;
if(_lockBackgroundTaskId > 0)
{
UIApplication.SharedApplication.EndBackgroundTask(_lockBackgroundTaskId);
_lockBackgroundTaskId = 0;
}
}); });
}); });
}); });
@ -306,6 +327,11 @@ namespace Bit.iOS
_lockTimer?.Invalidate(); _lockTimer?.Invalidate();
_lockTimer?.Dispose(); _lockTimer?.Dispose();
_lockTimer = null; _lockTimer = null;
if(_lockBackgroundTaskId > 0)
{
UIApplication.SharedApplication.EndBackgroundTask(_lockBackgroundTaskId);
_lockBackgroundTaskId = 0;
}
} }
private async Task ClearClipboardTimerAsync(Tuple<string, int?, bool> data) private async Task ClearClipboardTimerAsync(Tuple<string, int?, bool> data)
@ -327,25 +353,38 @@ namespace Bit.iOS
{ {
return; return;
} }
if(_clipboardBackgroundTaskId > 0)
{
UIApplication.SharedApplication.EndBackgroundTask(_clipboardBackgroundTaskId);
_clipboardBackgroundTaskId = 0;
}
_clipboardBackgroundTaskId = UIApplication.SharedApplication.BeginBackgroundTask(() =>
{
UIApplication.SharedApplication.EndBackgroundTask(_clipboardBackgroundTaskId);
_clipboardBackgroundTaskId = 0;
});
_clipboardTimer?.Invalidate(); _clipboardTimer?.Invalidate();
_clipboardTimer?.Dispose(); _clipboardTimer?.Dispose();
_clipboardTimer = null; _clipboardTimer = null;
var lastClipboardValue = data.Item1; var lastClipboardChangeCount = UIPasteboard.General.ChangeCount;
var clearMsSpan = TimeSpan.FromMilliseconds(clearMs.Value); var clearMsSpan = TimeSpan.FromMilliseconds(clearMs.Value);
Device.BeginInvokeOnMainThread(() =>
{
_clipboardTimer = NSTimer.CreateScheduledTimer(clearMsSpan, timer => _clipboardTimer = NSTimer.CreateScheduledTimer(clearMsSpan, timer =>
{ {
Device.BeginInvokeOnMainThread(() => Device.BeginInvokeOnMainThread(() =>
{ {
if(lastClipboardValue == UIPasteboard.General.String) var changeNow = UIPasteboard.General.ChangeCount;
if(changeNow == 0 || lastClipboardChangeCount == changeNow)
{ {
UIPasteboard.General.String = string.Empty; UIPasteboard.General.String = string.Empty;
} }
_clipboardTimer?.Invalidate(); _clipboardTimer?.Invalidate();
_clipboardTimer?.Dispose(); _clipboardTimer?.Dispose();
_clipboardTimer = null; _clipboardTimer = null;
}); if(_clipboardBackgroundTaskId > 0)
{
UIApplication.SharedApplication.EndBackgroundTask(_clipboardBackgroundTaskId);
_clipboardBackgroundTaskId = 0;
}
}); });
}); });
} }