Catch ArrayIndexOutOfBoundsException thrown by ReadableNativeMap.hasKey

Author: manuquentin

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

@@ -294,7 +294,7 @@ private void startForegroundService() {
         Log.d(TAG, "[VoiceConnectionService] startForegroundService");
         ReadableMap foregroundSettings = getForegroundSettings(null);
 
-        if (foregroundSettings == null || !foregroundSettings.hasKey("channelId")) {
+        if (!this.isForegroundServiceConfigured()) {
             Log.w(TAG, "[VoiceConnectionService] Not creating foregroundService because not configured");
             return;
         }
@@ -342,13 +342,25 @@ private void stopForegroundService() {
         Log.d(TAG, "[VoiceConnectionService] stopForegroundService");
         ReadableMap foregroundSettings = getForegroundSettings(null);
 
-        if (foregroundSettings == null || !foregroundSettings.hasKey("channelId")) {
-            Log.d(TAG, "[VoiceConnectionService] Discarding stop foreground service, no service configured");
+        if (!this.isForegroundServiceConfigured()) {
+            Log.w(TAG, "[VoiceConnectionService] Not creating foregroundService because not configured");
             return;
         }
+
         stopForeground(FOREGROUND_SERVICE_TYPE_MICROPHONE);
     }
 
+    private boolean isForegroundServiceConfigured() {
+        ReadableMap foregroundSettings = getForegroundSettings(null);
+        try {
+            return foregroundSettings != null && foregroundSettings.hasKey("channelId");
+        } catch (Exception e) {
+            // Fix ArrayIndexOutOfBoundsException thrown by ReadableNativeMap.hasKey
+            Log.w(TAG, "[VoiceConnectionService] Not creating foregroundService due to configuration retrieval error" + e.toString());
+            return false;
+        }
+    }
+
     private void wakeUpApplication(String uuid, String number, String displayName) {
          Log.d(TAG, "[VoiceConnectionService] wakeUpApplication, uuid:" + uuid + ", number :" + number + ", displayName:" + displayName);