Commit graph

36 commits

Author SHA1 Message Date
f051dd0bcd Fixes FS#153 - Check if url, phone and email are linkified correctly 2016-03-08 20:36:41 +01:00
739ae02106 Fixes FS#150 - Swipe out conversation kills app
stacktrace told "java.lang.NoClassDefFoundError: com.nineoldandroids.view.ViewHelper"
2016-03-07 14:22:48 +01:00
f28d77dc42 Fixes: FS#94 - wrong size on emojicon keyboard 2016-03-06 17:28:50 +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
e98d999b94 axolotl resources changed from maven to jcenter 2016-02-12 10:03:02 +01:00
steckbrief
d38b3c2cf2 Some runtime dependencies added 2016-02-11 22:35:22 +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
2fb31bcc3f Log error in case logcat command could not be executed; Show toast in case nothing is copied 2015-12-17 21:09:18 +01:00
steckbrief
dcf951e48e Fixes FS#88, Code cleanup 2015-12-14 19:13:30 +01:00
steckbrief
1c44fd8a4b Fixes FS#88: Avoid smilie repacement in time messages 2015-12-14 15:15:00 +01:00
steckbrief
9d0dedc6ce Build cleanup: libraries added as local resources, removed unused proguard configs, removed SwipyRefreshLayout as module and added as binary dependency, moved 3rd party binaries to separate folder 2015-12-14 14:56:46 +01:00
steckbrief
a745422300 Moved logcat to a module, increased error robustness for loading last messages 2015-12-10 20:01:50 +01:00
steckbrief
0086d5dc80 Implements FS#83: Reload from last received message 2015-12-04 23:18:36 +01:00
fiaxh
fac1d4e0bd Use OpenPGP-API 9.0 2015-11-09 13:49:57 +00:00
ef0f8d4507 fixes FS#42 - Smilie replacement in url 2015-08-21 19:58:16 +02:00
b936af529f fix wrong class type usage 2015-08-16 22:39:26 +02:00
3be4dbf66a fixes FS#13 - Change smiley replacement patterns to be case insensitive 2015-08-16 17:56:46 +02:00
ea1debd8f7 Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon module 2015-08-16 17:30:06 +02:00
cfefe9a0bd Merged https://github.com/ankushsachdeva/emojicon/pull/16 2015-08-15 23:45:43 +02:00
8fd688ca96 Merge tag '1.5.2' into trz/rebase 2015-08-11 17:35:53 +02:00
Daniel Gultsch
a4fb6bb3a3 really update build tools 2015-06-02 15:24:58 +02:00
b3b4a2902e moved color picker to libs 2015-04-15 21:43:53 +02:00
cae106e310 whatsapp-like smiley implementation 2015-04-12 17:22:53 +02:00
steckbrief
20eae39557 Merge master-origin
Conflicts:
	src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
	src/main/java/eu/siacs/conversations/ui/XmppActivity.java
	src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
	src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
	src/main/java/eu/siacs/conversations/utils/UIHelper.java
	src/main/res/values-de/strings.xml
2015-02-20 22:19:31 +01:00
Rene Treffer
20eb770356 Switch to maven central minidns 2015-01-14 22:43:43 +01:00
71bb1e90b0 changes to get it working under eclipse 2015-01-10 23:11:07 +01:00
Michael
868d9f890c update android gradle plugin to 0.14.4
to work with AS >= 0.9.0 plugin >= 0.14.0 is required
also update gradle to 2.2.
2014-11-22 19:53:37 +01:00
Sam Whited
e3f4742ed8 Version 5, compatible with OpenKeychain 2.9.1
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQEcBAABAgAGBQJUDaeBAAoJEHGMBwEAASKCBAEH/iu7405Mim34yjZzUyHrREPq
 soQoQEr2f3A8FnEQDX+q4RhTEGG3WNzw9FDcf4Aot6d1dyL6DZMy/AaslQyAPNSf
 AlFyQ36YU44BwgTsHxjxgQ2Vdiff2tfS8wK6He4wGfC48WFvpMeD9VIwHTwtT37F
 RW011BBshlcd3fVX7qVdiQ/TKJsKTy4+LmJhf3UsZ7McZ5hkmkA+HwoHb+B+NEQN
 UMhdFeMrK/GKEY1ALmm1Dv6DRO7AKGOmmrQ24/ciHD4DF/0OkUP5tISRRZfG/oRn
 J+gYBH3FcJy4tb9pLDFDGLB/OpX1kulPLEeUlQrV98guD2hV3KBYVZ0Hs0Bqqdk=
 =wKIt
 -----END PGP SIGNATURE-----

Subtree merged in openpgp api lib
2014-10-28 12:16:35 -04:00
Sam Whited
4a1bae3a69 Subtree merged in minidns 2014-10-28 12:14:21 -04:00
Sam Whited
ccba01ef19 Remove minidns dir 2014-10-28 12:13:53 -04:00
Sam Whited
41d2e72be7 Subtree merged in MemorizingTrustManager 2014-10-28 12:11:51 -04:00
Sam Whited
a6d0042e5c Move submodules back to libs/ 2014-10-26 09:54:41 -04:00
Sam Whited
7f484513be Pull otr4j form Maven repo 2014-10-26 08:54:41 -04:00
Sam Whited
1f49e99c46 Suppress lint errors and remove bcprov 2014-10-22 18:17:49 -04:00
Sam Whited
07b47172a0 Add build deps and move build props to build file 2014-10-22 15:39:53 -04:00