瀏覽代碼

Fixes

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 7 年之前
父節點
當前提交
28a729edd5

+ 8 - 6
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;

+ 1 - 1
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>