Allow sending subject-only with thread (partially)

This commit is contained in:
Stephen Paul Weber 2024-01-23 19:35:45 +01:00 committed by 12aw
parent 11b0f681fd
commit 8e1f388914
2 changed files with 17 additions and 17 deletions
git/release
src/main/java/eu/siacs/conversations/ui

View file

@ -15,19 +15,6 @@
"versionName": "1.7.8.9",
"outputFile": "monocles chat-1.7.8.9-git-universal-release.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "x86_64"
}
],
"attributes": [],
"versionCode": 16003,
"versionName": "1.7.8.9",
"outputFile": "monocles chat-1.7.8.9-git-x86_64-release.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
@ -46,13 +33,13 @@
"filters": [
{
"filterType": "ABI",
"value": "arm64-v8a"
"value": "x86_64"
}
],
"attributes": [],
"versionCode": 16004,
"versionCode": 16003,
"versionName": "1.7.8.9",
"outputFile": "monocles chat-1.7.8.9-git-arm64-v8a-release.apk"
"outputFile": "monocles chat-1.7.8.9-git-x86_64-release.apk"
},
{
"type": "ONE_OF_MANY",
@ -66,6 +53,19 @@
"versionCode": 16001,
"versionName": "1.7.8.9",
"outputFile": "monocles chat-1.7.8.9-git-armeabi-v7a-release.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "arm64-v8a"
}
],
"attributes": [],
"versionCode": 16004,
"versionName": "1.7.8.9",
"outputFile": "monocles chat-1.7.8.9-git-arm64-v8a-release.apk"
}
],
"elementType": "File"

View file

@ -1254,7 +1254,7 @@ public class ConversationFragment extends XmppFragment
if (body == null) body = new SpannableStringBuilder("");
final Conversation conversation = this.conversation;
final boolean hasSubject = binding.textinputSubject.getText().length() > 0;
if (conversation == null || body.length() == 0) { // (conversation.getThread() == null || !hasSubject))) https://issues.prosody.im/1838
if (conversation == null || (body.length() == 0 && (conversation.getThread() == null || !hasSubject))) {
return;
}
if (trustKeysIfNeeded(conversation, REQUEST_TRUST_KEYS_TEXT)) {