Skip to content

cache lastVoipToken and return it when subsequently call to registerVoipToken #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 15, 2021
Merged

cache lastVoipToken and return it when subsequently call to registerVoipToken #80

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5514c80
cache lastVoipToken and return it when subsequently call to registerV…
zxcpoiu Jan 15, 2021
7532850
remove unused import
zxcpoiu Jan 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions ios/RNVoipPushNotification/RNVoipPushNotificationManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@
#import "RNVoipPushNotificationManager.h"

#import <React/RCTBridge.h>
#import <React/RCTConvert.h>
#import <React/RCTEventDispatcher.h>
#import <React/RCTLog.h>
#import <React/RCTUtils.h>

NSString *const RNVoipPushRemoteNotificationsRegisteredEvent = @"RNVoipPushRemoteNotificationsRegisteredEvent";
NSString *const RNVoipPushRemoteNotificationReceivedEvent = @"RNVoipPushRemoteNotificationReceivedEvent";
Expand All @@ -29,6 +27,7 @@ @implementation RNVoipPushNotificationManager
RCT_EXPORT_MODULE();

static bool _isVoipRegistered = NO;
static NSString *_lastVoipToken = @"";
static NSMutableDictionary<NSString *, RNVoipPushNotificationCompletion> *completionHandlers = nil;


Expand Down Expand Up @@ -125,8 +124,10 @@ + (void)voipRegistration
{
if (_isVoipRegistered) {
#ifdef DEBUG
RCTLog(@"[RNVoipPushNotificationManager] voipRegistration is already registered");
RCTLog(@"[RNVoipPushNotificationManager] voipRegistration is already registered. return _lastVoipToken = %@", _lastVoipToken);
#endif
RNVoipPushNotificationManager *voipPushManager = [RNVoipPushNotificationManager allocWithZone: nil];
[voipPushManager sendEventWithNameWrapper:RNVoipPushRemoteNotificationsRegisteredEvent body:_lastVoipToken];
} else {
_isVoipRegistered = YES;
#ifdef DEBUG
Expand Down Expand Up @@ -161,8 +162,10 @@ + (void)didUpdatePushCredentials:(PKPushCredentials *)credentials forType:(NSStr
[hexString appendFormat:@"%02x", bytes[i]];
}

_lastVoipToken = [hexString copy];

RNVoipPushNotificationManager *voipPushManager = [RNVoipPushNotificationManager allocWithZone: nil];
[voipPushManager sendEventWithNameWrapper:RNVoipPushRemoteNotificationsRegisteredEvent body:[hexString copy]];
[voipPushManager sendEventWithNameWrapper:RNVoipPushRemoteNotificationsRegisteredEvent body:_lastVoipToken];
}

// --- should be called from `AppDelegate.didReceiveIncomingPushWithPayload`
Expand Down