Compare commits

..

No commits in common. "master" and "1.0.0" have entirely different histories.

6 changed files with 3 additions and 29 deletions

View file

@ -1,9 +1,5 @@
# Changelog # Changelog
### another.im 1.0.1
* Fixed message input focus loss
* Addressed potential crashes caused by NullPointerException (NPE)
### another.im 1.0.0 ### another.im 1.0.0
* Implementation of OTR chats * Implementation of OTR chats
* Rebranding from Conversation Clasic to another.im * Rebranding from Conversation Clasic to another.im

View file

@ -104,8 +104,8 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 24 minSdkVersion 24
targetSdkVersion 34 targetSdkVersion 34
versionCode 2 versionCode 1
versionName "1.0.1" versionName "1.0.0"
archivesBaseName += "-$versionName" archivesBaseName += "-$versionName"
applicationId "im.narayana.another" applicationId "im.narayana.another"
resValue "string", "applicationId", applicationId resValue "string", "applicationId", applicationId

View file

@ -1,2 +0,0 @@
* Fixed message input focus loss
* Addressed potential crashes caused by NullPointerException

View file

@ -1,2 +0,0 @@
* Исправлен баг с фокусировкой на клавиатуре при вводе сообщений
* Устранены возможные сбои, вызванные NullPointerException (NPE)

View file

@ -1,2 +0,0 @@
* Виправлено баґ з фокусом клавіатури під час набору тексту
* Усунено можливі збої, спричинені NullPointerException (NPE)

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 && conversation != null) { if (savedInstanceState == null) {
conversation.jumpToLatest(); conversation.jumpToLatest();
} }
} }
@ -3233,19 +3233,10 @@ 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);
@ -3256,7 +3247,6 @@ 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;
@ -3301,12 +3291,6 @@ 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();