|
|
1e40764b20
|
Merge tag '1.9.4' into trz/merge_1.9.4
Conflicts:
build.gradle
src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java
src/main/java/eu/siacs/conversations/parser/PresenceParser.java
src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
src/main/res/values/arrays.xml
|
2016-02-16 11:41:54 +01:00 |
|
steckbrief
|
a049aff638
|
Fixes FS#105: XHTML par for images added
|
2016-02-13 21:50:19 +01:00 |
|
steckbrief
|
4829c301e6
|
Fix flagging no more messages on server for conversation
|
2016-02-13 21:22:14 +01:00 |
|
steckbrief
|
0af30b4aec
|
Implements FS#64: Show who wrote last message in conversation overview
|
2016-02-13 21:18:31 +01:00 |
|
steckbrief
|
d84151487e
|
Partially implements FS#6: Conference ID changed to c+bugs@conference.thedevstack.de
|
2016-02-13 21:11:45 +01:00 |
|
steckbrief
|
d2cafe58fa
|
Fixes FS#135: condition NOT message.isRead() added to check if notification should be shown for a message
|
2016-02-13 21:08:28 +01:00 |
|
steckbrief
|
6a2c1a0dd5
|
Unused preference 'picture_compression'. This feature is configured in our variant via 'resize_picture'
|
2016-02-13 21:03:35 +01:00 |
|
steckbrief
|
3ac3917897
|
Fixed overwriting of changes for fixing FS#70. Unused method removed from generator classes.
|
2016-02-13 20:52:11 +01:00 |
|
steckbrief
|
65c2822dac
|
Fixed settings synchronization
|
2016-02-12 22:55:27 +01:00 |
|
steckbrief
|
f24130321e
|
Imports organized
|
2016-02-12 22:54:48 +01:00 |
|
steckbrief
|
c1069873ac
|
Fixed parent activity for logoutput activity
|
2016-02-12 22:37:20 +01:00 |
|
steckbrief
|
3b6d3ee192
|
Simplification of DNS requests.
Originally introduced for FS#92, but now extended with retrieval for XEP-0368 (http://xmpp.org/extensions/xep-0368.html)
|
2016-02-12 22:20:57 +01:00 |
|
steckbrief
|
2028bb9b58
|
green bubbles and setting to choose green or white bubbles removed
|
2016-02-12 20:48:28 +01:00 |
|
steckbrief
|
2f1ac5ad18
|
Fixed placeholder string for message input box
|
2016-02-12 20:34:43 +01:00 |
|
steckbrief
|
fb06783aa6
|
Fixed layout issue with emojicon tastatur button
|
2016-02-12 19:29:04 +01:00 |
|
steckbrief
|
2168c73786
|
Fixed NPE while loading messages via MAM
|
2016-02-12 19:28:29 +01:00 |
|
steckbrief
|
97749cd8f7
|
Fixed runtime errors with axolotl libraries.
Now the libraries from maven are added.
|
2016-02-12 19:27:51 +01:00 |
|
steckbrief
|
9f6fa1ce91
|
database error while upgrading from db version 14 fixed
|
2016-02-12 10:03:29 +01:00 |
|
steckbrief
|
e98d999b94
|
axolotl resources changed from maven to jcenter
|
2016-02-12 10:03:02 +01:00 |
|
steckbrief
|
9c87e2269c
|
Compilation errors and merge mixups fixed
|
2016-02-11 22:40:48 +01:00 |
|
steckbrief
|
d38b3c2cf2
|
Some runtime dependencies added
|
2016-02-11 22:35:22 +01:00 |
|
steckbrief
|
73084c9cd3
|
Fixed XML errors after merge
|
2016-02-11 21:20:51 +01:00 |
|
steckbrief
|
f7abd4237f
|
Fixed third party library references in gradle
|
2016-02-11 21:20:06 +01:00 |
|
Daniel Gultsch
|
d58d822215
|
version bump to 1.9.4 + changelog
|
2016-02-11 17:13:17 +01:00 |
|
Daniel Gultsch
|
f37098a54f
|
catch all axolotl parse exception at once. fixes #1692
|
2016-02-11 12:26:43 +01:00 |
|
|
|
3824eb172b
|
Merge tag '1.9.3' into trz/merge_1.9.3
Conflicts:
.travis.yml
CHANGELOG.md
README.md
art/render.rb
build.gradle
libs/openpgp-api-lib/build.gradle
settings.gradle
src/main/AndroidManifest.xml
src/main/java/eu/siacs/conversations/Config.java
src/main/java/eu/siacs/conversations/crypto/OtrService.java
src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
src/main/java/eu/siacs/conversations/entities/Account.java
src/main/java/eu/siacs/conversations/entities/Contact.java
src/main/java/eu/siacs/conversations/entities/Conversation.java
src/main/java/eu/siacs/conversations/entities/DownloadableFile.java
src/main/java/eu/siacs/conversations/entities/Message.java
src/main/java/eu/siacs/conversations/entities/MucOptions.java
src/main/java/eu/siacs/conversations/entities/Transferable.java
src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
src/main/java/eu/siacs/conversations/generator/IqGenerator.java
src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java
src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java
src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
src/main/java/eu/siacs/conversations/parser/AbstractParser.java
src/main/java/eu/siacs/conversations/parser/IqParser.java
src/main/java/eu/siacs/conversations/parser/MessageParser.java
src/main/java/eu/siacs/conversations/parser/PresenceParser.java
src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
src/main/java/eu/siacs/conversations/persistance/FileBackend.java
src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
src/main/java/eu/siacs/conversations/services/AvatarService.java
src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
src/main/java/eu/siacs/conversations/services/NotificationService.java
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java
src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
src/main/java/eu/siacs/conversations/utils/DNSHelper.java
src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java
src/main/java/eu/siacs/conversations/utils/MimeUtils.java
src/main/java/eu/siacs/conversations/utils/PhoneHelper.java
src/main/java/eu/siacs/conversations/utils/UIHelper.java
src/main/java/eu/siacs/conversations/utils/Xmlns.java
src/main/java/eu/siacs/conversations/xml/XmlReader.java
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java
src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java
src/main/res/drawable-hdpi/ic_launcher.png
src/main/res/drawable-hdpi/ic_notification.png
src/main/res/drawable-mdpi/ic_launcher.png
src/main/res/drawable-mdpi/ic_notification.png
src/main/res/drawable-xhdpi/ic_launcher.png
src/main/res/drawable-xhdpi/ic_notification.png
src/main/res/drawable-xxhdpi/ic_launcher.png
src/main/res/drawable-xxhdpi/ic_notification.png
src/main/res/drawable-xxxhdpi/ic_launcher.png
src/main/res/drawable-xxxhdpi/ic_notification.png
src/main/res/layout/account_row.xml
src/main/res/layout/activity_about.xml
src/main/res/layout/activity_change_password.xml
src/main/res/layout/activity_contact_details.xml
src/main/res/layout/activity_edit_account.xml
src/main/res/layout/activity_muc_details.xml
src/main/res/layout/activity_publish_profile_picture.xml
src/main/res/layout/activity_verify_otr.xml
src/main/res/layout/contact.xml
src/main/res/layout/contact_key.xml
src/main/res/layout/conversation_list_row.xml
src/main/res/layout/enter_jid_dialog.xml
src/main/res/layout/fragment_conversation.xml
src/main/res/layout/join_conference_dialog.xml
src/main/res/layout/message_received.xml
src/main/res/layout/message_sent.xml
src/main/res/layout/message_status.xml
src/main/res/layout/quickedit.xml
src/main/res/values-ar-rEG/strings.xml
src/main/res/values-bg/strings.xml
src/main/res/values-ca/strings.xml
src/main/res/values-cs/strings.xml
src/main/res/values-de/strings.xml
src/main/res/values-el/strings.xml
src/main/res/values-es/strings.xml
src/main/res/values-eu/strings.xml
src/main/res/values-fa-rIR/strings.xml
src/main/res/values-fr/strings.xml
src/main/res/values-id/strings.xml
src/main/res/values-it/strings.xml
src/main/res/values-iw/strings.xml
src/main/res/values-ja/strings.xml
src/main/res/values-ko/strings.xml
src/main/res/values-nl/strings.xml
src/main/res/values-pl/strings.xml
src/main/res/values-pt/strings.xml
src/main/res/values-ru/strings.xml
src/main/res/values-sk/strings.xml
src/main/res/values-sr/strings.xml
src/main/res/values-sv/strings.xml
src/main/res/values-v21/themes.xml
src/main/res/values-zh-rCN/strings.xml
src/main/res/values/arrays.xml
src/main/res/values/colors.xml
src/main/res/values/dimens.xml
src/main/res/values/strings.xml
src/main/res/values/themes.xml
src/main/res/xml/preferences.xml
|
2016-02-11 10:45:27 +01:00 |
|
Daniel Gultsch
|
1bb38e25f2
|
send muc messages after join
|
2016-02-10 09:53:48 +01:00 |
|
steckbrief
|
cec1b0f1f8
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
|
2016-02-09 22:13:35 +01:00 |
|
steckbrief
|
72114d7324
|
Fixes FS#135: condition NOT message.isRead() added to check if notification should be shown for a message
|
2016-02-09 22:08:43 +01:00 |
|
steckbrief
|
899a39cbf7
|
implementation hint for FS#96 added
|
2016-02-09 21:57:44 +01:00 |
|
steckbrief
|
e0219ae4ce
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
|
2016-02-09 21:51:44 +01:00 |
|
steckbrief
|
362c00d31b
|
Fixes FS#135: condition NOT message.isRead() added to check if notification should be shown for a message
|
2016-02-09 21:48:09 +01:00 |
|
Daniel Gultsch
|
f16690ae1f
|
allow user to set MAM preferences
|
2016-02-09 13:01:17 +01:00 |
|
Daniel Gultsch
|
91ec4839ac
|
prepend instead off append mam messages to conversations when going in reverse
|
2016-02-04 16:40:18 +01:00 |
|
Daniel Gultsch
|
28733e052f
|
fixed performance regression in on scroll listener
|
2016-02-04 16:29:17 +01:00 |
|
Daniel Gultsch
|
4fdb0d92fe
|
prevent previoulsly cleared messages from reloading. fixes #1110
|
2016-02-04 14:39:16 +01:00 |
|
Daniel Gultsch
|
f88b8c703e
|
add more fault tolerant checks for messages left on server
|
2016-02-04 11:55:42 +01:00 |
|
Daniel Gultsch
|
17791a703e
|
removed unecessary logging when muc tiles update
|
2016-02-04 10:27:38 +01:00 |
|
Daniel Gultsch
|
7dd9545ea3
|
use TLSv1.2 as SSL context on supported plattforms
|
2016-02-03 18:17:16 +01:00 |
|
Daniel Gultsch
|
1d572c61d0
|
cache server caps
|
2016-02-03 17:19:05 +01:00 |
|
Daniel Gultsch
|
0911669b07
|
count all messages in a query
|
2016-02-03 16:04:21 +01:00 |
|
Daniel Gultsch
|
1274b0ef39
|
Revert "get rid of broken totalMessageCount for mam queries"
This reverts commit 58c6f9bfb2.
|
2016-02-03 10:40:44 +01:00 |
|
Daniel Gultsch
|
f0798216d5
|
refactored disco cache. avoid making duplicate call. check hash
|
2016-02-03 10:40:02 +01:00 |
|
Daniel Gultsch
|
4a1a59f0c8
|
Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into singpolyma-disco-caps
|
2016-02-02 18:19:26 +01:00 |
|
Daniel Gultsch
|
01bad12708
|
fixed 'unencrypted' not showing up for conferences when encryption is forced
|
2016-02-02 18:15:57 +01:00 |
|
Daniel Gultsch
|
58c6f9bfb2
|
get rid of broken totalMessageCount for mam queries
|
2016-02-02 15:39:46 +01:00 |
|
Daniel Gultsch
|
fab0a45955
|
re-read common name from certificates on startup
|
2016-02-02 13:43:20 +01:00 |
|
Daniel Gultsch
|
ba9ba8ffe2
|
avoid npe when accessing the pgp connection service
|
2016-02-02 11:21:29 +01:00 |
|
Daniel Gultsch
|
f30df7a535
|
catch a few NPE when parsing invalid pep nodes
|
2016-02-02 11:21:07 +01:00 |
|
Daniel Gultsch
|
ae83efe4a6
|
version bump to 1.9.3
|
2016-02-01 14:25:59 +01:00 |
|
