Skip to content

Commit 61a7dbd

Browse files
committed
Rename getActionID to getActionId
* Remove some TODOs already covered
1 parent 3c47617 commit 61a7dbd

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,8 @@ public class OSInAppMessageAction {
2323
private static final String CLICK_URL = "click_url";
2424
private static final String FIRST_CLICK = "first_click";
2525
private static final String CLOSES_MESSAGE = "closes_message";
26-
//TODO when backend is ready check if key match
2726
private static final String OUTCOMES = "outcomes";
28-
//TODO when backend is ready check if key match
2927
private static final String TAGS = "tags";
30-
//TODO when backend is ready check if key match
3128
private static final String PROMPTS = "prompts";
3229

3330
/**

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,27 +45,27 @@ public enum ActionType {
4545
private final ActionType type;
4646

4747
// The ID associated with the button tapped. null when the actionType is NotificationTapped or InAppAlertClosed
48-
private final String actionID;
48+
private final String actionId;
4949

50-
public OSNotificationAction(ActionType type, String actionID) {
50+
public OSNotificationAction(ActionType type, String actionId) {
5151
this.type = type;
52-
this.actionID = actionID;
52+
this.actionId = actionId;
5353
}
5454

5555
public ActionType getType() {
5656
return type;
5757
}
5858

59-
public String getActionID() {
60-
return actionID;
59+
public String getActionId() {
60+
return actionId;
6161
}
6262

6363
public JSONObject toJSONObject() {
6464
JSONObject mainObj = new JSONObject();
6565

6666
try {
6767
mainObj.put("type", type.ordinal());
68-
mainObj.put("actionId", actionID);
68+
mainObj.put("actionId", actionId);
6969
}
7070
catch(Throwable t) {
7171
t.printStackTrace();

OneSignalSDK/unittest/src/test/java/com/test/onesignal/NotificationOpenedActivityHMSIntegrationTestsRunner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public void firesOSNotificationOpenCallbackWithActionId() throws Exception {
163163
OneSignal.setNotificationOpenedHandler(new OneSignal.OSNotificationOpenedHandler() {
164164
@Override
165165
public void notificationOpened(OSNotificationOpenedResult result) {
166-
lastActionId = result.getAction().getActionID();
166+
lastActionId = result.getAction().getActionId();
167167
}
168168
});
169169

0 commit comments

Comments
 (0)