From 28a729edd52479827be017fd896ab4b45bb47647 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Tue, 12 Dec 2017 22:31:25 +0100
Subject: [PATCH] Fixes

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../nextcloud/talk/activities/CallActivity.java    | 14 ++++++++------
 app/src/main/res/values/strings.xml                |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index 03002040a..fac4ea0d3 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -651,14 +651,16 @@ public class CallActivity extends AppCompatActivity {
         }
 
 
-        if (localMediaStream.videoTracks != null && localMediaStream.videoTracks.size() > 0) {
-            localMediaStream.removeTrack(localMediaStream.videoTracks.get(0));
+        if (localMediaStream != null) {
+            if (localMediaStream.videoTracks != null && localMediaStream.videoTracks.size() > 0) {
+                localMediaStream.removeTrack(localMediaStream.videoTracks.get(0));
+            }
+
+            if (localMediaStream.audioTracks != null && localMediaStream.audioTracks.size() > 0) {
+                localMediaStream.removeTrack(localMediaStream.audioTracks.get(0));
+            }
         }
 
-        if (localMediaStream.audioTracks != null && localMediaStream.audioTracks.size() > 0) {
-            localMediaStream.removeTrack(localMediaStream.audioTracks.get(0));
-        }
-        
         localVideoTrack = null;
         localAudioTrack = null;
         localRenderer = null;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fa3a5b848..39dc6d09f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -80,7 +80,7 @@
     <string name="nc_permissions">We need certain permissions to establish a video call. Please click \"ALLOW\" in
         the upcoming system dialog.</string>
     <string name="nc_permissions_permanently_denied">We need certain permissions to establish a video call. Please
-        grant the \"Camera\" and  \"Record audio\" permission in system settings.</string>
+        grant the \"Camera\" and  \"Microphone\" permission in system settings.</string>
     <string name="nc_permissions_settings">Open settings</string>
 
 </resources>