diff options
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | build.gradle | 4 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Message.java | 1 | ||||
| -rw-r--r-- | src/main/res/values-de/strings.xml | 7 |
4 files changed, 14 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d2fedf64d..ce194ff60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ ###Changelog +####Version 1.12.4 +* new create conference dialog +* show first unread message on top +* show geo uri as links +* circumvent long message DOS +* integrate simple videoplayer and image viewer + ####Version 1.12.3 * show offline members in conferences * various bug fixes diff --git a/build.gradle b/build.gradle index b380223bb..557c78096 100644 --- a/build.gradle +++ b/build.gradle @@ -72,7 +72,7 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 23 - versionCode 144 + versionCode 145 versionName "1.12.4" archivesBaseName += "-$versionName" applicationId "eu.siacs.conversations" @@ -135,4 +135,4 @@ android { exclude 'META-INF/BCKEY.DSA' exclude 'META-INF/BCKEY.SF' } -} +}
\ No newline at end of file diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java index 4b6877119..3a924e530 100644 --- a/src/main/java/eu/siacs/conversations/entities/Message.java +++ b/src/main/java/eu/siacs/conversations/entities/Message.java @@ -464,6 +464,7 @@ public class Message extends AbstractEntity { this.getCounterpart().equals(message.getCounterpart()) && this.edited() == message.edited() && (message.getTimeSent() - this.getTimeSent()) <= (Config.MESSAGE_MERGE_WINDOW * 1000) && + this.getBody().length() + message.getBody().length() <= Config.MAX_DISPLAY_MESSAGE_CHARS && !GeoHelper.isGeoUri(message.getBody()) && !GeoHelper.isGeoUri(this.body) && message.treatAsDownloadable() == Decision.NEVER && diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 83f04e9d8..5aa07da68 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -223,8 +223,8 @@ <string name="save_as_bookmark">Zur Kontaktliste hinzufügen</string> <string name="delete_bookmark">Von Kontaktliste entfernen</string> <string name="bookmark_already_exists">Die Konferenz befindet sich bereits auf deiner Kontaktliste</string> - <string name="action_edit_subject">Konferenz-Thema bearbeiten</string> - <string name="joining_conference">Konferenz wird beigetreten…</string> + <string name="action_edit_subject">Titel dieser Konferenz bearbeiten</string> + <string name="you">Du</string> <string name="leave">Verlassen</string> <string name="contact_added_you">Der Kontakt hat dich zur Kontaktliste hinzugefügt</string> <string name="add_back">Auch hinzufügen</string> @@ -278,7 +278,7 @@ <string name="pref_use_send_button_to_indicate_status_summary">\"Senden\"-Schaltfläche einfärben, um den Online-Status des Kontakts anzuzeigen</string> <string name="pref_expert_options_other">Sonstiges</string> <string name="pref_conference_name">Konferenz-Name</string> - <string name="pref_conference_name_summary">Konferenz-Thema statt Raum-JID als Namen verwenden</string> + <string name="pref_conference_name_summary">Titel von Konferenzen anstatt JID als Namen verwenden</string> <string name="toast_message_otr_fingerprint">OTR-Fingerabdruck in die Zwischenablage kopiert!</string> <string name="toast_message_omemo_fingerprint">OMEMO-Fingerabdruck in die Zwischenablage kopiert!</string> <string name="conference_banned">Du wurdest von der Konferenz ausgeschlossen</string> @@ -609,4 +609,5 @@ <string name="mgmt_account_enable"></string> <string name="registration_please_wait">Registrierung fehlgeschlagen: Bitte später versuchen</string> <string name="send_message_to_x">Nachricht an %s senden</string> + </resources> |