diff options
| author | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2019-05-21 16:10:52 -0400 |
|---|---|---|
| committer | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2019-05-21 16:10:52 -0400 |
| commit | ce57ca248cc40ace646529b019787f46e04d0f2a (patch) | |
| tree | 4b75dbc546e804fe92c60a1671f7496cdc87b62d | |
| parent | 00d2be2e737b997959a8c2ca23ae3c5833278707 (diff) | |
| download | sdl_android-ce57ca248cc40ace646529b019787f46e04d0f2a.tar.gz | |
Fix an issue with sendSequentialRPCs onupdate callback
| -rw-r--r-- | android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java | 10 | ||||
| -rw-r--r-- | javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java | 10 |
2 files changed, 8 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 8f149c072..7b901a314 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 @@ -4315,10 +4315,8 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> throw new SdlException("You must send some RPCs", SdlExceptionCause.INVALID_ARGUMENT);
}
- final int rpcCount = rpcs.size();
-
// Break out of recursion, we have finished the requests
- if (rpcCount == 0) {
+ if (rpcs.size() == 0) {
if(listener != null){
listener.onFinished();
}
@@ -4342,7 +4340,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> }
if (listener != null) {
listener.onResponse(correlationId, response);
- listener.onUpdate(rpcCount);
+ listener.onUpdate(rpcs.size());
}
try {
@@ -4363,7 +4361,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> }
if (listener != null) {
listener.onError(correlationId, resultCode, info);
- listener.onUpdate(rpcCount);
+ listener.onUpdate(rpcs.size());
}
try {
// recurse after onError
@@ -4381,7 +4379,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> // Notifications and Responses
sendRPCMessagePrivate(rpc);
if (listener != null) {
- listener.onUpdate(rpcCount);
+ listener.onUpdate(rpcs.size());
}
// recurse after sending a notification or response as there is no response.
try {
diff --git a/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java b/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java index 1d17d4ea5..c82d7c3c6 100644 --- a/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java +++ b/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java @@ -202,10 +202,8 @@ public class LifecycleManager extends BaseLifecycleManager { private void sendSequentialRPCs(final List<? extends RPCMessage> messages, final OnMultipleRequestListener listener){ if (messages != null){ - final int rpcCount = messages.size(); - // Break out of recursion, we have finished the requests - if (rpcCount == 0) { + if (messages.size() == 0) { if(listener != null){ listener.onFinished(); } @@ -229,7 +227,7 @@ public class LifecycleManager extends BaseLifecycleManager { } if (listener != null) { listener.onResponse(correlationId, response); - listener.onUpdate(rpcCount); + listener.onUpdate(messages.size()); } // recurse after onResponse sendSequentialRPCs(messages, listener); @@ -242,7 +240,7 @@ public class LifecycleManager extends BaseLifecycleManager { } if (listener != null) { listener.onError(correlationId, resultCode, info); - listener.onUpdate(rpcCount); + listener.onUpdate(messages.size()); } // recurse after onError @@ -254,7 +252,7 @@ public class LifecycleManager extends BaseLifecycleManager { // Notifications and Responses sendRPCMessagePrivate(rpc); if (listener != null) { - listener.onUpdate(rpcCount); + listener.onUpdate(messages.size()); } // recurse after sending a notification or response as there is no response. sendSequentialRPCs(messages, listener); |