Skip to content

Remove innocuous warning and use framework in dev app #912

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 3 commits into from
Apr 8, 2021
Merged

Remove innocuous warning and use framework in dev app #912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ccb50bf
removing innocuous warning
emawby Apr 7, 2021
be050b0
Using EqualObjects for string comparison
emawby Apr 7, 2021
a0f24b1
using framework in dev app
emawby Apr 7, 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
18 changes: 12 additions & 6 deletions iOS_SDK/OneSignalDevApp/OneSignalExample.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@
91B6EA0C1E834BD800B5CF01 /* sentImage.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 91B6EA091E834B1700B5CF01 /* sentImage.jpg */; };
CACBAAB6218A7136000ACAA5 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CACBAAB5218A7136000ACAA5 /* WebKit.framework */; };
CACBAAB7218A713C000ACAA5 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CACBAAB5218A7136000ACAA5 /* WebKit.framework */; };
DE138BFE2523CFA300AB46A3 /* libOneSignal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DE138BFD2523CFA300AB46A3 /* libOneSignal.a */; };
DE138C002523CFA700AB46A3 /* libOneSignal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DE138BFF2523CFA700AB46A3 /* libOneSignal.a */; };
DE138C022523CFAD00AB46A3 /* libOneSignal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DE138C012523CFAD00AB46A3 /* libOneSignal.a */; };
DE68DA5B24C7695900FC95A8 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DE68DA5A24C7695900FC95A8 /* AppDelegate.m */; };
DE68DA5E24C7695900FC95A8 /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DE68DA5D24C7695900FC95A8 /* SceneDelegate.m */; };
DE68DA6124C7695900FC95A8 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DE68DA6024C7695900FC95A8 /* ViewController.m */; };
Expand All @@ -42,6 +39,9 @@
DE68DA7824C769F900FC95A8 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9112E8A61E724EE00022A1CB /* SystemConfiguration.framework */; };
DE68DA7924C76A0300FC95A8 /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91B6EA051E83215000B5CF01 /* UserNotifications.framework */; };
DE68DA7A24C76A1800FC95A8 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CACBAAB5218A7136000ACAA5 /* WebKit.framework */; };
DEA22669261E62690092FF58 /* OneSignal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEA22668261E62690092FF58 /* OneSignal.framework */; };
DEA2266B261E62780092FF58 /* OneSignal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEA2266A261E62780092FF58 /* OneSignal.framework */; };
DEA2266D261E627D0092FF58 /* OneSignal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEA2266C261E627D0092FF58 /* OneSignal.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -129,16 +129,19 @@
DE68DA6B24C7695A00FC95A8 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
DE68DA6D24C7695A00FC95A8 /* OneSignalDevAppClip.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = OneSignalDevAppClip.entitlements; sourceTree = "<group>"; };
DE68DA7524C769E300FC95A8 /* libOneSignal.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libOneSignal.a; sourceTree = BUILT_PRODUCTS_DIR; };
DEA22668261E62690092FF58 /* OneSignal.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OneSignal.framework; sourceTree = BUILT_PRODUCTS_DIR; };
DEA2266A261E62780092FF58 /* OneSignal.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OneSignal.framework; sourceTree = BUILT_PRODUCTS_DIR; };
DEA2266C261E627D0092FF58 /* OneSignal.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OneSignal.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
9112E87F1E724C320022A1CB /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
DEA22669261E62690092FF58 /* OneSignal.framework in Frameworks */,
CACBAAB6218A7136000ACAA5 /* WebKit.framework in Frameworks */,
03432CDC1EBD426A0071FC48 /* CoreLocation.framework in Frameworks */,
DE138BFE2523CFA300AB46A3 /* libOneSignal.a in Frameworks */,
9112E8A71E724EE00022A1CB /* SystemConfiguration.framework in Frameworks */,
4529DECC1FA7EAB800CEAB1D /* UserNotifications.framework in Frameworks */,
);
Expand All @@ -148,9 +151,9 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
DEA2266B261E62780092FF58 /* OneSignal.framework in Frameworks */,
CACBAAB7218A713C000ACAA5 /* WebKit.framework in Frameworks */,
91B6EA071E83215800B5CF01 /* UIKit.framework in Frameworks */,
DE138C002523CFA700AB46A3 /* libOneSignal.a in Frameworks */,
91B6EA061E83215000B5CF01 /* UserNotifications.framework in Frameworks */,
91B6EA041E83214A00B5CF01 /* SystemConfiguration.framework in Frameworks */,
);
Expand All @@ -160,9 +163,9 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
DEA2266D261E627D0092FF58 /* OneSignal.framework in Frameworks */,
DE68DA7A24C76A1800FC95A8 /* WebKit.framework in Frameworks */,
DE68DA7924C76A0300FC95A8 /* UserNotifications.framework in Frameworks */,
DE138C022523CFAD00AB46A3 /* libOneSignal.a in Frameworks */,
DE68DA7724C769F200FC95A8 /* CoreLocation.framework in Frameworks */,
DE68DA7824C769F900FC95A8 /* SystemConfiguration.framework in Frameworks */,
);
Expand Down Expand Up @@ -222,6 +225,9 @@
9112E8A21E724DCA0022A1CB /* Frameworks */ = {
isa = PBXGroup;
children = (
DEA2266C261E627D0092FF58 /* OneSignal.framework */,
DEA2266A261E62780092FF58 /* OneSignal.framework */,
DEA22668261E62690092FF58 /* OneSignal.framework */,
DE138C012523CFAD00AB46A3 /* libOneSignal.a */,
DE138BFF2523CFA700AB46A3 /* libOneSignal.a */,
DE138BFD2523CFA300AB46A3 /* libOneSignal.a */,
Expand Down
2 changes: 0 additions & 2 deletions iOS_SDK/OneSignalSDK/Source/OSNotification.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,8 +300,6 @@ - (void)timeoutTimerFired:(NSTimer *)timer {
- (void)dealloc {
if (_timeoutTimer && _completion) {
[_timeoutTimer invalidate];
[OneSignal onesignalLog:ONE_S_LL_WARN
message:[NSString stringWithFormat:@"Notification: %@ was deallocated before calling completion block.", self.notificationId]];
}
}

Expand Down
4 changes: 2 additions & 2 deletions iOS_SDK/OneSignalSDK/UnitTests/ChannelTrackersTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ - (void)testGetChannelsByEntryPoint {

XCTAssertNil([trackerFactory channelByEntryAction:APP_OPEN]);
XCTAssertNil([trackerFactory channelByEntryAction:APP_CLOSE]);
XCTAssertEqual(@"notification_id", [[trackerFactory channelByEntryAction:NOTIFICATION_CLICK] idTag]);
XCTAssertEqualObjects(@"notification_id", [[trackerFactory channelByEntryAction:NOTIFICATION_CLICK] idTag]);
}

- (void)testGetChannelToResetByEntryAction {
Expand All @@ -164,7 +164,7 @@ - (void)testGetChannelToResetByEntryAction {
XCTAssertEqual(2, [trackerFactory channelsToResetByEntryAction:APP_OPEN].count);
XCTAssertEqual(0, [trackerFactory channelsToResetByEntryAction:APP_CLOSE].count);
XCTAssertEqual(1, [trackerFactory channelsToResetByEntryAction:NOTIFICATION_CLICK].count);
XCTAssertEqual(@"iam_id", [[[trackerFactory channelsToResetByEntryAction:NOTIFICATION_CLICK] objectAtIndex:0] idTag]);
XCTAssertEqualObjects(@"iam_id", [[[trackerFactory channelsToResetByEntryAction:NOTIFICATION_CLICK] objectAtIndex:0] idTag]);
}

@end
4 changes: 2 additions & 2 deletions iOS_SDK/OneSignalSDK/UnitTests/InAppMessagingIntegrationTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1055,8 +1055,8 @@ - (void)testIAMClickedLaunchesMultipleOutcomesAPIRequest {
XCTAssertEqual(outcomeWeight, [[OneSignalClientOverrider.lastHTTPRequest objectForKey:@"weight"] intValue]);

let lenght = OneSignalClientOverrider.executedRequests.count;
XCTAssertEqual(@"outcomes/measure", [OneSignalClientOverrider.executedRequests objectAtIndex:lenght - 1].path);
XCTAssertEqual(@"outcomes/measure", [OneSignalClientOverrider.executedRequests objectAtIndex:lenght - 2].path);
XCTAssertEqualObjects(@"outcomes/measure", [OneSignalClientOverrider.executedRequests objectAtIndex:lenght - 1].path);
XCTAssertEqualObjects(@"outcomes/measure", [OneSignalClientOverrider.executedRequests objectAtIndex:lenght - 2].path);
XCTAssertNotEqual(@"outcomes/measure", [OneSignalClientOverrider.executedRequests objectAtIndex:lenght - 3].path);

XCTAssertEqual(outcomeName, [[OneSignalClientOverrider.executedRequests objectAtIndex:lenght - 2].parameters objectForKey:@"id"]);
Expand Down
12 changes: 6 additions & 6 deletions iOS_SDK/OneSignalSDK/UnitTests/SMSTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,9 +270,9 @@ - (void)testRequiresSMSAuthWithNoHashToken {

XCTAssertNil(self.CALLBACK_SMS_NUMBER_SUCCESS_RESPONSE);
XCTAssertNotNil(self.CALLBACK_SMS_NUMBER_FAIL_RESPONSE);
XCTAssertEqual(@"com.onesignal.sms", self.CALLBACK_SMS_NUMBER_FAIL_RESPONSE.domain);
XCTAssertEqualObjects(@"com.onesignal.sms", self.CALLBACK_SMS_NUMBER_FAIL_RESPONSE.domain);
XCTAssertEqual(0, self.CALLBACK_SMS_NUMBER_FAIL_RESPONSE.code);
XCTAssertEqual(@"SMS authentication (auth token) is set to REQUIRED for this application. Please provide an auth token from your backend server or change the setting in the OneSignal dashboard.", [self.CALLBACK_SMS_NUMBER_FAIL_RESPONSE.userInfo objectForKey:@"error"]);
XCTAssertEqualObjects(@"SMS authentication (auth token) is set to REQUIRED for this application. Please provide an auth token from your backend server or change the setting in the OneSignal dashboard.", [self.CALLBACK_SMS_NUMBER_FAIL_RESPONSE.userInfo objectForKey:@"error"]);
}

- (void)testInvalidNilSMSNumber {
Expand All @@ -297,9 +297,9 @@ - (void)testInvalidNilSMSNumber {

XCTAssertNil(self.CALLBACK_SMS_NUMBER_SUCCESS_RESPONSE);
XCTAssertNotNil(self.CALLBACK_SMS_NUMBER_FAIL_RESPONSE);
XCTAssertEqual(@"com.onesignal.sms", self.CALLBACK_SMS_NUMBER_FAIL_RESPONSE.domain);
XCTAssertEqualObjects(@"com.onesignal.sms", self.CALLBACK_SMS_NUMBER_FAIL_RESPONSE.domain);
XCTAssertEqual(0, self.CALLBACK_SMS_NUMBER_FAIL_RESPONSE.code);
XCTAssertEqual(@"SMS number is invalid", [self.CALLBACK_SMS_NUMBER_FAIL_RESPONSE.userInfo objectForKey:@"error"]);
XCTAssertEqualObjects(@"SMS number is invalid", [self.CALLBACK_SMS_NUMBER_FAIL_RESPONSE.userInfo objectForKey:@"error"]);
}

- (void)testInvalidEmptySMSNumber {
Expand All @@ -324,9 +324,9 @@ - (void)testInvalidEmptySMSNumber {

XCTAssertNil(self.CALLBACK_SMS_NUMBER_SUCCESS_RESPONSE);
XCTAssertNotNil(self.CALLBACK_SMS_NUMBER_FAIL_RESPONSE);
XCTAssertEqual(@"com.onesignal.sms", self.CALLBACK_SMS_NUMBER_FAIL_RESPONSE.domain);
XCTAssertEqualObjects(@"com.onesignal.sms", self.CALLBACK_SMS_NUMBER_FAIL_RESPONSE.domain);
XCTAssertEqual(0, self.CALLBACK_SMS_NUMBER_FAIL_RESPONSE.code);
XCTAssertEqual(@"SMS number is invalid", [self.CALLBACK_SMS_NUMBER_FAIL_RESPONSE.userInfo objectForKey:@"error"]);
XCTAssertEqualObjects(@"SMS number is invalid", [self.CALLBACK_SMS_NUMBER_FAIL_RESPONSE.userInfo objectForKey:@"error"]);
}

- (void)testReSetSMSAuthWithHashTokenWithSameData {
Expand Down