Skip to content

Commit 42f213c

Browse files
committed
Revert "Simulate model adding while model is loading"
This reverts commit b780f7c.
1 parent e835c2c commit 42f213c

File tree

2 files changed

+0
-21
lines changed
  • Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/application
  • OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling

2 files changed

+0
-21
lines changed

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/application/MainApplication.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package com.onesignal.sdktest.application;
22

33
import android.annotation.SuppressLint;
4-
import android.os.Handler;
5-
import android.os.Looper;
64
import android.os.StrictMode;
75
import android.util.Log;
86
import androidx.annotation.NonNull;
@@ -63,17 +61,6 @@ public void onCreate() {
6361

6462
OneSignal.initWithContext(this, appId);
6563

66-
67-
final Handler handler = new Handler(Looper.getMainLooper());
68-
handler.postDelayed(new Runnable() {
69-
@Override
70-
public void run() {
71-
// addTag after 100 ms to reliably accessing the operation model store AFTER the loading
72-
OneSignal.getUser().removeTag("tag");
73-
OneSignal.getUser().addTag("tag", "test");
74-
}
75-
}, 100);
76-
7764
// Ensure calling requestPermission in a thread right after initWithContext does not crash
7865
// This will reproduce result similar to Kotlin CouroutineScope.launch{}, which may potentially crash the app
7966
ExecutorService executor = Executors.newSingleThreadExecutor();

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/Model.kt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ package com.onesignal.common.modeling
22

33
import com.onesignal.common.events.EventProducer
44
import com.onesignal.common.events.IEventNotifier
5-
import com.onesignal.debug.LogLevel
6-
import com.onesignal.debug.internal.logging.Logging
7-
import com.onesignal.user.internal.operations.LoginUserOperation
85
import org.json.JSONArray
96
import org.json.JSONObject
107
import java.math.BigDecimal
@@ -84,11 +81,6 @@ open class Model(
8481
fun initializeFromJson(jsonObject: JSONObject) {
8582
synchronized(data) {
8683
data.clear()
87-
if (this is LoginUserOperation) {
88-
// loading operationModelStore will get stuck for 15 seconds while locking data
89-
Logging.log(LogLevel.DEBUG, "initializeFromJson LoginUserOperation")
90-
Thread.sleep(15000)
91-
}
9284
for (property in jsonObject.keys()) {
9385
val jsonValue = jsonObject.get(property)
9486
if (jsonValue is JSONObject) {

0 commit comments

Comments
 (0)