diff options
| author | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-02-21 12:20:55 -0500 |
|---|---|---|
| committer | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-02-21 12:20:55 -0500 |
| commit | b1edc68edee81e1c718381f4c25a788ab915bff8 (patch) | |
| tree | 95f8b9d2c3d2dfceaddde4d5adbc7aeb0337a233 | |
| parent | df73517365f5e3ec8123f1dcb9859054d1f8a967 (diff) | |
| download | sdl_android-b1edc68edee81e1c718381f4c25a788ab915bff8.tar.gz | |
Simplify ternary condition in SCMfeature/issue_1275
| -rw-r--r-- | base/src/main/java/com/smartdevicelink/proxy/SystemCapabilityManager.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/base/src/main/java/com/smartdevicelink/proxy/SystemCapabilityManager.java b/base/src/main/java/com/smartdevicelink/proxy/SystemCapabilityManager.java index 98032a1fe..0c90bde84 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/SystemCapabilityManager.java +++ b/base/src/main/java/com/smartdevicelink/proxy/SystemCapabilityManager.java @@ -558,8 +558,9 @@ public class SystemCapabilityManager { - if subscribe is false, then shouldSubscribe = false - if subscribe is true and the HU supports subscriptions, then shouldSubscribe = true */ - final boolean shouldSubscribe = ((subscribe != null) ? subscribe : isSubscribedToSystemCapability(systemCapabilityType)) && supportsSubscriptions(); - request.setSubscribe(shouldSubscribe); + boolean shouldSubscribe = (subscribe != null) ? subscribe : isSubscribedToSystemCapability(systemCapabilityType); + final boolean willSubscribe = shouldSubscribe && supportsSubscriptions(); + request.setSubscribe(willSubscribe); request.setOnRPCResponseListener(new OnRPCResponseListener() { @Override public void onResponse(int correlationId, RPCResponse response) { @@ -578,7 +579,7 @@ public class SystemCapabilityManager { } } if (supportsSubscriptions()) { - systemCapabilitiesSubscriptionStatus.put(systemCapabilityType, shouldSubscribe); + systemCapabilitiesSubscriptionStatus.put(systemCapabilityType, willSubscribe); } } else { if (scListener != null) { |