status-im/status-mobile
2
0
Fork 0
mirror of https://github.com/status-im/status-mobile.git synced 2025-01-24 07:29:41 +00:00
Code Issues Projects Releases Wiki Activity

Add latch to ensure application messenger is set.

Browse Source 
There are two ways that messages can reach the StatusService,
application events (which are handled via `handleEvent`) and
signal events (which are handled via `signalEvent`).

If a signal event fires before an application event, it still
uses handleEvent logic, and handleEvent will try to reply to
the message. If the `applicationMessenger` isn't set, the reply
fails and the react native app is never told that the status
node is running, which is why the app gets no messages.

I've added a CountDownLatch, forcing the event handler to wait
for the applicationMessenger to be set before replying to any
messages.

Tested by injecting a long wait into `handleMessage` and observing
the same failure we see in SauceLabs runs.
This commit is contained in:
angusiguess 2017-10-09 13:20:45 -03:00 committed by Roman Volosovskyi
parent 61a6167998
commit 49429c1c28
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusService.java
View File

@ -5,6 +5,7 @@ import android.content.Intent;
import android.os.*; import android.os.*;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.util.Log; import android.util.Log;
import java.util.concurrent.CountDownLatch;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
@ -37,6 +38,8 @@ public class StatusService extends Service {
} }
} }
private static CountDownLatch applicationMessengerIsSet = new CountDownLatch(1);
private final Messenger serviceMessenger = new Messenger(new IncomingHandler(this)); private final Messenger serviceMessenger = new Messenger(new IncomingHandler(this));
private static Messenger applicationMessenger = null; private static Messenger applicationMessenger = null;
@ -44,6 +47,7 @@ public class StatusService extends Service {
private boolean handleMessage(Message message) { private boolean handleMessage(Message message) {
Log.d(TAG, "Received service message." + message.toString()); Log.d(TAG, "Received service message." + message.toString());
applicationMessenger = message.replyTo; applicationMessenger = message.replyTo;
applicationMessengerIsSet.countDown();
return true; return true;
} }
@ -56,7 +60,12 @@ public class StatusService extends Service {
Message replyMessage = Message.obtain(null, 0, 0, 0, null); Message replyMessage = Message.obtain(null, 0, 0, 0, null);
replyMessage.setData(replyData); replyMessage.setData(replyData);
try {
applicationMessengerIsSet.await();
sendReply(applicationMessenger, replyMessage); sendReply(applicationMessenger, replyMessage);
} catch(InterruptedException e) {
Log.d(TAG, "Interrupted during event signalling.");
}
} }
@Nullable @Nullable