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

Use the correct signaling information and user+ticket for "Join via link" as well

Browse Source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2021-05-11 19:15:06 +02:00
parent c335a69413
commit 97117eb90c
No known key found for this signature in database
GPG Key ID: 7076EA9751AACDDA
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/nextcloud/talk/controllers/CallController.java
View File

@ -1132,7 +1132,13 @@ public class CallController extends BaseController {
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.subscribe(); .subscribe();
} catch (IOException exception) { } catch (IOException exception) {
Log.e(TAG, "Failed to serialize external signaling server"); Log.e(TAG, "Failed to serialize external signaling server", exception);
}
} else {
try {
conversationUser.setExternalSignalingServer(LoganSquare.serialize(externalSignalingServer));
} catch (IOException exception) {
Log.e(TAG, "Failed to serialize external signaling server", exception);
} }
} }
@ -1172,6 +1178,7 @@ public class CallController extends BaseController {
@Override @Override
public void onError(Throwable e) { public void onError(Throwable e) {
Log.e(TAG, e.getMessage(), e);
} }
@Override @Override

10
app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java
View File

@ -152,9 +152,10 @@ public class MagicWebSocketInstance extends WebSocketListener {
public void restartWebSocket() { public void restartWebSocket() {
reconnecting = true; reconnecting = true;
Request request = new Request.Builder().url(connectionUrl).build(); Log.d(TAG, "restartWebSocket: " + connectionUrl);
okHttpClient.newWebSocket(request, this); Request request = new Request.Builder().url(connectionUrl).build();
restartCount++; okHttpClient.newWebSocket(request, this);
restartCount++;
} }
@Override @Override
@ -196,6 +197,7 @@ public class MagicWebSocketInstance extends WebSocketListener {
eventBus.post(new WebSocketCommunicationEvent("hello", helloHasHap)); eventBus.post(new WebSocketCommunicationEvent("hello", helloHasHap));
break; break;
case "error": case "error":
Log.e(TAG, "Received error: " + text);
ErrorOverallWebSocketMessage errorOverallWebSocketMessage = LoganSquare.parse(text, ErrorOverallWebSocketMessage.class); ErrorOverallWebSocketMessage errorOverallWebSocketMessage = LoganSquare.parse(text, ErrorOverallWebSocketMessage.class);
if (("no_such_session").equals(errorOverallWebSocketMessage.getErrorWebSocketMessage().getCode())) { if (("no_such_session").equals(errorOverallWebSocketMessage.getErrorWebSocketMessage().getCode())) {
LoggingUtils.INSTANCE.writeLogEntryToFile(context, LoggingUtils.INSTANCE.writeLogEntryToFile(context,
@ -351,7 +353,7 @@ public class MagicWebSocketInstance extends WebSocketListener {
} }
} }
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); Log.e(TAG, e.getMessage(), e);
} }
} }

4
app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java
View File

@ -98,7 +98,9 @@ public class WebSocketConnectionHelper {
authWebSocketMessage.setUrl(ApiUtils.getUrlForSignalingBackend(apiVersion, userEntity.getBaseUrl())); authWebSocketMessage.setUrl(ApiUtils.getUrlForSignalingBackend(apiVersion, userEntity.getBaseUrl()));
AuthParametersWebSocketMessage authParametersWebSocketMessage = new AuthParametersWebSocketMessage(); AuthParametersWebSocketMessage authParametersWebSocketMessage = new AuthParametersWebSocketMessage();
authParametersWebSocketMessage.setTicket(ticket); authParametersWebSocketMessage.setTicket(ticket);
authParametersWebSocketMessage.setUserid(userEntity.getUserId()); if (!userEntity.getUserId().equals("?")) {
authParametersWebSocketMessage.setUserid(userEntity.getUserId());
}
authWebSocketMessage.setAuthParametersWebSocketMessage(authParametersWebSocketMessage); authWebSocketMessage.setAuthParametersWebSocketMessage(authParametersWebSocketMessage);
helloWebSocketMessage.setAuthWebSocketMessage(authWebSocketMessage); helloWebSocketMessage.setAuthWebSocketMessage(authWebSocketMessage);
helloOverallWebSocketMessage.setHelloWebSocketMessage(helloWebSocketMessage); helloOverallWebSocketMessage.setHelloWebSocketMessage(helloWebSocketMessage);