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

Merge commit 'fde2667fe79a09e6b267a26bb61c06730d43d7d5'

Browse Source
This commit is contained in:
drone 2022-07-14 16:40:05 +00:00
commit 5e2bd3c12d
4 changed files with 62 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,6 +58,7 @@ import com.nextcloud.talk.adapters.ParticipantDisplayItem;
import com.nextcloud.talk.adapters.ParticipantsAdapter; import com.nextcloud.talk.adapters.ParticipantsAdapter;
import com.nextcloud.talk.api.NcApi; import com.nextcloud.talk.api.NcApi;
import com.nextcloud.talk.application.NextcloudTalkApplication; import com.nextcloud.talk.application.NextcloudTalkApplication;
import com.nextcloud.talk.data.user.model.User;
import com.nextcloud.talk.databinding.CallActivityBinding; import com.nextcloud.talk.databinding.CallActivityBinding;
import com.nextcloud.talk.events.ConfigurationChangeEvent; import com.nextcloud.talk.events.ConfigurationChangeEvent;
import com.nextcloud.talk.events.MediaStreamEvent; import com.nextcloud.talk.events.MediaStreamEvent;
@ -66,7 +67,6 @@ import com.nextcloud.talk.events.PeerConnectionEvent;
import com.nextcloud.talk.events.SessionDescriptionSendEvent; import com.nextcloud.talk.events.SessionDescriptionSendEvent;
import com.nextcloud.talk.events.WebSocketCommunicationEvent; import com.nextcloud.talk.events.WebSocketCommunicationEvent;
import com.nextcloud.talk.models.ExternalSignalingServer; import com.nextcloud.talk.models.ExternalSignalingServer;
import com.nextcloud.talk.models.database.UserEntity;
import com.nextcloud.talk.models.json.capabilities.CapabilitiesOverall; import com.nextcloud.talk.models.json.capabilities.CapabilitiesOverall;
import com.nextcloud.talk.models.json.conversations.Conversation; import com.nextcloud.talk.models.json.conversations.Conversation;
import com.nextcloud.talk.models.json.conversations.RoomOverall; import com.nextcloud.talk.models.json.conversations.RoomOverall;
@ -85,13 +85,12 @@ import com.nextcloud.talk.models.json.signaling.SignalingOverall;
import com.nextcloud.talk.models.json.signaling.settings.IceServer; import com.nextcloud.talk.models.json.signaling.settings.IceServer;
import com.nextcloud.talk.models.json.signaling.settings.SignalingSettingsOverall; import com.nextcloud.talk.models.json.signaling.settings.SignalingSettingsOverall;
import com.nextcloud.talk.ui.dialog.AudioOutputDialog; import com.nextcloud.talk.ui.dialog.AudioOutputDialog;
import com.nextcloud.talk.users.UserManager;
import com.nextcloud.talk.utils.ApiUtils; import com.nextcloud.talk.utils.ApiUtils;
import com.nextcloud.talk.utils.DisplayUtils; import com.nextcloud.talk.utils.DisplayUtils;
import com.nextcloud.talk.utils.LegacyUserEntityMapper;
import com.nextcloud.talk.utils.NotificationUtils; import com.nextcloud.talk.utils.NotificationUtils;
import com.nextcloud.talk.utils.animations.PulseAnimation; import com.nextcloud.talk.utils.animations.PulseAnimation;
import com.nextcloud.talk.utils.bundle.BundleKeys; import com.nextcloud.talk.utils.bundle.BundleKeys;
import com.nextcloud.talk.utils.database.user.UserUtils;
import com.nextcloud.talk.utils.permissions.PlatformPermissionUtil; import com.nextcloud.talk.utils.permissions.PlatformPermissionUtil;
import com.nextcloud.talk.utils.power.PowerManagerUtils; import com.nextcloud.talk.utils.power.PowerManagerUtils;
import com.nextcloud.talk.utils.preferences.AppPreferences; import com.nextcloud.talk.utils.preferences.AppPreferences;
@ -181,7 +180,7 @@ public class CallActivity extends CallBaseActivity {
@Inject @Inject
EventBus eventBus; EventBus eventBus;
@Inject @Inject
UserUtils userUtils; UserManager userManager;
@Inject @Inject
AppPreferences appPreferences; AppPreferences appPreferences;
@Inject @Inject
@ -228,7 +227,7 @@ public class CallActivity extends CallBaseActivity {
private List<PeerConnection.IceServer> iceServers; private List<PeerConnection.IceServer> iceServers;
private CameraEnumerator cameraEnumerator; private CameraEnumerator cameraEnumerator;
private String roomToken; private String roomToken;
private UserEntity conversationUser; private User conversationUser;
private String conversationName; private String conversationName;
private String callSession; private String callSession;
private MediaStream localStream; private MediaStream localStream;
@ -1209,30 +1208,28 @@ public class CallActivity extends CallBaseActivity {
} }
Log.d(TAG, " hasExternalSignalingServer: " + hasExternalSignalingServer); Log.d(TAG, " hasExternalSignalingServer: " + hasExternalSignalingServer);
if (!conversationUser.getUserId().equals("?")) { if (!"?".equals(conversationUser.getUserId())) {
try { try {
userUtils.createOrUpdateUser(null, userManager.createOrUpdateUser(
null, null,
null, new UserManager.UserAttributes(
null, conversationUser.getId(),
null, null,
null, null,
null, null,
conversationUser.getId(), null,
null, null,
null, null,
LoganSquare.serialize(externalSignalingServer)) null,
null,
LoganSquare.serialize(externalSignalingServer)))
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.subscribe(); .subscribe();
} catch (IOException exception) { } catch (IOException exception) {
Log.e(TAG, "Failed to serialize external signaling server", exception); Log.e(TAG, "Failed to serialize external signaling server", exception);
} }
} else { } else {
try { conversationUser.setExternalSignalingServer(externalSignalingServer);
conversationUser.setExternalSignalingServer(LoganSquare.serialize(externalSignalingServer));
} catch (IOException exception) {
Log.e(TAG, "Failed to serialize external signaling server", exception);
}
} }
if (signalingSettingsOverall.getOcs().getSettings().getStunServers() != null) { if (signalingSettingsOverall.getOcs().getSettings().getStunServers() != null) {
@ -1353,8 +1350,7 @@ public class CallActivity extends CallBaseActivity {
ApplicationWideCurrentRoomHolder.getInstance().setSession(callSession); ApplicationWideCurrentRoomHolder.getInstance().setSession(callSession);
ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomId(roomId); ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomId(roomId);
ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomToken(roomToken); ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomToken(roomToken);
ApplicationWideCurrentRoomHolder.getInstance().setUserInRoom( ApplicationWideCurrentRoomHolder.getInstance().setUserInRoom(conversationUser);
LegacyUserEntityMapper.toModel(conversationUser));
callOrJoinRoomViaWebSocket(); callOrJoinRoomViaWebSocket();
} }
@ -1417,7 +1413,7 @@ public class CallActivity extends CallBaseActivity {
if (!TextUtils.isEmpty(roomToken)) { if (!TextUtils.isEmpty(roomToken)) {
NotificationUtils.INSTANCE.cancelExistingNotificationsForRoom(getApplicationContext(), NotificationUtils.INSTANCE.cancelExistingNotificationsForRoom(getApplicationContext(),
Objects.requireNonNull(LegacyUserEntityMapper.toModel(conversationUser)), conversationUser,
roomToken); roomToken);
} }

18
app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java
View File

@ -121,7 +121,12 @@ public class ApiUtils {
return baseUrl + ocsApiVersion + "/cloud/capabilities"; return baseUrl + ocsApiVersion + "/cloud/capabilities";
} }
@Deprecated
public static int getCallApiVersion(UserEntity capabilities, int[] versions) throws NoSupportedApiException { public static int getCallApiVersion(UserEntity capabilities, int[] versions) throws NoSupportedApiException {
return getCallApiVersion(LegacyUserEntityMapper.toModel(capabilities), versions);
}
public static int getCallApiVersion(User capabilities, int[] versions) throws NoSupportedApiException {
return getConversationApiVersion(capabilities, versions); return getConversationApiVersion(capabilities, versions);
} }
@ -161,20 +166,25 @@ public class ApiUtils {
return getConversationApiVersion(LegacyUserEntityMapper.toModel(user), versions); return getConversationApiVersion(LegacyUserEntityMapper.toModel(user), versions);
} }
@Deprecated
public static int getSignalingApiVersion(UserEntity user, int[] versions) throws NoSupportedApiException { public static int getSignalingApiVersion(UserEntity user, int[] versions) throws NoSupportedApiException {
return getSignalingApiVersion(LegacyUserEntityMapper.toModel(user), versions);
}
public static int getSignalingApiVersion(User user, int[] versions) throws NoSupportedApiException {
for (int version : versions) { for (int version : versions) {
if (CapabilitiesUtil.hasSpreedFeatureCapability(user, "signaling-v" + version)) { if (CapabilitiesUtilNew.hasSpreedFeatureCapability(user, "signaling-v" + version)) {
return version; return version;
} }
if (version == APIv2 && if (version == APIv2 &&
CapabilitiesUtil.hasSpreedFeatureCapability(user, "sip-support") && CapabilitiesUtilNew.hasSpreedFeatureCapability(user, "sip-support") &&
!CapabilitiesUtil.hasSpreedFeatureCapability(user, "signaling-v3")) { !CapabilitiesUtilNew.hasSpreedFeatureCapability(user, "signaling-v3")) {
return version; return version;
} }
if (version == APIv1 && if (version == APIv1 &&
!CapabilitiesUtil.hasSpreedFeatureCapability(user, "signaling-v3")) { !CapabilitiesUtilNew.hasSpreedFeatureCapability(user, "signaling-v3")) {
// Has no capability, we just assume it is always there when there is no v3 or later // Has no capability, we just assume it is always there when there is no v3 or later
return version; return version;
} }

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

@ -27,9 +27,9 @@ import android.util.Log;
import com.bluelinelabs.logansquare.LoganSquare; import com.bluelinelabs.logansquare.LoganSquare;
import com.nextcloud.talk.R; import com.nextcloud.talk.R;
import com.nextcloud.talk.application.NextcloudTalkApplication; import com.nextcloud.talk.application.NextcloudTalkApplication;
import com.nextcloud.talk.data.user.model.User;
import com.nextcloud.talk.events.NetworkEvent; import com.nextcloud.talk.events.NetworkEvent;
import com.nextcloud.talk.events.WebSocketCommunicationEvent; import com.nextcloud.talk.events.WebSocketCommunicationEvent;
import com.nextcloud.talk.models.database.UserEntity;
import com.nextcloud.talk.models.json.participants.Participant; import com.nextcloud.talk.models.json.participants.Participant;
import com.nextcloud.talk.models.json.signaling.NCMessageWrapper; import com.nextcloud.talk.models.json.signaling.NCMessageWrapper;
import com.nextcloud.talk.models.json.signaling.NCSignalingMessage; import com.nextcloud.talk.models.json.signaling.NCSignalingMessage;
@ -90,7 +90,7 @@ public class MagicWebSocketInstance extends WebSocketListener {
@Inject @Inject
Context context; Context context;
private UserEntity conversationUser; private User conversationUser;
private String webSocketTicket; private String webSocketTicket;
private String resumeId; private String resumeId;
private String sessionId; private String sessionId;
@ -109,7 +109,7 @@ public class MagicWebSocketInstance extends WebSocketListener {
private List<String> messagesQueue = new ArrayList<>(); private List<String> messagesQueue = new ArrayList<>();
MagicWebSocketInstance(UserEntity conversationUser, String connectionUrl, String webSocketTicket) { MagicWebSocketInstance(User conversationUser, String connectionUrl, String webSocketTicket) {
NextcloudTalkApplication.Companion.getSharedApplication().getComponentApplication().inject(this); NextcloudTalkApplication.Companion.getSharedApplication().getComponentApplication().inject(this);
this.connectionUrl = connectionUrl; this.connectionUrl = connectionUrl;

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

@ -24,6 +24,7 @@ import android.annotation.SuppressLint;
import android.util.Log; import android.util.Log;
import com.nextcloud.talk.application.NextcloudTalkApplication; import com.nextcloud.talk.application.NextcloudTalkApplication;
import com.nextcloud.talk.data.user.model.User;
import com.nextcloud.talk.models.database.UserEntity; import com.nextcloud.talk.models.database.UserEntity;
import com.nextcloud.talk.models.json.signaling.NCMessageWrapper; import com.nextcloud.talk.models.json.signaling.NCMessageWrapper;
import com.nextcloud.talk.models.json.websocket.ActorWebSocketMessage; import com.nextcloud.talk.models.json.websocket.ActorWebSocketMessage;
@ -39,6 +40,7 @@ import com.nextcloud.talk.models.json.websocket.RoomOverallWebSocketMessage;
import com.nextcloud.talk.models.json.websocket.RoomWebSocketMessage; import com.nextcloud.talk.models.json.websocket.RoomWebSocketMessage;
import com.nextcloud.talk.models.json.websocket.SignalingDataWebSocketMessageForOffer; import com.nextcloud.talk.models.json.websocket.SignalingDataWebSocketMessageForOffer;
import com.nextcloud.talk.utils.ApiUtils; import com.nextcloud.talk.utils.ApiUtils;
import com.nextcloud.talk.utils.LegacyUserEntityMapper;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -70,7 +72,19 @@ public class WebSocketConnectionHelper {
return null; return null;
} }
public static synchronized MagicWebSocketInstance getExternalSignalingInstanceForServer(String url, UserEntity userEntity, String webSocketTicket, boolean isGuest) { @Deprecated
public static synchronized MagicWebSocketInstance getExternalSignalingInstanceForServer(String url,
UserEntity userEntity,
String webSocketTicket, boolean isGuest) {
return getExternalSignalingInstanceForServer(url,
LegacyUserEntityMapper.toModel(userEntity),
webSocketTicket,
isGuest);
}
public static synchronized MagicWebSocketInstance getExternalSignalingInstanceForServer(String url,
User user,
String webSocketTicket, boolean isGuest) {
String generatedURL = url.replace("https://", "wss://").replace("http://", "ws://"); String generatedURL = url.replace("https://", "wss://").replace("http://", "ws://");
if (generatedURL.endsWith("/")) { if (generatedURL.endsWith("/")) {
@ -79,18 +93,17 @@ public class WebSocketConnectionHelper {
generatedURL += "/spreed"; generatedURL += "/spreed";
} }
long userId = isGuest ? -1 : userEntity.getId(); long userId = isGuest ? -1 : user.getId();
MagicWebSocketInstance magicWebSocketInstance; MagicWebSocketInstance magicWebSocketInstance;
if (userId != -1 && magicWebSocketInstanceMap.containsKey(userEntity.getId()) && (magicWebSocketInstance = magicWebSocketInstanceMap.get(userEntity.getId())) != null) { if (userId != -1 && magicWebSocketInstanceMap.containsKey(user.getId()) && (magicWebSocketInstance = magicWebSocketInstanceMap.get(user.getId())) != null) {
return magicWebSocketInstance; return magicWebSocketInstance;
} else { } else {
if (userId == -1) { if (userId == -1) {
deleteExternalSignalingInstanceForUserEntity(userId); deleteExternalSignalingInstanceForUserEntity(userId);
} }
magicWebSocketInstance = new MagicWebSocketInstance(userEntity, generatedURL, webSocketTicket); magicWebSocketInstance = new MagicWebSocketInstance(user, generatedURL, webSocketTicket);
magicWebSocketInstanceMap.put(userEntity.getId(), magicWebSocketInstance); magicWebSocketInstanceMap.put(user.getId(), magicWebSocketInstance);
return magicWebSocketInstance; return magicWebSocketInstance;
} }
} }
@ -105,19 +118,19 @@ public class WebSocketConnectionHelper {
} }
} }
HelloOverallWebSocketMessage getAssembledHelloModel(UserEntity userEntity, String ticket) { HelloOverallWebSocketMessage getAssembledHelloModel(User user, String ticket) {
int apiVersion = ApiUtils.getSignalingApiVersion(userEntity, new int[] {ApiUtils.APIv3, 2, 1}); int apiVersion = ApiUtils.getSignalingApiVersion(user, new int[] {ApiUtils.APIv3, 2, 1});
HelloOverallWebSocketMessage helloOverallWebSocketMessage = new HelloOverallWebSocketMessage(); HelloOverallWebSocketMessage helloOverallWebSocketMessage = new HelloOverallWebSocketMessage();
helloOverallWebSocketMessage.setType("hello"); helloOverallWebSocketMessage.setType("hello");
HelloWebSocketMessage helloWebSocketMessage = new HelloWebSocketMessage(); HelloWebSocketMessage helloWebSocketMessage = new HelloWebSocketMessage();
helloWebSocketMessage.setVersion("1.0"); helloWebSocketMessage.setVersion("1.0");
AuthWebSocketMessage authWebSocketMessage = new AuthWebSocketMessage(); AuthWebSocketMessage authWebSocketMessage = new AuthWebSocketMessage();
authWebSocketMessage.setUrl(ApiUtils.getUrlForSignalingBackend(apiVersion, userEntity.getBaseUrl())); authWebSocketMessage.setUrl(ApiUtils.getUrlForSignalingBackend(apiVersion, user.getBaseUrl()));
AuthParametersWebSocketMessage authParametersWebSocketMessage = new AuthParametersWebSocketMessage(); AuthParametersWebSocketMessage authParametersWebSocketMessage = new AuthParametersWebSocketMessage();
authParametersWebSocketMessage.setTicket(ticket); authParametersWebSocketMessage.setTicket(ticket);
if (!userEntity.getUserId().equals("?")) { if (!("?").equals(user.getUserId())) {
authParametersWebSocketMessage.setUserid(userEntity.getUserId()); authParametersWebSocketMessage.setUserid(user.getUserId());
} }
authWebSocketMessage.setAuthParametersWebSocketMessage(authParametersWebSocketMessage); authWebSocketMessage.setAuthParametersWebSocketMessage(authParametersWebSocketMessage);
helloWebSocketMessage.setAuthWebSocketMessage(authWebSocketMessage); helloWebSocketMessage.setAuthWebSocketMessage(authWebSocketMessage);