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

Cancel notifications when joining a call

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-08-05 10:46:46 +02:00
parent 2f0f90f5f6
commit c4ee25aee0
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,6 +74,7 @@ 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.utils.ApiUtils; import com.nextcloud.talk.utils.ApiUtils;
import com.nextcloud.talk.utils.MagicFlipView; import com.nextcloud.talk.utils.MagicFlipView;
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.database.user.UserUtils;
@ -210,7 +211,7 @@ public class CallController extends BaseController {
private List<PeerConnection.IceServer> iceServers; private List<PeerConnection.IceServer> iceServers;
private CameraEnumerator cameraEnumerator; private CameraEnumerator cameraEnumerator;
private String roomToken; private String roomToken;
private UserEntity userEntity; private UserEntity conversationUser;
private String callSession; private String callSession;
private MediaStream localMediaStream; private MediaStream localMediaStream;
private String credentials; private String credentials;
@ -243,24 +244,24 @@ public class CallController extends BaseController {
roomId = args.getString(BundleKeys.KEY_ROOM_ID, ""); roomId = args.getString(BundleKeys.KEY_ROOM_ID, "");
roomToken = args.getString(BundleKeys.KEY_ROOM_TOKEN, ""); roomToken = args.getString(BundleKeys.KEY_ROOM_TOKEN, "");
userEntity = Parcels.unwrap(args.getParcelable(BundleKeys.KEY_USER_ENTITY)); conversationUser = Parcels.unwrap(args.getParcelable(BundleKeys.KEY_USER_ENTITY));
if (userEntity == null) { if (conversationUser == null) {
userEntity = userUtils.getCurrentUser(); conversationUser = userUtils.getCurrentUser();
} }
callSession = args.getString(BundleKeys.KEY_CALL_SESSION, "0"); callSession = args.getString(BundleKeys.KEY_CALL_SESSION, "0");
credentials = ApiUtils.getCredentials(userEntity.getUsername(), userEntity.getToken()); credentials = ApiUtils.getCredentials(conversationUser.getUsername(), conversationUser.getToken());
isVoiceOnlyCall = args.getBoolean(BundleKeys.KEY_CALL_VOICE_ONLY, false); isVoiceOnlyCall = args.getBoolean(BundleKeys.KEY_CALL_VOICE_ONLY, false);
if (userEntity.getUserId().equals("?")) { if (conversationUser.getUserId().equals("?")) {
credentials = null; credentials = null;
} }
baseUrl = args.getString(BundleKeys.KEY_MODIFIED_BASE_URL, ""); baseUrl = args.getString(BundleKeys.KEY_MODIFIED_BASE_URL, "");
if (TextUtils.isEmpty(baseUrl)) { if (TextUtils.isEmpty(baseUrl)) {
baseUrl = userEntity.getBaseUrl(); baseUrl = conversationUser.getBaseUrl();
} }
isFromNotification = TextUtils.isEmpty(roomToken); isFromNotification = TextUtils.isEmpty(roomToken);
@ -1051,7 +1052,7 @@ public class CallController extends BaseController {
ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomId(roomId); ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomId(roomId);
ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomToken(roomToken); ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomToken(roomToken);
ApplicationWideCurrentRoomHolder.getInstance().setInCall(true); ApplicationWideCurrentRoomHolder.getInstance().setInCall(true);
ApplicationWideCurrentRoomHolder.getInstance().setUserInRoom(userEntity); ApplicationWideCurrentRoomHolder.getInstance().setUserInRoom(conversationUser);
if (needsPing) { if (needsPing) {
ncApi.pingCall(credentials, ApiUtils.getUrlForCallPing(baseUrl, roomToken)) ncApi.pingCall(credentials, ApiUtils.getUrlForCallPing(baseUrl, roomToken))
@ -1088,6 +1089,9 @@ public class CallController extends BaseController {
if (isMultiSession) { if (isMultiSession) {
urlToken = roomToken; urlToken = roomToken;
} }
NotificationUtils.cancelExistingNotifications(getApplicationContext(), conversationUser);
ncApi.pullSignalingMessages(credentials, ApiUtils.getUrlForSignaling(baseUrl, urlToken)) ncApi.pullSignalingMessages(credentials, ApiUtils.getUrlForSignaling(baseUrl, urlToken))
.subscribeOn(Schedulers.newThread()) .subscribeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
@ -1539,7 +1543,7 @@ public class CallController extends BaseController {
if (!"candidate".equals(sessionDescriptionSend.getType())) { if (!"candidate".equals(sessionDescriptionSend.getType())) {
ncMessagePayload.setSdp(sessionDescriptionSend.getSessionDescription().description); ncMessagePayload.setSdp(sessionDescriptionSend.getSessionDescription().description);
ncMessagePayload.setNick(userEntity.getDisplayName()); ncMessagePayload.setNick(conversationUser.getDisplayName());
} else { } else {
ncMessagePayload.setIceCandidate(sessionDescriptionSend.getNcIceCandidate()); ncMessagePayload.setIceCandidate(sessionDescriptionSend.getNcIceCandidate());
} }