diff options
| author | Tuan Nguyen <tuan.nguyen617@gmail.com> | 2019-09-13 12:56:13 -0700 |
|---|---|---|
| committer | Tuan Nguyen <tuan.nguyen617@gmail.com> | 2019-09-13 12:56:13 -0700 |
| commit | 3813178af21df57f5a87cd943126816cd5ab05e0 (patch) | |
| tree | a9460cdfbb94e51545e409b6d61daaad3753dc41 /android/sdl_android/src/main/java/com/smartdevicelink/proxy | |
| parent | 81266b6505c3df9af9df85c3fa800b32eb1e06fa (diff) | |
| download | sdl_android-3813178af21df57f5a87cd943126816cd5ab05e0.tar.gz | |
- Add null check to encryption callback
- Remove local rpc names set and use instance variable
- startRPCEncryptionService method should be void type
- Remove redundant empty rpc names set check in SdlProxyBase
Diffstat (limited to 'android/sdl_android/src/main/java/com/smartdevicelink/proxy')
| -rw-r--r-- | android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java | 23 |
1 files changed, 12 insertions, 11 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 7b8dd2992..ce1fa37b7 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 @@ -2124,8 +2124,8 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> @Override
public void onNotified(RPCNotification notification) {
List<PermissionItem> permissionItems = ((OnPermissionsChange)notification).getPermissionItem();
- Set<String> encryptedRpcs = new HashSet<>();
Boolean requireEncryptionAppLevel = ((OnPermissionsChange) notification).getRequireEncryption();
+ mEncryptedRPCNames.clear();
if (permissionItems != null && !permissionItems.isEmpty()) {
for (PermissionItem permissionItem : permissionItems) {
if (permissionItem != null) {
@@ -2133,19 +2133,14 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> if (requireEncryptionAppLevel == null || requireEncryptionAppLevel == true) {
String rpcName = permissionItem.getRpcName();
if (rpcName != null) {
- encryptedRpcs.add(rpcName);
+ mEncryptedRPCNames.add(rpcName);
}
}
}
}
}
}
- if (!encryptedRpcs.isEmpty()) {
- checkStatusAndInitSecuredService();
- if (!mEncryptedRPCNames.equals(encryptedRpcs)) {
- mEncryptedRPCNames = encryptedRpcs;
- }
- }
+ checkStatusAndInitSecuredService();
}
};
@@ -2182,7 +2177,9 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> public void onServiceStarted(SdlSession session, SessionType type, boolean isEncrypted) {
if(SessionType.RPC.equals(type) && session != null){
mRPCSecuredServiceStarted = isEncrypted;
- mEncryptionCallback.onEncryptionServiceUpdated(type, isEncrypted, isEncrypted ? "Secured RPC service started" : "RPC service started");
+ if (mEncryptionCallback != null) {
+ mEncryptionCallback.onEncryptionServiceUpdated(type, isEncrypted, isEncrypted ? "Secured RPC service started" : "RPC service started");
+ }
Log.d(TAG, "onServiceStarted, session id: " + (session.getSessionId() + ", session Type: " + type.getName()) + ", isEncrypted: " + isEncrypted);
}
}
@@ -2191,7 +2188,9 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> public void onServiceEnded(SdlSession session, SessionType type) {
if (SessionType.RPC.equals(type) && session != null) {
mRPCSecuredServiceStarted = false;
- mEncryptionCallback.onEncryptionServiceUpdated(type, false, "onServiceEnded");
+ if (mEncryptionCallback != null) {
+ mEncryptionCallback.onEncryptionServiceUpdated(type, false, "onServiceEnded");
+ }
Log.d(TAG, "onServiceEnded, session id: " + (session.getSessionId() + ", session Type: " + type.getName()));
}
}
@@ -2200,7 +2199,9 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> public void onServiceError(SdlSession session, SessionType type, String reason) {
if (SessionType.RPC.equals(type) && session != null) {
mRPCSecuredServiceStarted = false;
- mEncryptionCallback.onEncryptionServiceUpdated(type, false, "onServiceError. " + reason);
+ if (mEncryptionCallback != null) {
+ mEncryptionCallback.onEncryptionServiceUpdated(type, false, "onServiceError. " + reason);
+ }
Log.e(TAG, "onServiceError, session id: " + (session.getSessionId() + ", session Type: " + type.getName()));
}
}
|