Compare commits

...

72 commits

Author SHA1 Message Date
Sergei Poljanski c8c16f3891 Merge pull request 'more accurate uk translation' () from develop into master
Reviewed-on: 
2024-12-13 20:36:26 +00:00
Sergei Poljanski 2335c5d699
more accurate uk translation 2024-12-13 22:34:43 +02:00
Sergei Poljanski b9759a256a Merge pull request '1.0.1 changelogs' () from develop into master
Reviewed-on: 
2024-12-13 20:23:46 +00:00
Sergei Poljanski 6aff5c5105
1.0.1 changelogs 2024-12-13 22:21:46 +02:00
Sergei Poljanski 210d1c9ac0 Merge pull request '1.0.1' () from develop into master
Reviewed-on: 
2024-12-13 19:57:18 +00:00
kosyak 44acdbd2cb fix message input initial focus loss 2024-12-10 23:40:54 +01:00
kosyak 414b0c7978 fix possible npe 2024-12-10 21:02:10 +01:00
Sergei Poljanski 82d21d51bb Merge pull request 'changelogs' () from changelogs into develop
Reviewed-on: 
2024-12-09 18:32:39 +00:00
Sergei Poljanski add880e928
changelogs 2024-12-09 20:29:20 +02:00
Sergei Poljanski a8fa7e5350
hotfix 2024-12-05 03:38:01 +02:00
Sergei Poljanski 9e4780dc06
Merge branch 'anotherim' into develop 2024-12-05 02:20:30 +02:00
kosyak 64a8154560 get rid of conversations and conversations.im mentions 2024-12-04 19:05:07 +01:00
kosyak f511be6e63 get rid of unsupported locales 2024-12-04 19:00:34 +01:00
kosyak 201877e6bf get rid of unsupported locales 2024-12-04 18:35:40 +01:00
kosyak 27d4e8b617 reset app version 2024-12-04 18:25:27 +01:00
Sergei Poljanski 68df9a1d6e
magic create domain 2024-12-04 00:10:32 +02:00
Sergei Poljanski 461fdf28f6
use conversations.im -> another.im 2024-12-03 21:15:10 +02:00
Sergei Poljanski 7771bd19c0
rootProjectname, license 2024-12-03 21:04:14 +02:00
Pavel R. 63d6a56e60 Merge pull request 'hru+kudah' () from hrukudah into develop
Reviewed-on: 
Reviewed-by: kosyak <kosyak@narayana.im>
2024-11-20 18:37:40 +00:00
Pavel R. 25c5f663b0 Merge pull request 'another screenshots' () from another-screenshots1 into develop
Reviewed-on: 
2024-11-20 18:36:56 +00:00
Bohdan Horbeshko 57da0ab5d4 another screenshots 2024-11-20 17:29:45 +01:00
Sergei Poljanski 093751b0c1 Merge pull request 'another hruck2' () from sirojanarkoman into anotherim
Reviewed-on: 
2024-11-17 11:09:17 +00:00
Bohdan Horbeshko 8ce99bb00d another hruck2 2024-11-17 07:49:30 +01:00
Sergei Poljanski cb85e2c32e
Merge remote-tracking branch 'refs/remotes/origin/anotherim' into anotherim 2024-11-16 19:03:13 +02:00
Sergei Poljanski e3c64d2534
fastlane descriptions, fixed some error in README 2024-11-16 18:58:16 +02:00
Sergei Poljanski 3e33800d0e Merge pull request 'another hruck' () from another-hruck into anotherim
Reviewed-on: 
2024-11-16 16:30:50 +00:00
Sergei Poljanski 527494f33a Merge branch 'anotherim' into another-hruck 2024-11-16 16:30:04 +00:00
Sergei Poljanski 1bae950d60
a lot of text 2024-11-16 18:29:38 +02:00
Bohdan Horbeshko f049d5409f another hruck 2024-11-16 15:27:42 +01:00
Sergei Poljanski b15b00009f
Merge branch 'fdroid/changelogs' into anotherim 2024-11-16 16:02:26 +02:00
kosyak d8a7051c5d bring back monochrome launcher icon 2024-11-16 12:14:05 +01:00
kosyak ab56d030fb new appid 2024-11-10 23:00:13 +01:00
kosyak 32340ac484 new logo and renaming 2024-11-10 22:33:34 +01:00
Bohdan Horbeshko 52e4be556b hru+kudah 2024-11-03 19:17:44 +01:00
kosyak 4990ac0a23 delete secret chat messages as well 2024-10-29 17:35:58 +07:00
kosyak 8772c9fd73 fix back navigation 2024-10-29 17:34:13 +07:00
kosyak e1e2de8a76 fix conversation lookup for smp initialization 2024-10-29 17:30:57 +07:00
kosyak 948fd85a43 filter otr messages from mam queries 2024-10-29 17:30:28 +07:00
kosyak bf43f5ddfd remove secret chat from database 2024-10-29 17:29:47 +07:00
kosyak 82134599ef allow to destroy secret chat 2024-10-29 17:29:12 +07:00
kosyak e72b866fce allow to start secret chat on roster page 2024-10-29 17:28:33 +07:00
kosyak b18f042b8b don't create secret chat for OTR messages without resource 2024-10-14 22:14:22 +02:00
kosyak a66fa08be4 fix conversation from db restoring 2024-10-13 23:42:38 +02:00
kosyak 07c730098e dont show annoying toast about history fetching policy 2024-10-13 23:42:07 +02:00
kosyak 0a99844a71 hide verify encryption footer after blind trust 2024-10-13 23:41:39 +02:00
kosyak c4bda2baf1 otr blind trust 2024-10-13 18:51:31 +02:00
kosyak 88ad3f6940 icon for secret chats 2024-10-13 17:45:43 +02:00
kosyak 1a33af7c15 don't show raw otr message in notifications 2024-10-12 13:50:04 +02:00
kosyak 5920533cf5 proper title for secret chat 2024-10-12 13:39:44 +02:00
kosyak 701c21ae4a fix empty OTR verification window 2024-10-10 01:01:17 +02:00
kosyak 28c633deb8 Revert "debug"
This reverts commit 635e5675d1.
2024-10-10 00:24:03 +02:00
kosyak a1cc201ae7 decrease toolbar title size 2024-10-10 00:23:49 +02:00
kosyak d6f162fc65 bump version 2024-10-10 00:19:44 +02:00
kosyak 635e5675d1 debug 2024-10-10 00:12:17 +02:00
kosyak 9529831f80 tune toolbar texts sizes 2024-10-09 23:20:08 +02:00
kosyak d970679064 get rid of debug logs 2024-10-06 23:26:03 +02:00
kosyak cf9ca3cc46 hide contact presence indicator when related account went offline 2024-10-06 18:55:17 +02:00
kosyak d88d858069 smaller text size for contact status 2024-10-06 18:54:14 +02:00
kosyak 4431eccc98 dont show start secret chat button inside secret chat 2024-10-01 19:59:46 +02:00
kosyak 973a48ef62 otr conversations implementation 2024-09-30 05:47:13 +02:00
kosyak 389074e802 Reapply "OTR implementation"
This reverts commit c145a6b8e5.

