Move constructor from BaseLifecycleManager to LifecycleManager

3 files changed, 32 insertions, 37 deletions

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
index e7431ea89..acb0fd1dc 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
@@ -34,15 +34,10 @@ package com.smartdevicelink.managers.lifecycle;
 
 import android.support.annotation.RestrictTo;
 
-import com.smartdevicelink.transport.BaseTransportConfig;
-
 /**
  * The lifecycle manager creates a central point for all SDL session logic to converge. It should only be used by
  * the library itself. Usage outside the library is not permitted and will not be protected for in the future.
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 public class LifecycleManager extends BaseLifecycleManager {
-    public LifecycleManager(AppConfig appConfig, BaseTransportConfig config, LifecycleListener listener) {
-        super(appConfig, config, listener);
-    }
 }
diff --git a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
index 5a57d722a..42409bf0a 100644
--- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
@@ -127,12 +127,12 @@ abstract class BaseLifecycleManager {
     protected Version rpcSpecVersion = MAX_SUPPORTED_RPC_VERSION;
 
 
-    private final HashMap<Integer, CopyOnWriteArrayList<OnRPCListener>> rpcListeners;
-    private final HashMap<Integer, OnRPCResponseListener> rpcResponseListeners;
-    private final HashMap<Integer, CopyOnWriteArrayList<OnRPCNotificationListener>> rpcNotificationListeners;
-    private final HashMap<Integer, CopyOnWriteArrayList<OnRPCRequestListener>> rpcRequestListeners;
+    HashMap<Integer, CopyOnWriteArrayList<OnRPCListener>> rpcListeners;
+    HashMap<Integer, OnRPCResponseListener> rpcResponseListeners;
+    HashMap<Integer, CopyOnWriteArrayList<OnRPCNotificationListener>> rpcNotificationListeners;
+    HashMap<Integer, CopyOnWriteArrayList<OnRPCRequestListener>> rpcRequestListeners;
 
-    protected final SystemCapabilityManager systemCapabilityManager;
+    SystemCapabilityManager systemCapabilityManager;
     private EncryptionLifecycleManager encryptionLifecycleManager;
 
     protected RegisterAppInterfaceResponse raiResponse = null;
@@ -140,29 +140,12 @@ abstract class BaseLifecycleManager {
     private OnHMIStatus currentHMIStatus;
     protected boolean firstTimeFull = true;
 
-    final LifecycleListener lifecycleListener;
+    LifecycleListener lifecycleListener;
 
     private List<Class<? extends SdlSecurityBase>> _secList = null;
     private String authToken;
-    private Version minimumProtocolVersion;
-    private Version minimumRPCVersion;
-
-    public BaseLifecycleManager(AppConfig appConfig, BaseTransportConfig config, LifecycleListener listener){
-
-        this.lifecycleListener = listener;
-
-        this.rpcListeners = new HashMap<>();
-        this.rpcResponseListeners = new HashMap<>();
-        this.rpcNotificationListeners = new HashMap<>();
-        this.rpcRequestListeners = new HashMap<>();
-
-        this.appConfig = appConfig;
-        this.minimumProtocolVersion = appConfig.minimumProtocolVersion;
-        this.minimumRPCVersion = appConfig.minimumRPCVersion;
-        this.session = new SdlSession(sdlConnectionListener, config);
-
-        this.systemCapabilityManager = new SystemCapabilityManager(internalInterface);
-    }
+    Version minimumProtocolVersion;
+    Version minimumRPCVersion;
 
     public void start(){
         try {
@@ -351,7 +334,7 @@ abstract class BaseLifecycleManager {
     private void onClose(String info, Exception e){
         Log.i(TAG, "onClose");
         if(lifecycleListener != null){
-            lifecycleListener.onProxyClosed(this, info,e,null);
+            lifecycleListener.onProxyClosed((LifecycleManager) this, info,e,null);
         }
     }
 
@@ -418,7 +401,7 @@ abstract class BaseLifecycleManager {
                         boolean shouldInit = currentHMIStatus == null;
                         currentHMIStatus = (OnHMIStatus) message;
                         if (lifecycleListener != null && shouldInit) {
-                            lifecycleListener.onProxyConnected(BaseLifecycleManager.this);
+                            lifecycleListener.onProxyConnected((LifecycleManager) BaseLifecycleManager.this);
                         }
                         break;
                     case ON_HASH_CHANGE:
@@ -1216,11 +1199,11 @@ abstract class BaseLifecycleManager {
      *********************************************************************************************************/
 
     public interface LifecycleListener{
-        void onProxyConnected(BaseLifecycleManager lifeCycleManager);
-        void onProxyClosed(BaseLifecycleManager lifeCycleManager, String info, Exception e, SdlDisconnectedReason reason);
+        void onProxyConnected(LifecycleManager lifeCycleManager);
+        void onProxyClosed(LifecycleManager lifeCycleManager, String info, Exception e, SdlDisconnectedReason reason);
         void onServiceStarted(SessionType sessionType);
         void onServiceEnded(SessionType sessionType);
-        void onError(BaseLifecycleManager lifeCycleManager, String info, Exception e);
+        void onError(LifecycleManager lifeCycleManager, String info, Exception e);
     }
 
     public static class AppConfig{
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 e7431ea89..0025f3368 100644
--- a/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
+++ b/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
@@ -34,15 +34,32 @@ package com.smartdevicelink.managers.lifecycle;
 
 import android.support.annotation.RestrictTo;
 
+import com.smartdevicelink.SdlConnection.SdlSession;
+import com.smartdevicelink.proxy.SystemCapabilityManager;
 import com.smartdevicelink.transport.BaseTransportConfig;
 
+import java.util.HashMap;
+
 /**
  * The lifecycle manager creates a central point for all SDL session logic to converge. It should only be used by
  * the library itself. Usage outside the library is not permitted and will not be protected for in the future.
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 public class LifecycleManager extends BaseLifecycleManager {
-    public LifecycleManager(AppConfig appConfig, BaseTransportConfig config, LifecycleListener listener) {
-        super(appConfig, config, listener);
+    public LifecycleManager(AppConfig appConfig, BaseTransportConfig config, LifecycleListener listener){
+
+        this.lifecycleListener = listener;
+
+        this.rpcListeners = new HashMap<>();
+        this.rpcResponseListeners = new HashMap<>();
+        this.rpcNotificationListeners = new HashMap<>();
+        this.rpcRequestListeners = new HashMap<>();
+
+        this.appConfig = appConfig;
+        this.minimumProtocolVersion = appConfig.getMinimumProtocolVersion();
+        this.minimumRPCVersion = appConfig.getMinimumRPCVersion();
+        this.session = new SdlSession(sdlConnectionListener, config);
+
+        this.systemCapabilityManager = new SystemCapabilityManager(internalInterface);
     }
 }