Skip to content

Commit 4a5d337

Browse files
committed
Merge remote-tracking branch 'origin/master' into release/7.2.0
2 parents 618554e + a6b9ce4 commit 4a5d337

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

AndroidSDKCore/src/main/java/com/leanplum/LeanplumActivityHelper.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,11 @@ public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
200200
* Enables lifecycle callbacks for Android devices with Android OS >= 4.0
201201
*/
202202
public static void enableLifecycleCallbacks(final Application app) {
203+
if (registeredCallbacks) {
204+
// callback is already registered
205+
return;
206+
}
207+
203208
Leanplum.setApplicationContext(app.getApplicationContext());
204209

205210
if (BuildUtil.shouldDisableTrampolines(app)) {

AndroidSDKPush/src/main/java/com/leanplum/internal/PushActionPersistence.kt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,14 @@ private fun save(records: Map<String, Long>) {
5151
}
5252

5353
fun recordOpenAction(occurrenceId: String) {
54-
records[occurrenceId] = Clock.getInstance().currentTimeMillis()
55-
save(records)
54+
synchronized(records) {
55+
records[occurrenceId] = Clock.getInstance().currentTimeMillis()
56+
save(records)
57+
}
5658
}
5759

58-
fun isOpened(occurrenceId: String) = records.contains(occurrenceId)
60+
fun isOpened(occurrenceId: String): Boolean {
61+
synchronized(records) {
62+
return records.contains(occurrenceId)
63+
}
64+
}

0 commit comments

Comments
 (0)