mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-01-29 21:32:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a memory leak in WebSocketService when using RxJava.

Browse Source
This commit is contained in:
casey langen 2017-05-03 15:25:27 -07:00
parent 5596b4ca5a
commit 6351c1ec78
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/websocket/WebSocketService.java
View File

@ -65,6 +65,10 @@ public class WebSocketService {
void onMessageResult(final SocketMessage response);
}
private interface MessageErrorCallback {
void onMessageError();
}
private interface Predicate1<T> {
boolean check(T value);
}
@ -115,6 +119,10 @@ public class WebSocketService {
client.onMessageReceived(msg);
}
}
if (mdr != null) {
mdr.error = null;
}
}
return true;
}
@ -146,6 +154,7 @@ public class WebSocketService {
long enqueueTime;
Client client;
MessageResultCallback callback;
MessageErrorCallback error;
}
private static WebSocketService INSTANCE;
@ -308,11 +317,18 @@ public class WebSocketService {
mrd.id = NEXT_ID.incrementAndGet();
mrd.enqueueTime = System.currentTimeMillis();
mrd.client = client;
mrd.callback = (SocketMessage message) -> {
emitter.onNext(message);
emitter.onComplete();
};
mrd.error = () -> {
final Exception ex = new Exception();
ex.fillInStackTrace();
emitter.onError(ex);
};
messageCallbacks.put(message.getId(), mrd);
socket.sendText(message.toString());
}
@ -383,7 +399,11 @@ public class WebSocketService {
while (it.hasNext()) {
final Map.Entry<String, MessageResultDescriptor> entry = it.next();
if (predicate.check(entry.getValue())) {
final MessageResultDescriptor mdr = entry.getValue();
if (predicate.check(mdr)) {
if (mdr.error != null) {
mdr.error.onMessageError();
}
it.remove();
}
}