Skip to content

Commit 682258d

Browse files
committed
Fixed intermittent tests and created release jar
1 parent 3434122 commit 682258d

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

OneSignalSDK.jar

2.04 KB
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public void init() {
167167
private static TrackGooglePurchase trackGooglePurchase;
168168
private static TrackAmazonPurchase trackAmazonPurchase;
169169

170-
public static final String VERSION = "030004";
170+
public static final String VERSION = "030100";
171171

172172
private static AdvertisingIdentifierProvider mainAdIdProvider = new AdvertisingIdProviderGPS();
173173

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838

3939
import java.security.MessageDigest;
4040
import java.util.Arrays;
41+
import java.util.HashMap;
4142
import java.util.HashSet;
4243
import java.util.Iterator;
4344
import java.util.Map;
4445
import java.util.Set;
45-
import java.util.concurrent.ConcurrentHashMap;
4646

4747
class OneSignalStateSynchronizer {
4848
private static boolean nextSyncIsSession = false, waitingForSessionResponse = false;
@@ -52,7 +52,8 @@ class OneSignalStateSynchronizer {
5252
// diff will be generated between currentUserState when a sync call is made to the server.
5353
private static UserState currentUserState, toSyncUserState;
5454

55-
static ConcurrentHashMap<Integer, NetworkHandlerThread> networkHandlerThreads = new ConcurrentHashMap<>();
55+
static HashMap<Integer, NetworkHandlerThread> networkHandlerThreads = new HashMap<>();
56+
private static final Object networkHandlerSyncLock = new Object() {};
5657

5758
private static Context appContext;
5859

@@ -590,9 +591,11 @@ private static boolean response400WithErrorsContaining(int statusCode, String re
590591
}
591592

592593
private static NetworkHandlerThread getNetworkHandlerThread(Integer type) {
593-
if (!networkHandlerThreads.containsKey(type))
594-
networkHandlerThreads.put(type, new NetworkHandlerThread(type));
595-
return networkHandlerThreads.get(type);
594+
synchronized (networkHandlerSyncLock) {
595+
if (!networkHandlerThreads.containsKey(type))
596+
networkHandlerThreads.put(type, new NetworkHandlerThread(type));
597+
return networkHandlerThreads.get(type);
598+
}
596599
}
597600

598601
private static UserState getUserStateForModification() {

0 commit comments

Comments
 (0)