From fba1be573ef5a8cc5fa69499d16e5742aa459eff Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 3 Oct 2018 11:18:01 +0200
Subject: [PATCH] Trying to prevent some crashes

---
 src/android/org/linphone/LinphoneManager.java   | 6 ++++--
 src/android/org/linphone/call/CallActivity.java | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java
index ee89c269c..7746d9a1c 100644
--- a/src/android/org/linphone/LinphoneManager.java
+++ b/src/android/org/linphone/LinphoneManager.java
@@ -323,8 +323,10 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
     }
 
     public synchronized static final LinphoneManager createAndStart(Context c) {
-        if (instance != null)
-            throw new RuntimeException("Linphone Manager is already initialized");
+        if (instance != null) {
+            Log.e("Linphone Manager is already initialized ! Destroying it and creating a new one...");
+            destroy();
+        }
 
         instance = new LinphoneManager(c);
         instance.startLibLinphone(c);
diff --git a/src/android/org/linphone/call/CallActivity.java b/src/android/org/linphone/call/CallActivity.java
index ac15ecf15..178f9d3a2 100644
--- a/src/android/org/linphone/call/CallActivity.java
+++ b/src/android/org/linphone/call/CallActivity.java
@@ -1640,10 +1640,10 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
             if (isVideo) {
                 formatText(videoResolutionSent,
                         getString(R.string.call_stats_video_resolution_sent),
-                        "\u2191 " + params.getSentVideoDefinition().getName());
+                        "\u2191 " + params.getSentVideoDefinition() != null ? params.getSentVideoDefinition().getName() : "");
                 formatText(videoResolutionReceived,
                         getString(R.string.call_stats_video_resolution_received),
-                        "\u2193 " + params.getReceivedVideoDefinition().getName());
+                        "\u2193 " + params.getReceivedVideoDefinition() != null ? params.getReceivedVideoDefinition().getName() : "");
                 formatText(videoFpsSent,
                         getString(R.string.call_stats_video_fps_sent),
                         "\u2191 " + params.getSentFramerate());