diff options
| author | Tuan Nguyen <tuan.nguyen617@gmail.com> | 2019-09-13 13:20:21 -0700 |
|---|---|---|
| committer | Tuan Nguyen <tuan.nguyen617@gmail.com> | 2019-09-13 13:20:21 -0700 |
| commit | f44c0ec42c06367186877b37e04cee4567b6a22b (patch) | |
| tree | aad8b446cb367d85686c683e6700c1804471c279 | |
| parent | 3813178af21df57f5a87cd943126816cd5ab05e0 (diff) | |
| download | sdl_android-f44c0ec42c06367186877b37e04cee4567b6a22b.tar.gz | |
Move app level check to outside of loop.
| -rw-r--r-- | android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java | 12 |
1 files changed, 6 insertions, 6 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 ce1fa37b7..cdfd2d06c 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 @@ -2126,11 +2126,11 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> List<PermissionItem> permissionItems = ((OnPermissionsChange)notification).getPermissionItem();
Boolean requireEncryptionAppLevel = ((OnPermissionsChange) notification).getRequireEncryption();
mEncryptedRPCNames.clear();
- if (permissionItems != null && !permissionItems.isEmpty()) {
- for (PermissionItem permissionItem : permissionItems) {
- if (permissionItem != null) {
- if (Boolean.TRUE.equals(permissionItem.getRequireEncryption())) {
- if (requireEncryptionAppLevel == null || requireEncryptionAppLevel == true) {
+ if (requireEncryptionAppLevel == null || requireEncryptionAppLevel == true) {
+ if (permissionItems != null && !permissionItems.isEmpty()) {
+ for (PermissionItem permissionItem : permissionItems) {
+ if (permissionItem != null) {
+ if (Boolean.TRUE.equals(permissionItem.getRequireEncryption())) {
String rpcName = permissionItem.getRpcName();
if (rpcName != null) {
mEncryptedRPCNames.add(rpcName);
@@ -2139,8 +2139,8 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> }
}
}
+ checkStatusAndInitSecuredService();
}
- checkStatusAndInitSecuredService();
}
};
|