# Conflicts:
#	src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
#	src/main/res/values/strings.xml
2024-09-29 23:36:50 +02:00
kosyak 1a751b8a80 don't check if muc pm was archived in case of new message 2024-09-09 00:03:31 +02:00
kosyak c32809b963 allow to disable presence and account indicators 2024-09-08 23:51:05 +02:00
kosyak c64e0925f4 fallback on message uuid to fix missed reply id for single mode conversations 2024-09-06 01:02:52 +02:00
Sergei Poljanski 03fcd01ddb
fix icon 2024-09-04 03:34:18 +03:00
Sergei Poljanski cf9d0e13b1
changelogs and f-droid download icon 2024-09-04 03:32:18 +03:00
kosyak 95ee8459b8 don't use jabber last seen in status calculations 2024-09-02 22:16:05 +02:00
kosyak 021552b1d4 try to fix wired jump to bottom button behavior 2024-09-02 01:10:32 +02:00
kosyak e3542ccf72 take last seen into account during status indicator calculation 2024-09-02 01:08:27 +02:00
kosyak ffbdad7503 show participants count/last seen in toolbar indicator 2024-09-02 01:00:39 +02:00
kosyak 00817b79be account color selector 2024-09-02 00:12:42 +02:00
kosyak 4dab5156e1 small muc subject improvements 2024-09-01 22:57:59 +02:00
6 changed files with 29 additions and 3 deletions
CHANGELOG.mdbuild.gradle
fastlane/metadata/android
en-US/changelogs
ru/changelogs
uk/changelogs
src/main/java/eu/siacs/conversations/ui

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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