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

Remove duplicate clicks on conversation info

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-09-09 11:17:05 +02:00
parent d2b47b22ed
commit 175f64b8c3
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -522,10 +522,6 @@ public class ChatController extends BaseController implements MessagesListAdapte
messageInputView.getButton().setContentDescription(getResources() messageInputView.getButton().setContentDescription(getResources()
.getString(R.string.nc_description_send_message_button)); .getString(R.string.nc_description_send_message_button));
if (!conversationUser.getUserId().equals("?") && conversationUser.hasSpreedFeatureCapability("mention-flag") && getActivity() != null) {
getActivity().findViewById(R.id.toolbar).setOnClickListener(v -> showConversationInfoScreen());
}
if (currentConversation != null) { if (currentConversation != null) {
loadAvatarForStatusBar(); loadAvatarForStatusBar();
checkLobbyState(); checkLobbyState();
@ -652,6 +648,10 @@ public class ChatController extends BaseController implements MessagesListAdapte
super.onAttach(view); super.onAttach(view);
eventBus.register(this); eventBus.register(this);
if (!conversationUser.getUserId().equals("?") && conversationUser.hasSpreedFeatureCapability("mention-flag") && getActivity() != null) {
getActivity().findViewById(R.id.toolbar).setOnClickListener(v -> showConversationInfoScreen());
}
isLeavingForConversation = false; isLeavingForConversation = false;
ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomId(roomId); ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomId(roomId);
ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomToken(roomId); ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomToken(roomId);
@ -712,6 +712,10 @@ public class ChatController extends BaseController implements MessagesListAdapte
ApplicationWideCurrentRoomHolder.getInstance().clear(); ApplicationWideCurrentRoomHolder.getInstance().clear();
eventBus.unregister(this); eventBus.unregister(this);
if (getActivity() != null) {
getActivity().findViewById(R.id.toolbar).setOnClickListener(null);
}
if (conversationUser.hasSpreedFeatureCapability("no-ping") if (conversationUser.hasSpreedFeatureCapability("no-ping")
&& getActivity() != null && !getActivity().isChangingConfigurations() && !isLeavingForConversation) { && getActivity() != null && !getActivity().isChangingConfigurations() && !isLeavingForConversation) {
wasDetached = true; wasDetached = true;