gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-22 04:59:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a strange crash with no turn/stun

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-05-15 10:16:15 +02:00
parent 3fd44dfc35
commit 328009f186
1 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -786,6 +786,9 @@ public class CallActivity extends AppCompatActivity {
@Override @Override
public void onNext(SignalingSettingsOverall signalingSettingsOverall) { public void onNext(SignalingSettingsOverall signalingSettingsOverall) {
IceServer iceServer; IceServer iceServer;
if (signalingSettingsOverall != null && signalingSettingsOverall.getOcs() != null &&
signalingSettingsOverall.getOcs().getSettings() != null) {
if (signalingSettingsOverall.getOcs().getSettings().getStunServers() != null) {
for (int i = 0; i < signalingSettingsOverall.getOcs().getSettings().getStunServers().size(); for (int i = 0; i < signalingSettingsOverall.getOcs().getSettings().getStunServers().size();
i++) { i++) {
iceServer = signalingSettingsOverall.getOcs().getSettings().getStunServers().get(i); iceServer = signalingSettingsOverall.getOcs().getSettings().getStunServers().get(i);
@ -797,7 +800,9 @@ public class CallActivity extends AppCompatActivity {
iceServer.getUsername(), iceServer.getCredential())); iceServer.getUsername(), iceServer.getCredential()));
} }
} }
}
if (signalingSettingsOverall.getOcs().getSettings().getTurnServers() != null) {
for (int i = 0; i < signalingSettingsOverall.getOcs().getSettings().getTurnServers().size(); for (int i = 0; i < signalingSettingsOverall.getOcs().getSettings().getTurnServers().size();
i++) { i++) {
iceServer = signalingSettingsOverall.getOcs().getSettings().getTurnServers().get(i); iceServer = signalingSettingsOverall.getOcs().getSettings().getTurnServers().get(i);
@ -811,6 +816,8 @@ public class CallActivity extends AppCompatActivity {
} }
} }
} }
}
}
checkCapabilities(); checkCapabilities();
} }