Reconnect on language change

Author: bilal-alsharifi

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

@@ -112,12 +112,13 @@ 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();
@@ -160,7 +161,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/lifecycle/BaseLifecycleManager.java

@@ -326,10 +326,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);
         }
     }
 
@@ -446,7 +446,7 @@ public void run() {
                             cleanProxy();
                         } else {
                             Log.v(TAG, "re-registering for language change");
-                            processLanguageChange();
+                            cycleProxy(SdlDisconnectedReason.LANGUAGE_CHANGE);
                         }
                         break;
                     case UNREGISTER_APP_INTERFACE:
@@ -460,19 +460,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 !! *********************************
      *********************************************************************************************************/
@@ -856,7 +843,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);
 
         }
 
@@ -868,7 +855,7 @@ public void onTransportDisconnected(String info, boolean availablePrimary, BaseT
 
         @Override
         public void onTransportError(String info, Exception e) {
-            onClose(info, e);
+            onClose(info, e, null);
 
         }
 
@@ -1509,6 +1496,9 @@ void onProtocolSessionStarted(SessionType sessionType) {
         }
     }
 
+    void cycleProxy(SdlDisconnectedReason disconnectedReason) {
+    }
+
     void onTransportDisconnected(String info, boolean availablePrimary, BaseTransportConfig transportConfig) {
     }