Merge branch 'develop' into feature/use_taskmaster

Author: bilal-alsharifi

android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java

@@ -49,7 +49,6 @@
 import com.smartdevicelink.managers.screen.ScreenManager;
 import com.smartdevicelink.managers.video.VideoStreamManager;
 import com.smartdevicelink.proxy.rpc.enums.AppHMIType;
-import com.smartdevicelink.proxy.rpc.enums.SdlDisconnectedReason;
 import com.smartdevicelink.transport.BaseTransportConfig;
 import com.smartdevicelink.transport.MultiplexTransportConfig;
 import com.smartdevicelink.transport.enums.TransportType;
@@ -211,18 +210,6 @@ public void run() {
         }
     }
 
-    @Override
-    void onProxyClosed(SdlDisconnectedReason reason) {
-        Log.i(TAG, "Proxy is closed.");
-        if (managerListener != null) {
-            managerListener.onDestroy();
-        }
-
-        if (reason == null || !reason.equals(SdlDisconnectedReason.LANGUAGE_CHANGE)) {
-            dispose();
-        }
-    }
-
     /**
      * Dispose SdlManager and clean its resources
      * <strong>Note: new instance of SdlManager should be created on every connection. SdlManager cannot be reused after getting disposed.</strong>

android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java

@@ -112,17 +112,20 @@ void initializeProxy() {
         }
     }
 
-    private void cycleProxy(SdlDisconnectedReason disconnectedReason) {
+    @Override
+    void cycleProxy(SdlDisconnectedReason disconnectedReason) {
         cleanProxy();
         initializeProxy();
         if (!SdlDisconnectedReason.LEGACY_BLUETOOTH_MODE_ENABLED.equals(disconnectedReason) && !SdlDisconnectedReason.PRIMARY_TRANSPORT_CYCLE_REQUEST.equals(disconnectedReason)) {
             //We don't want to alert higher if we are just cycling for legacy bluetooth
-            onClose("Sdl Proxy Cycled", new SdlException("Sdl Proxy Cycled", SdlExceptionCause.SDL_PROXY_CYCLED));
+            onClose("Sdl Proxy Cycled", new SdlException("Sdl Proxy Cycled", SdlExceptionCause.SDL_PROXY_CYCLED), disconnectedReason);
         }
-        try {
-            session.startSession();
-        } catch (SdlException e) {
-            e.printStackTrace();
+        if (session != null) {
+            try {
+                session.startSession();
+            } catch (SdlException e) {
+                e.printStackTrace();
+            }
         }
     }
 
@@ -160,7 +163,7 @@ void onTransportDisconnected(String info, boolean availablePrimary, BaseTranspor
             Log.d(TAG, "notifying RPC session ended, but potential primary transport available");
             cycleProxy(SdlDisconnectedReason.PRIMARY_TRANSPORT_CYCLE_REQUEST);
         } else {
-            onClose(info, null);
+            onClose(info, null, null);
         }
     }
 

base/src/main/java/com/smartdevicelink/managers/BaseSdlManager.java

@@ -142,7 +142,10 @@ public void onServiceEnded(SessionType sessionType) {
 
         @Override
         public void onProxyClosed(LifecycleManager lifeCycleManager, String info, Exception e, SdlDisconnectedReason reason) {
-            BaseSdlManager.this.onProxyClosed(reason);
+            Log.i(TAG, "Proxy is closed.");
+            if (reason == null || !reason.equals(SdlDisconnectedReason.LANGUAGE_CHANGE)) {
+                dispose();
+            }
         }
 
         @Override
@@ -165,8 +168,6 @@ public synchronized void onComplete(boolean success) {
     // ABSTRACT METHODS
     abstract void retryChangeRegistration();
 
-    abstract void onProxyClosed(SdlDisconnectedReason reason);
-
     abstract void checkState();
 
     abstract void initialize();

base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java

@@ -342,10 +342,10 @@ public OnHMIStatus getCurrentHMIStatus() {
         return currentHMIStatus;
     }
 
-    void onClose(String info, Exception e) {
+    void onClose(String info, Exception e, SdlDisconnectedReason reason) {
         Log.i(TAG, "onClose");
         if (lifecycleListener != null) {
-            lifecycleListener.onProxyClosed((LifecycleManager) this, info, e, null);
+            lifecycleListener.onProxyClosed((LifecycleManager) this, info, e, reason);
         }
     }
 
@@ -462,7 +462,7 @@ public void run() {
                             cleanProxy();
                         } else {
                             Log.v(TAG, "re-registering for language change");
-                            processLanguageChange();
+                            cycleProxy(SdlDisconnectedReason.LANGUAGE_CHANGE);
                         }
                         break;
                     case UNREGISTER_APP_INTERFACE:
@@ -476,19 +476,6 @@ public void run() {
 
     };
 
-    private void processLanguageChange() {
-        if (session != null) {
-            if (session.getIsConnected()) {
-                session.close();
-            }
-            try {
-                session.startSession();
-            } catch (SdlException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
     /* *******************************************************************************************************
      ********************************** INTERNAL - RPC LISTENERS !! END !! *********************************
      *********************************************************************************************************/
@@ -872,7 +859,7 @@ private void sendRPCMessagePrivate(RPCMessage message, boolean isInternalMessage
     final ISdlConnectionListener sdlConnectionListener = new ISdlConnectionListener() {
         @Override
         public void onTransportDisconnected(String info) {
-            onClose(info, null);
+            onClose(info, null, null);
 
         }
 
@@ -884,7 +871,7 @@ public void onTransportDisconnected(String info, boolean availablePrimary, BaseT
 
         @Override
         public void onTransportError(String info, Exception e) {
-            onClose(info, e);
+            onClose(info, e, null);
 
         }
 
@@ -1530,6 +1517,8 @@ void onProtocolSessionStarted(SessionType sessionType) {
         }
     }
 
+    abstract void cycleProxy(SdlDisconnectedReason disconnectedReason);
+
     void onTransportDisconnected(String info, boolean availablePrimary, BaseTransportConfig transportConfig) {
     }
 

javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java

@@ -141,14 +141,6 @@ void retryChangeRegistration() {
         // Do nothing
     }
 
-    @Override
-    void onProxyClosed(SdlDisconnectedReason reason) {
-        Log.i(TAG, "Proxy is closed.");
-        if (managerListener != null) {
-            managerListener.onDestroy(SdlManager.this);
-        }
-    }
-
     @Override
     public void dispose() {
         if (this.permissionManager != null) {

javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java

@@ -35,6 +35,8 @@
 import android.support.annotation.RestrictTo;
 
 import com.smartdevicelink.SdlConnection.SdlSession;
+import com.smartdevicelink.exception.SdlException;
+import com.smartdevicelink.proxy.rpc.enums.SdlDisconnectedReason;
 import com.smartdevicelink.transport.BaseTransportConfig;
 
 /**
@@ -53,11 +55,23 @@ void initializeProxy() {
         this.session = new SdlSession(sdlConnectionListener, _transportConfig);
     }
 
+    @Override
+    void cycleProxy(SdlDisconnectedReason disconnectedReason) {
+        cleanProxy();
+        if (session != null) {
+            try {
+                session.startSession();
+            } catch (SdlException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
     @Override
     void onTransportDisconnected(String info, boolean availablePrimary, BaseTransportConfig transportConfig) {
         super.onTransportDisconnected(info, availablePrimary, transportConfig);
         if (!availablePrimary) {
-            onClose(info, null);
+            onClose(info, null, null);
         }
     }
 }