Skip to content
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

Jump to bottom

Respect duration since last iam trigger when the app is quit and relaunched #1560

Merged
merged 2 commits into from
Apr 7, 2022
Merged

Respect duration since last iam trigger when the app is quit and relaunched #1560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b530585
adding get and save LastTimeInAppDismissed to OneSignalPrefs
emawby Apr 6, 2022
5a6c472
persisting and fetching lastTimeInAppDismissed from OneSignalPrefs
emawby Apr 6, 2022
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
6 changes: 6 additions & 0 deletions OneSignalSDK/onesignal/src/main/java/com/onesignal/OSInAppMessageController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,11 @@ protected OSInAppMessageController(OneSignalDbHelper dbHelper, OSTaskController
if (tempClickedMessageIdsSet != null)
clickedClickIds.addAll(tempClickedMessageIdsSet);

Date tempLastTimeInAppDismissed = inAppMessageRepository.getLastTimeInAppDismissed();
if (tempLastTimeInAppDismissed != null) {
lastTimeInAppDismissed = tempLastTimeInAppDismissed;
}

initRedisplayData();
}

Expand Down Expand Up @@ -742,6 +747,7 @@ public void run() {
super.run();

inAppMessageRepository.saveInAppMessage(message);
inAppMessageRepository.saveLastTimeInAppDismissed(lastTimeInAppDismissed);
}
};
runRunnableOnThread(saveIAMOnDBRunnable, OS_IAM_DB_ACCESS);
Expand Down
31 changes: 31 additions & 0 deletions OneSignalSDK/onesignal/src/main/java/com/onesignal/OSInAppMessageRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,12 @@
import org.json.JSONException;
import org.json.JSONObject;

import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.Set;

class OSInAppMessageRepository {
Expand Down Expand Up @@ -447,6 +451,33 @@ void saveIAMs(final String inAppMessages) {
inAppMessages);
}

void saveLastTimeInAppDismissed(Date lastTimeInAppDismissed) {
String lastTimeDismissedString = lastTimeInAppDismissed != null ?
lastTimeInAppDismissed.toString() : null;
sharedPreferences.saveString(
OneSignalPrefs.PREFS_ONESIGNAL,
OneSignalPrefs.PREFS_OS_LAST_TIME_IAM_DISMISSED,
lastTimeDismissedString);
}

@Nullable
Date getLastTimeInAppDismissed() {
String lastTimeDismissedString = sharedPreferences.getString(
OneSignalPrefs.PREFS_ONESIGNAL,
OneSignalPrefs.PREFS_OS_LAST_TIME_IAM_DISMISSED, null);
if (lastTimeDismissedString == null) {
return null;
}
// This pattern matches the pattern used by the Date class's toString() method
SimpleDateFormat format = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.ENGLISH);
try {
return format.parse(lastTimeDismissedString);
} catch (ParseException exception) {
OneSignal.onesignalLog(OneSignal.LOG_LEVEL.ERROR, exception.getLocalizedMessage());
return null;
}
}

private void printHttpSuccessForInAppMessageRequest(String requestType, String response) {
logger.debug("Successful post for in-app message " + requestType + " request: " + response);
}
Expand Down
1 change: 1 addition & 0 deletions OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignalPrefs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ class OneSignalPrefs {
public static final String PREFS_OS_IMPRESSIONED_IAMS = "PREFS_OS_IMPRESSIONED_IAMS";
public static final String PREFS_OS_CLICKED_CLICK_IDS_IAMS = "PREFS_OS_CLICKED_CLICK_IDS_IAMS";
public static final String PREFS_OS_PAGE_IMPRESSIONED_IAMS = "PREFS_OS_PAGE_IMPRESSIONED_IAMS";
public static final String PREFS_OS_LAST_TIME_IAM_DISMISSED = "PREFS_OS_LAST_TIME_IAM_DISMISSED";

// Player Purchase Keys
static final String PREFS_PURCHASE_TOKENS = "purchaseTokens";
Expand Down