devol
/
Bitwarden-app-android-iphone-ios
mirror of https://github.com/bitwarden/mobile
1
0
Fork 0
Code Issues 2 Releases Wiki Activity

Only process push messages for the current logged in user. Do not unregister from push on logout.

This commit is contained in:
Kyle Spearrin 2016-08-20 22:18:05 -04:00
parent 7b9c00cd77
commit fb77747a1b
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Android/MainActivity.cs
View File

@ -56,7 +56,6 @@ namespace Bit.Android
Resolver.Resolve<ISyncService>(),
Resolver.Resolve<IFingerprint>(),
Resolver.Resolve<ISettings>(),
Resolver.Resolve<IPushNotification>(),
Resolver.Resolve<ILockService>(),
Resolver.Resolve<IGoogleAnalyticsService>()));

4
src/App/App.cs
View File

@ -27,7 +27,6 @@ namespace Bit.App
private readonly IAuthService _authService;
private readonly IFingerprint _fingerprint;
private readonly ISettings _settings;
private readonly IPushNotification _pushNotification;
private readonly ILockService _lockService;
private readonly IGoogleAnalyticsService _googleAnalyticsService;
@ -39,7 +38,6 @@ namespace Bit.App
ISyncService syncService,
IFingerprint fingerprint,
ISettings settings,
IPushNotification pushNotification,
ILockService lockService,
IGoogleAnalyticsService googleAnalyticsService)
{
@ -50,7 +48,6 @@ namespace Bit.App
_authService = authService;
_fingerprint = fingerprint;
_settings = settings;
_pushNotification = pushNotification;
_lockService = lockService;
_googleAnalyticsService = googleAnalyticsService;
@ -211,7 +208,6 @@ namespace Bit.App
var deviceApiRepository = Resolver.Resolve<IDeviceApiRepository>();
var appIdService = Resolver.Resolve<IAppIdService>();
_pushNotification.Unregister();
_settings.Remove(Constants.PushLastRegistrationDate);
await Task.Run(() => deviceApiRepository.PutClearTokenAsync(appIdService.AppId)).ConfigureAwait(false);
}

21
src/App/Services/PushNotificationListener.cs
View File

@ -43,6 +43,11 @@ namespace Bit.App.Services
_showNotification = false;
Debug.WriteLine("Message Arrived: {0}", JsonConvert.SerializeObject(values));
if(!_authService.IsAuthenticated)
{
return;
}
JToken token;
if(!values.TryGetValue("type", StringComparison.OrdinalIgnoreCase, out token) || token == null)
{
@ -55,18 +60,34 @@ namespace Bit.App.Services
case Enums.PushType.SyncCipherUpdate:
case Enums.PushType.SyncCipherCreate:
var createUpdateMessage = values.ToObject<SyncCipherPushNotification>();
if(createUpdateMessage.UserId != _authService.UserId)
{
break;
}
_syncService.SyncAsync(createUpdateMessage.Id);
break;
case Enums.PushType.SyncFolderDelete:
var folderDeleteMessage = values.ToObject<SyncCipherPushNotification>();
if(folderDeleteMessage.UserId != _authService.UserId)
{
break;
}
_syncService.SyncDeleteFolderAsync(folderDeleteMessage.Id, folderDeleteMessage.RevisionDate);
break;
case Enums.PushType.SyncSiteDelete:
var siteDeleteMessage = values.ToObject<SyncCipherPushNotification>();
if(siteDeleteMessage.UserId != _authService.UserId)
{
break;
}
_syncService.SyncDeleteSiteAsync(siteDeleteMessage.Id);
break;
case Enums.PushType.SyncCiphers:
var cipherMessage = values.ToObject<SyncCiphersPushNotification>();
if(cipherMessage.UserId != _authService.UserId)
{
break;
}
_syncService.FullSyncAsync();
break;
default:

1
src/iOS/AppDelegate.cs
View File

@ -65,7 +65,6 @@ namespace Bit.iOS
Resolver.Resolve<ISyncService>(),
Resolver.Resolve<IFingerprint>(),
Resolver.Resolve<ISettings>(),
Resolver.Resolve<IPushNotification>(),
Resolver.Resolve<ILockService>(),
Resolver.Resolve<IGoogleAnalyticsService>()));