Skip to content

Commit 94730ea

Browse files
committed
Duplicate methods after fixed merge conflicts
1 parent 8bdb7f1 commit 94730ea

File tree

2 files changed

+0
-22
lines changed

2 files changed

+0
-22
lines changed

OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationBundleProcessor.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -155,18 +155,6 @@ static void processNotification(NotificationGenerationJob notifiJob, boolean ope
155155
controller.sendReceiveReceipt(notifiJob.getApiNotificationId());
156156
}
157157

158-
/**
159-
* Must call this method instead of saveNotification
160-
*
161-
* This method save the last notification that might influence session
162-
*/
163-
static void processNotification(NotificationGenerationJob notifiJob, boolean opened) {
164-
saveNotification(notifiJob, opened);
165-
if (notifiJob.isNotificationToDisplay()) {
166-
OutcomesUtils.markLastNotificationReceived(notifiJob.getApiNotificationId());
167-
}
168-
}
169-
170158
// Saving the notification provides the following:
171159
// * Prevent duplicates
172160
// * Build summary notifications

OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationGenerationJob.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -109,18 +109,8 @@ void setAndroidIdWithOutOverriding(Integer id) {
109109
overrideSettings.androidNotificationId = id;
110110
}
111111

112-
/**
113-
* If notificationId is -1 then the notification is a silent one
114-
*/
115-
boolean isNotificationToDisplay() {
116-
return getAndroidIdWithoutCreate() != -1;
117-
}
118-
119112
boolean hasExtender() {
120113
return overrideSettings != null && overrideSettings.extender != null;
121114
}
122115

123-
String getApiNotificationId() {
124-
return OneSignal.getNotificationIdFromGCMJson(jsonPayload);
125-
}
126116
}

0 commit comments

Comments
 (0)