From 7381091c08cfb17a77ede01d879e1eacac356a99 Mon Sep 17 00:00:00 2001
From: Pierre HUBERT <pierre.git@communiquons.org>
Date: Thu, 28 Feb 2019 18:48:35 +0100
Subject: [PATCH] Fix issue

---
 .../comunic/client/ui/activities/CallActivity.java       | 9 +++++----
 app/src/main/res/values-fr/strings.xml                   | 1 +
 app/src/main/res/values/strings.xml                      | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/communiquons/android/comunic/client/ui/activities/CallActivity.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/activities/CallActivity.java
index 407b3df..691c60e 100644
--- a/app/src/main/java/org/communiquons/android/comunic/client/ui/activities/CallActivity.java
+++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/activities/CallActivity.java
@@ -1,12 +1,9 @@
 package org.communiquons.android.comunic.client.ui.activities;
 
 import android.Manifest;
-import android.content.pm.PackageManager;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
@@ -273,7 +270,11 @@ public class CallActivity extends BaseActivity implements SignalExchangerCallbac
 
         CallsConfiguration callsConfiguration = CallsHelper.GetCallsConfiguration();
 
-        assert callsConfiguration != null;
+        if(callsConfiguration == null){
+            Toast.makeText(this, R.string.err_missing_call_config, Toast.LENGTH_SHORT).show();
+            return;
+        }
+
         mSignalExchangerClient = new SignalExchangerClient(new SignalExchangerInitConfig(
                 callsConfiguration.getSignalServerName(),
                 callsConfiguration.getSignalServerPort(),
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 60b9889..1ecdeba 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -338,4 +338,5 @@
     <string name="action_save_image_in_gallery">Enregistrer dans la gallerie</string>
     <string name="err_save_image_in_gallery">Une erreur a survenue lors de l\'enregistrement de l\'image dans la gallerie !</string>
     <string name="success_save_image_in_gallery">L\'image a bien été enregistrée dans la gallerie !</string>
+    <string name="err_missing_call_config">Configuration des appels vidéos manquante !</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8225afc..5c4a91d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -337,4 +337,5 @@
     <string name="action_save_image_in_gallery">Save in gallery</string>
     <string name="err_save_image_in_gallery">Could not save the image in the gallery!</string>
     <string name="success_save_image_in_gallery">Successfully saved the image into the gallery!</string>
+    <string name="err_missing_call_config">Missing call configuration!</string>
 </resources>