Use try catches to handle hashmap null object references

Author: Brandon Huang

android/src/main/java/io/wazo/callkeep/RNCallKeepModule.java

@@ -485,6 +485,9 @@ private class VoiceBroadcastReceiver extends BroadcastReceiver {
         public void onReceive(Context context, Intent intent) {
             WritableMap args = Arguments.createMap();
             HashMap<String, String> attributeMap = (HashMap<String, String>)intent.getSerializableExtra("attributeMap");
+            if (attributeMap == null) {
+                return;
+            }
 
             switch (intent.getAction()) {
                 case ACTION_END_CALL:

android/src/main/java/io/wazo/callkeep/VoiceConnection.java

@@ -53,12 +53,16 @@ public class VoiceConnection extends Connection {
         if (name != null && !name.equals("")) {
             setCallerDisplayName(name, TelecomManager.PRESENTATION_ALLOWED);
         }
+        Log.e(TAG, "Constructor");
     }
 
     @Override
     public void onExtrasChanged(Bundle extras) {
         super.onExtrasChanged(extras);
-        handle = (HashMap<String, String>)extras.getSerializable("attributeMap");
+        HashMap attributeMap = (HashMap<String, String>)extras.getSerializable("attributeMap");
+        if (attributeMap != null) {
+            handle = attributeMap;
+        }
     }
 
     @Override
@@ -86,7 +90,11 @@ public void onAnswer() {
 
     @Override
     public void onPlayDtmfTone(char dtmf) {
-        handle.put("DTMF", Character.toString(dtmf));
+        try {
+            handle.put("DTMF", Character.toString(dtmf));
+        } catch (Throwable exception) {
+            Log.e(TAG, "Handle map error", exception);
+        }
         sendCallRequestToActivity(ACTION_DTMF_TONE, handle);
     }
 
@@ -96,7 +104,11 @@ public void onDisconnect() {
         setDisconnected(new DisconnectCause(DisconnectCause.LOCAL));
         sendCallRequestToActivity(ACTION_END_CALL, handle);
         Log.d(TAG, "onDisconnect executed");
-        ((VoiceConnectionService)context).deinitConnection(handle.get(EXTRA_CALL_UUID));
+        try {
+            ((VoiceConnectionService) context).deinitConnection(handle.get(EXTRA_CALL_UUID));
+        } catch(Throwable exception) {
+            Log.e(TAG, "Handle map error", exception);
+        }
         destroy();
     }
 
@@ -125,7 +137,11 @@ public void onAbort() {
         setDisconnected(new DisconnectCause(DisconnectCause.REJECTED));
         sendCallRequestToActivity(ACTION_END_CALL, handle);
         Log.d(TAG, "onAbort executed");
-        ((VoiceConnectionService)context).deinitConnection(handle.get(EXTRA_CALL_UUID));
+        try {
+            ((VoiceConnectionService) context).deinitConnection(handle.get(EXTRA_CALL_UUID));
+        } catch(Throwable exception) {
+            Log.e(TAG, "Handle map error", exception);
+        }
         destroy();
     }
 
@@ -149,7 +165,11 @@ public void onReject() {
         setDisconnected(new DisconnectCause(DisconnectCause.REJECTED));
         sendCallRequestToActivity(ACTION_END_CALL, handle);
         Log.d(TAG, "onReject executed");
-        ((VoiceConnectionService)context).deinitConnection(handle.get(EXTRA_CALL_UUID));
+        try {
+            ((VoiceConnectionService) context).deinitConnection(handle.get(EXTRA_CALL_UUID));
+        } catch(Throwable exception) {
+            Log.e(TAG, "Handle map error", exception);
+        }
         destroy();
     }
 
@@ -168,9 +188,8 @@ public void run() {
                     Bundle extras = new Bundle();
                     extras.putSerializable("attributeMap", attributeMap);
                     intent.putExtras(extras);
+                    LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
                 }
-
-                LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
             }
         });
     }

android/src/main/java/io/wazo/callkeep/VoiceConnectionService.java

@@ -197,9 +197,8 @@ public void run() {
                     Bundle extras = new Bundle();
                     extras.putSerializable("attributeMap", attributeMap);
                     intent.putExtras(extras);
+                    LocalBroadcastManager.getInstance(instance).sendBroadcast(intent);
                 }
-
-                LocalBroadcastManager.getInstance(instance).sendBroadcast(intent);
             }
         });
     }