Skip to content

Commit bda77aa

Browse files
committed
Clean up: Removed synchronized on mHandler
* Cleaned up synchronized on mHandler in both startDelayedWrite and tests * This was not needed as startDelayedWrite as a synchronized at the method level * Limited access level to mHandler and startDelayedWrite now that tests don't access this anymore directly.
1 parent 9919c39 commit bda77aa

File tree

2 files changed

+10
-18
lines changed

2 files changed

+10
-18
lines changed

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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ class OneSignalPrefs {
123123
}
124124

125125
public static class WritePrefHandlerThread extends HandlerThread {
126-
public Handler mHandler;
126+
private Handler mHandler;
127127

128128
private static final int WRITE_CALL_DELAY_TO_BUFFER_MS = 200;
129129
private long lastSyncTime = 0L;
@@ -132,7 +132,7 @@ public static class WritePrefHandlerThread extends HandlerThread {
132132
super(name);
133133
}
134134

135-
synchronized void startDelayedWrite() {
135+
private synchronized void startDelayedWrite() {
136136
// A Context is required to write,
137137
// if not available now later OneSignal.setContext will call this again.
138138
if (OneSignal.appContext == null)
@@ -143,15 +143,12 @@ synchronized void startDelayedWrite() {
143143
mHandler = new Handler(getLooper());
144144
}
145145

146-
synchronized (mHandler) {
147-
mHandler.removeCallbacksAndMessages(null);
148-
if (lastSyncTime == 0)
149-
lastSyncTime = System.currentTimeMillis();
146+
mHandler.removeCallbacksAndMessages(null);
147+
if (lastSyncTime == 0)
148+
lastSyncTime = System.currentTimeMillis();
150149

151-
long delay = lastSyncTime - System.currentTimeMillis() + WRITE_CALL_DELAY_TO_BUFFER_MS;
152-
153-
mHandler.postDelayed(getNewRunnable(), delay);
154-
}
150+
long delay = lastSyncTime - System.currentTimeMillis() + WRITE_CALL_DELAY_TO_BUFFER_MS;
151+
mHandler.postDelayed(getNewRunnable(), delay);
155152
}
156153

157154
/**

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,15 +130,10 @@ static void stopAllOSThreads() {
130130
static void flushBufferedSharedPrefs() {
131131
OneSignalPrefs.WritePrefHandlerThread handlerThread = OneSignalPackagePrivateHelper.OneSignalPrefs.prefsHandler;
132132

133-
if (handlerThread.mHandler == null)
133+
if (handlerThread.getLooper() == null)
134134
return;
135-
136-
synchronized (handlerThread.mHandler) {
137-
if (handlerThread.getLooper() == null)
138-
return;
139-
Scheduler scheduler = shadowOf(handlerThread.getLooper()).getScheduler();
140-
while (scheduler.runOneTask());
141-
}
135+
Scheduler scheduler = shadowOf(handlerThread.getLooper()).getScheduler();
136+
while (scheduler.runOneTask());
142137
}
143138

144139
// Join all OS_ threads

0 commit comments

Comments
 (0)