|
@@ -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;
|