empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Prevent race condition when closing/reopening message receiver.

Browse source
This commit is contained in:
Cody Henthorne 2021-04-12 11:07:22 -04:00 • committed by Greyson Parrelli
parent ac0216d916
commit eda2b87a57
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencies.java
View file

@ -184,12 +184,6 @@ public class ApplicationDependencies {
} }
public static @NonNull SignalServiceMessageReceiver getSignalServiceMessageReceiver() { public static @NonNull SignalServiceMessageReceiver getSignalServiceMessageReceiver() {
SignalServiceMessageReceiver local = messageReceiver;
if (local != null) {
return local;
}
synchronized (LOCK) { synchronized (LOCK) {
if (messageReceiver == null) { if (messageReceiver == null) {
messageReceiver = provider.provideSignalServiceMessageReceiver(); messageReceiver = provider.provideSignalServiceMessageReceiver();

4
app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.java
View file

@ -48,8 +48,8 @@ public class IncomingMessageObserver {
private static final AtomicInteger INSTANCE_COUNT = new AtomicInteger(0); private static final AtomicInteger INSTANCE_COUNT = new AtomicInteger(0);
private static SignalServiceMessagePipe pipe = null; private static volatile SignalServiceMessagePipe pipe = null;
private static SignalServiceMessagePipe unidentifiedPipe = null; private static volatile SignalServiceMessagePipe unidentifiedPipe = null;
private final Application context; private final Application context;
private final SignalServiceNetworkAccess networkAccess; private final SignalServiceNetworkAccess networkAccess;