narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests 1 Actions Packages Projects Releases 6 Wiki Activity

Merge pull request '1.0.1' (#24) from develop into master

Browse source 
Reviewed-on: #24
This commit is contained in:
Sergei Poljanski 2024-12-13 19:57:18 +00:00
parent 8b3e121e94 44acdbd2cb
commit 210d1c9ac0
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -1388,7 +1388,7 @@ public class ConversationFragment extends XmppFragment
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setHasOptionsMenu(true); setHasOptionsMenu(true);
if (savedInstanceState == null) { if (savedInstanceState == null && conversation != null) {
conversation.jumpToLatest(); conversation.jumpToLatest();
} }
} }
@ -3233,10 +3233,19 @@ public class ConversationFragment extends XmppFragment
.setOpenConversation(this.conversation); .setOpenConversation(this.conversation);
if (commandAdapter != null && conversation != originalConversation) { if (commandAdapter != null && conversation != originalConversation) {
View currentFocus = null;
if (activity != null) {
currentFocus = activity.getCurrentFocus();
}
conversation.setupViewPager(binding.conversationViewPager, binding.tabLayout, originalConversation); conversation.setupViewPager(binding.conversationViewPager, binding.tabLayout, originalConversation);
refreshCommands(); refreshCommands();
maybeRestoreMessageInputFocus(currentFocus);
} }
if (commandAdapter == null && conversation != null) { if (commandAdapter == null && conversation != null) {
View currentFocus = null;
if (activity != null) {
currentFocus = activity.getCurrentFocus();
}
conversation.setupViewPager(binding.conversationViewPager, binding.tabLayout, null); conversation.setupViewPager(binding.conversationViewPager, binding.tabLayout, null);
commandAdapter = new CommandAdapter((XmppActivity) getActivity()); commandAdapter = new CommandAdapter((XmppActivity) getActivity());
binding.commandsView.setAdapter(commandAdapter); binding.commandsView.setAdapter(commandAdapter);
@ -3247,6 +3256,7 @@ public class ConversationFragment extends XmppFragment
activity.startCommand(conversation.getAccount(), command.getAttributeAsJid("jid"), command.getAttribute("node")); activity.startCommand(conversation.getAccount(), command.getAttributeAsJid("jid"), command.getAttribute("node"));
}); });
refreshCommands(); refreshCommands();
maybeRestoreMessageInputFocus(currentFocus);
} }
previousClickedReply = null; previousClickedReply = null;
@ -3291,6 +3301,12 @@ public class ConversationFragment extends XmppFragment
} }
} }
private void maybeRestoreMessageInputFocus(View currentFocus) {
if (currentFocus == this.binding.textinput) {
this.binding.textinput.requestFocus();
}
}
private void resetUnreadMessagesCount() { private void resetUnreadMessagesCount() {
lastMessageUuid = null; lastMessageUuid = null;
hideUnreadMessagesCount(); hideUnreadMessagesCount();