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

Fix up singleton to store room state

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-06-19 20:46:20 +02:00
parent 76fc46ab04
commit caebce2b22
2 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -979,8 +979,6 @@ public class CallController extends BaseController {
connectingView.setVisibility(View.GONE); connectingView.setVisibility(View.GONE);
conversationView.setVisibility(View.VISIBLE); conversationView.setVisibility(View.VISIBLE);
// start pinging the call
if (!hasChatSupport) {
ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomId(roomId); ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomId(roomId);
ApplicationWideCurrentRoomHolder.getInstance().setInCall(true); ApplicationWideCurrentRoomHolder.getInstance().setInCall(true);
ApplicationWideCurrentRoomHolder.getInstance().setUserInRoom(userEntity); ApplicationWideCurrentRoomHolder.getInstance().setUserInRoom(userEntity);
@ -1012,9 +1010,6 @@ public class CallController extends BaseController {
dispose(pingDisposable); dispose(pingDisposable);
} }
}); });
} else {
ApplicationWideCurrentRoomHolder.getInstance().setInCall(true);
}
// Start pulling signaling messages // Start pulling signaling messages
String urlToken = null; String urlToken = null;

10
app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
View File

@ -156,7 +156,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
private int newMessagesCount = 0; private int newMessagesCount = 0;
private Boolean startCallFromNotification; private Boolean startCallFromNotification;
private String roomId; private String roomId;
private boolean voiceOnly = false; private boolean voiceOnly;
public ChatController(Bundle args) { public ChatController(Bundle args) {
super(args); super(args);
@ -173,10 +173,6 @@ public class ChatController extends BaseController implements MessagesListAdapte
this.roomId = args.getString(BundleKeys.KEY_ROOM_ID, ""); this.roomId = args.getString(BundleKeys.KEY_ROOM_ID, "");
ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomId(roomId);
ApplicationWideCurrentRoomHolder.getInstance().setInCall(false);
ApplicationWideCurrentRoomHolder.getInstance().setUserInRoom(conversationUser);
this.roomToken = args.getString(BundleKeys.KEY_ROOM_TOKEN, ""); this.roomToken = args.getString(BundleKeys.KEY_ROOM_TOKEN, "");
if (args.containsKey(BundleKeys.KEY_ACTIVE_CONVERSATION)) { if (args.containsKey(BundleKeys.KEY_ACTIVE_CONVERSATION)) {
@ -414,6 +410,10 @@ public class ChatController extends BaseController implements MessagesListAdapte
getActionBar().setDisplayHomeAsUpEnabled(true); getActionBar().setDisplayHomeAsUpEnabled(true);
} }
ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomId(roomId);
ApplicationWideCurrentRoomHolder.getInstance().setInCall(false);
ApplicationWideCurrentRoomHolder.getInstance().setUserInRoom(conversationUser);
if (mentionAutocomplete != null && mentionAutocomplete.isPopupShowing()) { if (mentionAutocomplete != null && mentionAutocomplete.isPopupShowing()) {
mentionAutocomplete.dismissPopup(); mentionAutocomplete.dismissPopup();
} }