Merge pull request #1786 from smartdevicelink/bugfix/issue_1783

Attepted fix of NPE in #1783

Author: Robert Henigan

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

@@ -91,6 +91,19 @@ public class SdlManager extends BaseSdlManager {
     private VideoStreamManager videoStreamManager;
     private AudioStreamManager audioStreamManager;
 
+    private Handler handler = new Handler(Looper.getMainLooper());
+    private Runnable changeRegistrationRunnable = new Runnable() {
+        @Override
+        public void run() {
+            checkLifecycleConfiguration();
+            DebugTool.logInfo(TAG, "Retry Change Registration Count: " + changeRegistrationRetry);
+        }
+    };
+
+    public SdlManager() {
+        DebugTool.logWarning(TAG, "SdlManager must be created with SdlManager.Builder");
+    }
+
     /**
      * Starts up a SdlManager, and calls provided callback called once all BaseSubManagers are done setting up
      */
@@ -211,14 +224,9 @@ private void notifyDevListener(String info) {
     void retryChangeRegistration() {
         changeRegistrationRetry++;
         if (changeRegistrationRetry < MAX_RETRY) {
-            final Handler handler = new Handler(Looper.getMainLooper());
-            handler.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    checkLifecycleConfiguration();
-                    DebugTool.logInfo(TAG, "Retry Change Registration Count: " + changeRegistrationRetry);
-                }
-            }, 3000);
+            if (handler != null && changeRegistrationRunnable != null) {
+                handler.postDelayed(changeRegistrationRunnable, 3000);
+            }
         }
     }
 
@@ -258,6 +266,15 @@ public synchronized void dispose() {
             this.lifecycleManager.stop();
         }
 
+        if (handler != null) {
+            if (changeRegistrationRunnable != null) {
+                handler.removeCallbacks(changeRegistrationRunnable);
+                changeRegistrationRunnable = null;
+            }
+
+            handler = null;
+        }
+
         if (managerListener != null) {
             managerListener.onDestroy();
             managerListener = null;

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

@@ -188,52 +188,57 @@ protected void checkLifecycleConfiguration() {
 
         if ((actualLanguage != null && !actualLanguage.equals(language)) || (actualHMILanguage != null && !actualHMILanguage.equals(hmiLanguage))) {
 
-            final LifecycleConfigurationUpdate lcu = managerListener.managerShouldUpdateLifecycle(actualLanguage, actualHMILanguage);
-
-            ChangeRegistration changeRegistration;
-            changeRegistration = new ChangeRegistration(actualLanguage, actualHMILanguage);
-
-            if (lcu != null) {
-                changeRegistration.setAppName(lcu.getAppName());
-                changeRegistration.setNgnMediaScreenAppName(lcu.getShortAppName());
-                changeRegistration.setTtsName(lcu.getTtsName());
-                changeRegistration.setVrSynonyms(lcu.getVoiceRecognitionCommandNames());
-                changeRegistration.setOnRPCResponseListener(new OnRPCResponseListener() {
-                    @Override
-                    public void onResponse(int correlationId, RPCResponse response) {
-                        if (response.getSuccess()) {
-                            try {
-                                DebugTool.logInfo(TAG, response.serializeJSON().toString());
-                            } catch (JSONException e) {
-                                DebugTool.logError(TAG, "Error attempting to serialize ChangeRegistrationResponse", e);
-                            }
-
-                            // go through and change sdlManager properties that were changed via the LCU update
-                            hmiLanguage = actualHMILanguage;
-                            language = actualLanguage;
-
-                            if (lcu.getAppName() != null) {
-                                appName = lcu.getAppName();
-                            }
-
-                            if (lcu.getShortAppName() != null) {
-                                shortAppName = lcu.getShortAppName();
+            if(managerListener != null) {
+                final LifecycleConfigurationUpdate lcu = managerListener.managerShouldUpdateLifecycle(actualLanguage, actualHMILanguage);
+
+                ChangeRegistration changeRegistration;
+                changeRegistration = new ChangeRegistration(actualLanguage, actualHMILanguage);
+
+                if (lcu != null) {
+                    changeRegistration.setAppName(lcu.getAppName());
+                    changeRegistration.setNgnMediaScreenAppName(lcu.getShortAppName());
+                    changeRegistration.setTtsName(lcu.getTtsName());
+                    changeRegistration.setVrSynonyms(lcu.getVoiceRecognitionCommandNames());
+                    changeRegistration.setOnRPCResponseListener(new OnRPCResponseListener() {
+                        @Override
+                        public void onResponse(int correlationId, RPCResponse response) {
+                            if (response.getSuccess()) {
+                                try {
+                                    DebugTool.logInfo(TAG, response.serializeJSON().toString());
+                                } catch (JSONException e) {
+                                    DebugTool.logError(TAG, "Error attempting to serialize ChangeRegistrationResponse", e);
+                                }
+
+                                // go through and change sdlManager properties that were changed via the LCU update
+                                hmiLanguage = actualHMILanguage;
+                                language = actualLanguage;
+
+                                if (lcu.getAppName() != null) {
+                                    appName = lcu.getAppName();
+                                }
+
+                                if (lcu.getShortAppName() != null) {
+                                    shortAppName = lcu.getShortAppName();
+                                }
+
+                                if (lcu.getTtsName() != null) {
+                                    ttsChunks = lcu.getTtsName();
+                                }
+
+                                if (lcu.getVoiceRecognitionCommandNames() != null) {
+                                    vrSynonyms = lcu.getVoiceRecognitionCommandNames();
+                                }
+                            } else {
+                                DebugTool.logError(TAG, "Change Registration onError: " + response.getResultCode() + " | Info: " + response.getInfo());
+                                retryChangeRegistration();
                             }
-
-                            if (lcu.getTtsName() != null) {
-                                ttsChunks = lcu.getTtsName();
-                            }
-
-                            if (lcu.getVoiceRecognitionCommandNames() != null) {
-                                vrSynonyms = lcu.getVoiceRecognitionCommandNames();
-                            }
-                        } else {
-                            DebugTool.logError(TAG, "Change Registration onError: " + response.getResultCode() + " | Info: " + response.getInfo());
-                            retryChangeRegistration();
                         }
-                    }
-                });
-                this.sendRPC(changeRegistration);
+                    });
+                    this.sendRPC(changeRegistration);
+                }
+            }
+            else {
+                DebugTool.logError(TAG, "SdlManagerListener is null");
             }
         }
     }