Fixes #166: Fix NPE on onSharedPreferenceChanged

Author: atsakiridis

Examples/restcomm-messenger/app/src/main/java/com/telestax/restcomm_messenger/MainActivity.java

@@ -49,6 +49,7 @@ public class MainActivity extends Activity implements RCDeviceListener,
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+        Log.i(TAG, "%% onCreate");
 
         // initialize UI
         btnRegister = (Button)findViewById(R.id.button_register);
@@ -138,6 +139,7 @@ protected void onDestroy() {
         Log.i(TAG, "%% onDestroy");
         RCClient.shutdown();
         device = null;
+        prefs.unregisterOnSharedPreferenceChangeListener(this);
     }
 
     @Override

restcomm.android.client.sdk/src/main/java/org/mobicents/restcomm/android/client/sdk/RCDevice.java

@@ -149,14 +149,6 @@ protected RCDevice(HashMap<String, Object> parameters, RCDeviceListener deviceLi
         state = DeviceState.OFFLINE;
 
         // register broadcast receiver for reachability
-        /*
-        BroadcastReceiver networkStateReceiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                onReachabilityChanged(checkReachability());
-            }
-        };
-        */
         Context context = RCClient.getContext();
         IntentFilter filter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION);
         context.registerReceiver(this, filter);
@@ -226,6 +218,7 @@ public void run() {
         if (newState == ReachabilityState.REACHABILITY_NONE && state != DeviceState.OFFLINE) {
             Log.w(TAG, "Reachability changed; no connectivity");
             // TODO: here we need to unregister before shutting down, but for that we need to wait for the unREGISTER reply, which complicates things
+            //DeviceImpl.GetInstance().Unregister();
             DeviceImpl.GetInstance().Shutdown();
             sipProfile = null;
             state = DeviceState.OFFLINE;
@@ -239,6 +232,7 @@ public void run() {
             if (state != DeviceState.OFFLINE) {
                 Log.w(TAG, "Reachability action: wifi/mobile available from movile/wifi. Device state: " + state);
                 // stop JAIN
+                //DeviceImpl.GetInstance().Unregister();
                 DeviceImpl.GetInstance().Shutdown();
                 sipProfile = null;
                 state = DeviceState.OFFLINE;