gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 11:39:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2017-12-12 22:31:25 +01:00
parent 4029911a7f
commit 28a729edd5
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
View File

@ -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;

2
app/src/main/res/values/strings.xml
View File

@ -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>