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

no lock time updates from ios extension

Browse source
This commit is contained in:
Kyle Spearrin 2017-12-27 23:39:55 -05:00
parent c60cefd188
commit e4f3671ae0
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/App/Services/LockService.cs
View file

@ -76,7 +76,11 @@ namespace Bit.App.Services
} }
// Set the new lock timer id // Set the new lock timer id
_appSettings.LockTimerId = _timerId; if(_timerId != null)
{
_appSettings.LockTimerId = _timerId;
}
if(returnNone) if(returnNone)
{ {
return LockType.None; return LockType.None;

5
src/iOS.Extension/LoadingViewController.cs
View file

@ -31,7 +31,6 @@ namespace Bit.iOS.Extension
private readonly JsonSerializerSettings _jsonSettings = private readonly JsonSerializerSettings _jsonSettings =
new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }; new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore };
private IGoogleAnalyticsService _googleAnalyticsService; private IGoogleAnalyticsService _googleAnalyticsService;
private ILockService _lockService;
public LoadingViewController(IntPtr handle) : base(handle) public LoadingViewController(IntPtr handle) : base(handle)
{ } { }
@ -45,7 +44,6 @@ namespace Bit.iOS.Extension
View.BackgroundColor = new UIColor(red: 0.94f, green: 0.94f, blue: 0.96f, alpha: 1.0f); View.BackgroundColor = new UIColor(red: 0.94f, green: 0.94f, blue: 0.96f, alpha: 1.0f);
_context.ExtContext = ExtensionContext; _context.ExtContext = ExtensionContext;
_googleAnalyticsService = Resolver.Resolve<IGoogleAnalyticsService>(); _googleAnalyticsService = Resolver.Resolve<IGoogleAnalyticsService>();
_lockService = Resolver.Resolve<ILockService>();
if(!_setupHockeyApp) if(!_setupHockeyApp)
{ {
@ -176,8 +174,6 @@ namespace Bit.iOS.Extension
private void ContinueOn() private void ContinueOn()
{ {
Debug.WriteLine("BW Log, Segue to setup, login add or list."); Debug.WriteLine("BW Log, Segue to setup, login add or list.");
_lockService.UpdateLastActivity();
if(_context.ProviderType == Constants.UTTypeAppExtensionSaveLoginAction) if(_context.ProviderType == Constants.UTTypeAppExtensionSaveLoginAction)
{ {
PerformSegue("newLoginSegue", this); PerformSegue("newLoginSegue", this);
@ -247,7 +243,6 @@ namespace Bit.iOS.Extension
if(itemData != null) if(itemData != null)
{ {
_lockService.UpdateLastActivity();
_googleAnalyticsService.TrackExtensionEvent("AutoFilled", _context.ProviderType); _googleAnalyticsService.TrackExtensionEvent("AutoFilled", _context.ProviderType);
} }
else else