diff options
| author | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2019-05-15 16:00:34 -0400 |
|---|---|---|
| committer | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2019-05-15 16:00:34 -0400 |
| commit | 3da2d8d2168a6720c4a383224c153621658e06af (patch) | |
| tree | d5ff7ef20d51049c8711b0b11502bc2a83f0cdae | |
| parent | 641964259c7ebbfd3e6bbbc1b108bdf5ed9137c1 (diff) | |
| download | sdl_android-3da2d8d2168a6720c4a383224c153621658e06af.tar.gz | |
Improve sending multiple RPCs logic
| -rw-r--r-- | android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java | 66 |
1 files changed, 54 insertions, 12 deletions
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java index 41a173ee9..b278671ea 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java @@ -4330,30 +4330,50 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> RPCRequest request = (RPCRequest) rpc;
request.setCorrelationID(CorrelationIdGenerator.generateId());
+ final OnRPCResponseListener devOnRPCResponseListener = request.getOnRPCResponseListener();
+
request.setOnRPCResponseListener(new OnRPCResponseListener() {
@Override
public void onResponse(int correlationId, RPCResponse response) {
- if (response.getSuccess()) {
- // success
- if (listener != null) {
+ if (devOnRPCResponseListener != null){
+ devOnRPCResponseListener.onResponse(correlationId, response);
+ }
+ if (listener != null) {
+ listener.onResponse(correlationId, response);
+ if (rpcs.size() > 0) {
listener.onUpdate(rpcs.size());
}
- try {
- // recurse after successful response of RPC
- sendSequentialRequests(rpcs, listener);
- } catch (SdlException e) {
- e.printStackTrace();
- if (listener != null) {
- listener.onError(correlationId, Result.GENERIC_ERROR, e.toString());
- }
+ }
+ try {
+ // recurse after onResponse
+ sendSequentialRequests(rpcs, listener);
+ } catch (SdlException e) {
+ e.printStackTrace();
+ if (listener != null) {
+ listener.onError(correlationId, Result.GENERIC_ERROR, e.toString());
}
}
}
@Override
public void onError(int correlationId, Result resultCode, String info) {
+ if (devOnRPCResponseListener != null){
+ devOnRPCResponseListener.onError(correlationId, resultCode, info);
+ }
if (listener != null) {
listener.onError(correlationId, resultCode, info);
+ if (rpcs.size() > 0) {
+ listener.onUpdate(rpcs.size());
+ }
+ }
+ try {
+ // recurse after onError
+ sendSequentialRequests(rpcs, listener);
+ } catch (SdlException e) {
+ e.printStackTrace();
+ if (listener != null) {
+ listener.onError(correlationId, Result.GENERIC_ERROR, e.toString());
+ }
}
}
});
@@ -4408,10 +4428,32 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> // Request Specifics
if (rpc.getMessageType().equals(RPCMessage.KEY_REQUEST)) {
RPCRequest request = (RPCRequest) rpc;
+ final OnRPCResponseListener devOnRPCResponseListener = request.getOnRPCResponseListener();
request.setCorrelationID(CorrelationIdGenerator.generateId());
if (listener != null) {
listener.addCorrelationId(request.getCorrelationID());
- request.setOnRPCResponseListener(listener.getSingleRpcResponseListener());
+ request.setOnRPCResponseListener(new OnRPCResponseListener() {
+ @Override
+ public void onResponse(int correlationId, RPCResponse response) {
+ if (devOnRPCResponseListener != null){
+ devOnRPCResponseListener.onResponse(correlationId, response);
+ }
+ if (listener.getSingleRpcResponseListener() != null) {
+ listener.getSingleRpcResponseListener().onResponse(correlationId, response);
+ }
+ }
+
+ @Override
+ public void onError(int correlationId, Result resultCode, String info) {
+ super.onError(correlationId, resultCode, info);
+ if (devOnRPCResponseListener != null){
+ devOnRPCResponseListener.onError(correlationId, resultCode, info);
+ }
+ if (listener.getSingleRpcResponseListener() != null) {
+ listener.getSingleRpcResponseListener().onError(correlationId, resultCode, info);
+ }
+ }
+ });
}
sendRPCMessagePrivate(request);
}else {
|