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

Fix #395

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-12-27 15:01:25 +01:00
parent 1c504bdfe6
commit e1cdea2584
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -691,12 +691,8 @@ public class CallController extends BaseController {
} }
@OnClick(R.id.callControlHangupView) @OnClick(R.id.callControlHangupView)
public void onHangupClick() { void onHangupClick() {
if (inCall) { hangup(false);
hangup(false);
} else {
hangup(true);
}
} }
@OnClick(R.id.call_control_camera) @OnClick(R.id.call_control_camera)

2
app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
View File

@ -194,7 +194,7 @@ public class CallNotificationController extends BaseController {
private void proceedToCall() { private void proceedToCall() {
originalBundle.putString(BundleKeys.KEY_ROOM_TOKEN, currentConversation.getToken()); originalBundle.putString(BundleKeys.KEY_ROOM_TOKEN, currentConversation.getToken());
getRouter().setRoot(RouterTransaction.with(new CallController(originalBundle)) getRouter().replaceTopController(RouterTransaction.with(new CallController(originalBundle))
.popChangeHandler(new HorizontalChangeHandler()) .popChangeHandler(new HorizontalChangeHandler())
.pushChangeHandler(new HorizontalChangeHandler())); .pushChangeHandler(new HorizontalChangeHandler()));
} }

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

@ -169,6 +169,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
private boolean voiceOnly; private boolean voiceOnly;
private boolean isFirstMessagesProcessing = true; private boolean isFirstMessagesProcessing = true;
private boolean isHelloClicked; private boolean isHelloClicked;
private boolean isLeavingForConversation;
private static final byte CONTENT_TYPE_SYSTEM_MESSAGE = 1; private static final byte CONTENT_TYPE_SYSTEM_MESSAGE = 1;
@ -489,6 +490,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
protected void onAttach(@NonNull View view) { protected void onAttach(@NonNull View view) {
super.onAttach(view); super.onAttach(view);
isLeavingForConversation = false;
ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomId(roomId); ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomId(roomId);
ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomToken(roomId); ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomToken(roomId);
ApplicationWideCurrentRoomHolder.getInstance().setInCall(false); ApplicationWideCurrentRoomHolder.getInstance().setInCall(false);
@ -517,7 +519,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
protected void onDetach(@NonNull View view) { protected void onDetach(@NonNull View view) {
super.onDetach(view); super.onDetach(view);
if (conversationUser.hasSpreedCapabilityWithName("no-ping") if (conversationUser.hasSpreedCapabilityWithName("no-ping")
&& getActivity() != null && !getActivity().isChangingConfigurations()) { && getActivity() != null && !getActivity().isChangingConfigurations() && !isLeavingForConversation) {
wasDetached = true; wasDetached = true;
leaveRoom(); leaveRoom();
} }
@ -1013,6 +1015,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
} }
private void startACall(boolean isVoiceOnlyCall) { private void startACall(boolean isVoiceOnlyCall) {
isLeavingForConversation = true;
if (!isVoiceOnlyCall) { if (!isVoiceOnlyCall) {
Intent videoCallIntent = getIntentForCall(false); Intent videoCallIntent = getIntentForCall(false);
if (videoCallIntent != null) { if (videoCallIntent != null) {

4
app/src/main/res/layout/controller_call.xml
View File

@ -70,7 +70,9 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:animateLayoutChanges="true" android:animateLayoutChanges="true"
android:background="@color/grey950" android:background="@color/grey950"
android:orientation="vertical"></LinearLayout> android:orientation="vertical">
</LinearLayout>
<FrameLayout <FrameLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"