Skip to content

Commit 4c2922c

Browse files
committed
Fixes for comments related to iOS outcomes
* Removed all null checks for delegates since now the CreateNSString method returns an empty string * Changed name of processDelegate to isValidDelegate for both helper methods * Made delegates Dictionary private
1 parent 6b3f50f commit 4c2922c

File tree

5 files changed

+68
-99
lines changed

5 files changed

+68
-99
lines changed

OneSignalExample/Assets/OneSignal/Platforms/iOS/OneSignalUnityRuntime.m

Lines changed: 13 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,7 @@ void _deleteTags(const char* keys) {
245245
}
246246

247247
void _getTags(const char* delegate) {
248-
NSString* delegateId = @"";
249-
if (delegate)
250-
delegateId = CreateNSString(delegate);
248+
NSString* delegateId = CreateNSString(delegate);
251249

252250
[OneSignal getTags:^(NSDictionary* result) {
253251
if (!result)
@@ -261,9 +259,7 @@ void _getTags(const char* delegate) {
261259
}
262260

263261
void _idsAvailable(const char* delegate) {
264-
NSString* delegateId = @"";
265-
if (delegate)
266-
delegateId = CreateNSString(delegate);
262+
NSString* delegateId = CreateNSString(delegate);
267263

268264
[OneSignal IdsAvailable:^(NSString* userId, NSString* pushToken) {
269265
if (!userId)
@@ -284,13 +280,8 @@ void _setSubscription(BOOL enable) {
284280
}
285281

286282
void _postNotification(const char* delegateSuccess, const char* delegateFailure, const char* jsonData) {
287-
NSString* delegateIdSuccess = @"";
288-
if (delegateSuccess)
289-
delegateIdSuccess = CreateNSString(delegateSuccess);
290-
291-
NSString* delegateIdFailure = @"";
292-
if (delegateFailure)
293-
delegateIdFailure = CreateNSString(delegateFailure);
283+
NSString* delegateIdSuccess = CreateNSString(delegateSuccess);
284+
NSString* delegateIdFailure = CreateNSString(delegateFailure);
294285

295286
NSString* delegate = dictionaryToNSString(@{ @"success" : delegateIdSuccess, @"failure" : delegateIdFailure });
296287

@@ -372,13 +363,8 @@ void _setOneSignalLogLevel(int logLevel, int visualLogLevel) {
372363
}
373364

374365
void _setUnauthenticatedEmail(const char* delegateSuccess, const char* delegateFailure, const char* email) {
375-
NSString* delegateIdSuccess = @"";
376-
if (delegateSuccess)
377-
delegateIdSuccess = CreateNSString(delegateSuccess);
378-
379-
NSString* delegateIdFailure = @"";
380-
if (delegateFailure)
381-
delegateIdFailure = CreateNSString(delegateFailure);
366+
NSString* delegateIdSuccess = CreateNSString(delegateSuccess);
367+
NSString* delegateIdFailure = CreateNSString(delegateFailure);
382368

383369
NSString* delegate = dictionaryToNSString(@{ @"success" : delegateIdSuccess, @"failure" : delegateIdFailure });
384370

@@ -394,13 +380,8 @@ void _setUnauthenticatedEmail(const char* delegateSuccess, const char* delegateF
394380
}
395381

396382
void _setEmail(const char* delegateSuccess, const char* delegateFailure, const char *email, const char *emailAuthCode) {
397-
NSString* delegateIdSuccess = @"";
398-
if (delegateSuccess)
399-
delegateIdSuccess = CreateNSString(delegateSuccess);
400-
401-
NSString* delegateIdFailure = @"";
402-
if (delegateFailure)
403-
delegateIdFailure = CreateNSString(delegateFailure);
383+
NSString* delegateIdSuccess = CreateNSString(delegateSuccess);
384+
NSString* delegateIdFailure = CreateNSString(delegateFailure);
404385

405386
NSString* delegate = dictionaryToNSString(@{ @"success" : delegateIdSuccess, @"failure" : delegateIdFailure });
406387

@@ -416,13 +397,8 @@ void _setEmail(const char* delegateSuccess, const char* delegateFailure, const c
416397
}
417398

418399
void _logoutEmail(const char* delegateSuccess, const char* delegateFailure) {
419-
NSString* delegateIdSuccess = @"";
420-
if (delegateSuccess)
421-
delegateIdSuccess = CreateNSString(delegateSuccess);
422-
423-
NSString* delegateIdFailure = @"";
424-
if (delegateFailure)
425-
delegateIdFailure = CreateNSString(delegateFailure);
400+
NSString* delegateIdSuccess = CreateNSString(delegateSuccess);
401+
NSString* delegateIdFailure = CreateNSString(delegateFailure);
426402

427403
NSString* delegate = dictionaryToNSString(@{ @"success" : delegateIdSuccess, @"failure" : delegateIdFailure });
428404

@@ -499,27 +475,21 @@ void _pauseInAppMessages(bool pause) {
499475
}
500476

501477
void _sendOutcome(const char* delegate, char* name) {
502-
NSString* delegateId = @"";
503-
if (delegate)
504-
delegateId = CreateNSString(delegate);
478+
NSString* delegateId = CreateNSString(delegate);
505479

506480
[OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:@"Method sendOutcome() not implemented for iOS yet!"];
507481
return;
508482
}
509483

510484
void _sendUniqueOutcome(const char* delegate, char* name) {
511-
NSString* delegateId = @"";
512-
if (delegate)
513-
delegateId = CreateNSString(delegate);
485+
NSString* delegateId = CreateNSString(delegate);
514486

515487
[OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:@"Method sendUniqueOutcome() not implemented for iOS yet!"];
516488
return;
517489
}
518490

519491
void _sendOutcomeWithValue(const char* delegate, char* name, float value) {
520-
NSString* delegateId = @"";
521-
if (delegate)
522-
delegateId = CreateNSString(delegate);
492+
NSString* delegateId = CreateNSString(delegate);
523493

524494
[OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:@"Method sendOutcomeWithValue() not implemented for iOS yet!"];
525495
return;
Binary file not shown.

0 commit comments

Comments
 (0)