Commit graph

3264 commits

Author SHA1 Message Date
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
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
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
ae83efe4a6 version bump to 1.9.3 2016-02-01 14:25:59 +01:00
Daniel Gultsch
3978c04782 respect autojoin setting on newly created bookmarks as well 2016-02-01 14:22:52 +01:00
Daniel Gultsch
1e7647e385 opt out handling of the autojoin flag. fixes #1666 2016-02-01 13:54:08 +01:00
Daniel Gultsch
d1fc90f981 Merge branch 'master' of github.com:siacs/Conversations 2016-02-01 12:33:03 +01:00
Daniel Gultsch
336daea875 made create context menu call in StartConversationsActivity more failsafe 2016-02-01 12:31:46 +01:00
Daniel Gultsch
a3e11415ec refactored user handling in conferences. show try again button when conference has errors 2016-02-01 12:11:40 +01:00
Daniel Gultsch
2eef37174e fixed false set of subject in conference with empty body tag 2016-01-31 14:42:35 +01:00
Daniel Gultsch
19c2ca520c Update README.md 2016-01-31 11:25:17 +01:00
Daniel Gultsch
82870b27ed prefer dns servers from networsk with the default route 2016-01-29 12:12:23 +01:00
Daniel Gultsch
c416948f8b be more careful with resetting the stream id 2016-01-29 12:09:55 +01:00
Daniel Gultsch
28ebf927fb try to make in-valid-session detection work for pgp 2016-01-29 12:09:31 +01:00
Daniel Gultsch
d2c5a939ed show values in formfieldwrappers and allow form to be set to read only 2016-01-26 17:23:24 +01:00
Daniel Gultsch
edc6ce4ff2 hide jid row in list item list when jid is null 2016-01-26 14:47:34 +01:00
Daniel Gultsch
7c0eae8059 expert setting to trigger extended connection options 2016-01-25 21:17:53 +01:00
Daniel Gultsch
31fd425c9a changed FileBackend API to allow files instead of messages to be copied and resized 2016-01-24 12:17:00 +01:00
Daniel Gultsch
8850a1fbe3 added FormWrapper and form field validation 2016-01-23 20:32:00 +01:00
Daniel Gultsch
0569a1e769 introduced boolean form field wrapper 2016-01-23 16:23:23 +01:00
Daniel Gultsch
39fdf4a333 added support for field types jid-single and text-private 2016-01-23 12:44:08 +01:00
Daniel Gultsch
6140861143 reset stanza queue when resetting xmppconnection 2016-01-23 11:40:32 +01:00
Daniel Gultsch
43521891f0 show fetch errors in trust keys activity 2016-01-23 11:39:02 +01:00
Daniel Gultsch
ba98fe4f86 use extract account from intent method and final EXTRA_ACCOUNT variable 2016-01-22 20:46:24 +01:00
Daniel Gultsch
a6c5430cdd added UI wrapper for (some) form fields 2016-01-22 20:22:47 +01:00
Daniel Gultsch
a47430c2f7 added convenience method to extract account from intent 2016-01-22 20:21:45 +01:00
Daniel Gultsch
40005cec1b added config variable to allow non-tls connections 2016-01-22 11:20:31 +01:00
Daniel Gultsch
77c0fb0b2a changed spacing in create dialogs and notify user when no accounts are activated 2016-01-22 11:14:56 +01:00
Daniel Gultsch
3ff40a9733 increased padding in create contact/conference dialog 2016-01-21 18:10:19 +01:00
Daniel Gultsch
eacc7ed1e6 add convenience to get an account object from a spinner 2016-01-21 17:57:24 +01:00
Daniel Gultsch
62a88a4db8 version bump to 1.9.2 + changelog 2016-01-20 17:30:33 +01:00
Daniel Gultsch
20f6a4704c pulled translations from transifex 2016-01-20 17:18:53 +01:00