Commit graph

838 commits

Author SHA1 Message Date
iNPUTmice dee46f3453 match color in contact details to the colors in the send button. also migrated some other colors from hard coding to using resources 2014-09-11 14:24:10 +02:00
iNPUTmice ff41918cb7 missed show=chat for send button colorization 2014-09-11 13:19:46 +02:00
iNPUTmice fef41ba2a2 pare body in type=normal messages as well 2014-09-11 13:18:29 +02:00
iNPUTmice 31f11070e3 IT'S CHRISTMAS ALREADY! 2014-09-10 17:59:57 +02:00
iNPUTmice 4b2e06b9c3 version bump, changelog and one last minute change for OTR 2014-09-09 14:30:16 +02:00
iNPUTmice c02ef80086 Merge branch 'master' of github.com:siacs/Conversations
Conflicts:
	src/eu/siacs/conversations/crypto/PgpEngine.java
	src/eu/siacs/conversations/persistance/FileBackend.java
	src/eu/siacs/conversations/ui/ShareWithActivity.java
2014-09-09 14:16:51 +02:00
iNPUTmice facb1242b6 don't reset images from sending to waiting 2014-09-09 13:56:30 +02:00
iNPUTmice d92e8381db setting to increase font size. fixed #420 2014-09-08 23:58:37 +02:00
iNPUTmice 1871521aed simplefied some code that might have been the source for some strange bugs 2014-09-08 20:29:57 +02:00
iNPUTmice b23f8bd472 introduced downloadable interface. reverted some of the changes made to OTR 2014-09-08 20:09:44 +02:00
iNPUTmice a6f0f0cb6e bug fixes for forcing encryption 2014-09-08 14:29:35 +02:00
iNPUTmice 5cb11396f6 fixed sending offline pgp messages 2014-09-08 14:08:59 +02:00
iNPUTmice 58953e6193 settings to force encryption and setting for not saving messages to disk. fixed #353 2014-09-08 13:37:22 +02:00
iNPUTmice 3b9fd28ef4 don't fail displayed or received messages 2014-09-08 12:51:01 +02:00
iNPUTmice 19f98f5143 warn on missing presence subscription 2014-09-08 12:46:48 +02:00
iNPUTmice 409fdd8596 Merge branch 'development' of github.com:siacs/Conversations into development 2014-09-07 23:08:57 +02:00
iNPUTmice 449c2a544b fixed #321 - delete otr fingerprints 2014-09-07 23:08:40 +02:00
Daniel Gultsch 5fe3f207d4 Merge pull request #426 from betheg/remove_strings
deleted some unused string-resources and imports, also deleted edit_account_dialog.xml.
2014-09-07 17:13:10 +02:00
iNPUTmice 90947597e5 fixed #425 2014-09-07 16:53:10 +02:00
Michael f4d86ecff3 deleted some unused string-resources and imports, also deleted edit_account_dialog.xml. 2014-09-07 15:58:59 +02:00
iNPUTmice 27ad80afc2 trying to avoid rejectedexection 2014-09-07 15:11:40 +02:00
Michael ecd613dcdd MUC: set the password from bookmarks. 2014-09-07 14:06:23 +02:00
iNPUTmice d9990e6cd8 made shareing text with conferences possible again 2014-09-07 13:01:09 +02:00
iNPUTmice b334ebd0fa added missing breaks oO 2014-09-07 12:43:01 +02:00
iNPUTmice 890fb9a1b4 fixed npe 2014-09-07 00:09:12 +02:00
iNPUTmice 9a945af6b9 Merge branch 'development' of github.com:siacs/Conversations into development 2014-09-06 18:21:38 +02:00
iNPUTmice 0e5a0a07fd made otr a little bit more solid when there is no presence subscription 2014-09-06 18:21:31 +02:00
Michael 375ec3a686 MUC: set password from invite message. 2014-09-05 22:07:35 +02:00
iNPUTmice dc02137106 warn user if no presence subscription exists 2014-09-05 13:29:45 +02:00
iNPUTmice 34228d0e78 improved logging for avatar fetches 2014-09-05 13:29:20 +02:00
iNPUTmice b8d289a932 fixed #342 - otr with facebook and other services without resources 2014-09-04 19:56:37 +02:00
iNPUTmice 01389e900b reconnect accounts when resource has been changed in settings 2014-09-04 13:56:36 +02:00
iNPUTmice 9817251ed5 made muc password dialog hide the password (password field) 2014-09-04 11:46:13 +02:00
iNPUTmice 7a3bc5dc45 nick parsing (xep 0172) also enabled for messages and for pep 2014-09-04 10:50:06 +02:00
Daniel Gultsch 1d6c09e8ff Merge pull request #397 from GZep/development
XEP-0172
2014-09-04 10:28:13 +02:00
Daniel Gultsch 50f90d37b8 Merge pull request #417 from emdete/unicode_emoticons
improve regex, implement pattern cache
2014-09-04 10:16:28 +02:00
iNPUTmice 6b9219c5f4 added support for password protected muc - fixed #203 and fixed #395 2014-09-03 19:35:45 +02:00
iNPUTmice f19b1fb823 changed order of snackbar hints 2014-09-03 18:58:46 +02:00
M. Dietrich 0a2c73f246 improve emo mapping 2014-09-03 17:44:38 +02:00
M. Dietrich 0a686bc71c use class, use codepoint 2014-09-03 17:29:13 +02:00
M. Dietrich 584984807e make pattern static 2014-09-03 16:10:50 +02:00
M. Dietrich cb3ba4045e improve regex, implement pattern cache 2014-09-03 15:39:46 +02:00
iNPUTmice 2b941d19f8 more openpgp bug fixes 2014-09-03 15:39:35 +02:00
iNPUTmice 253438e698 more openpgp bug fixes 2014-09-03 15:33:44 +02:00
iNPUTmice 664c9c434f avoiding resource conflicts 2014-09-03 14:57:40 +02:00
iNPUTmice f1494f83ff fixed pgp signature creation 2014-09-03 13:06:06 +02:00
iNPUTmice 5ae62f18b4 fixed pgp signature creation 2014-09-03 13:05:22 +02:00
iNPUTmice 1a09a4706b added ability to disable notifications for specific conversations - fixed #322 2014-09-03 12:36:54 +02:00
iNPUTmice 1f378bffc8 made emoticon parsing enableable - default false 2014-09-03 09:15:07 +02:00
iNPUTmice 97b52abaf9 fixed #410 by removing that config option 2014-09-02 16:00:03 +02:00
iNPUTmice 0ae852a633 refactored share with activity 2014-09-02 15:51:20 +02:00
iNPUTmice 567827ffca fixed #406 2014-09-02 11:31:56 +02:00
iNPUTmice c62937016b rotate avatars
Conflicts:
	src/eu/siacs/conversations/persistance/FileBackend.java
2014-09-02 11:31:39 +02:00
iNPUTmice 2c9b2e6bf8 fixed #406 2014-09-02 11:27:43 +02:00
iNPUTmice f888b167c6 rotate avatars 2014-09-02 11:19:05 +02:00
Daniel Gultsch 6045bcc2eb Merge pull request #408 from emdete/unicode_emoticons
add all whitespaces in regex
2014-09-02 10:39:13 +02:00
M. Dietrich a7b3aa343e add all whitespaces in regex 2014-09-02 01:18:25 +02:00
Daniel Gultsch 6291ebf1a3 Merge pull request #380 from emdete/unicode_emoticons
add translation from ascii to unicode emoticons
2014-09-01 23:58:00 +02:00
M. Dietrich 546082147a transform ascii to emoticons (on display only) 2014-09-01 23:48:42 +02:00
iNPUTmice d42ea45b1c fixed #403 2014-09-01 14:03:21 +02:00
iNPUTmice a7881754f5 fixed #403 2014-09-01 13:51:49 +02:00
M. Dietrich 2acf510ea9 optimize string operations a bit 2014-09-01 10:40:45 +02:00
Gayaz Yusipov 5b24534ab6 Contact presenceName property 2014-08-31 23:14:05 +04:00
iNPUTmice 3558fa5f5b deleted unnecessary log 2014-08-31 21:02:14 +02:00
iNPUTmice 94389ac22a show merged time and status in message adapter 2014-08-31 18:55:15 +02:00
iNPUTmice bda7724e31 improvements for merge conditions 2014-08-31 18:21:46 +02:00
iNPUTmice 28fa48704d add missing blank before nick 2014-08-31 17:48:00 +02:00
Bahtiar `kalkin-` Gadimov 3e3451bcff Smarter nickname highlight insert in confernces 2014-08-31 17:24:52 +02:00
iNPUTmice 1ac5be4855 some code cleanup 2014-08-31 16:28:21 +02:00
Daniel Gultsch 8d456085e5 Merge pull request #391 from betheg/fix_typo
fix forgotten spelling.
2014-08-31 15:56:41 +02:00
iNPUTmice 1cc16161ef require encrypted to be the same for messages to get merged 2014-08-31 15:54:53 +02:00
iNPUTmice 8f8d4e320d experimental message merging 2014-08-31 14:29:12 +02:00
Michael 969cba5ee6 Merge remote-tracking branch 'upstream/development' into fix_typo 2014-08-30 14:00:53 +02:00
Gayaz Yusipov ec6220969d XEP-0172 2014-08-30 14:26:46 +04:00
iNPUTmice c494f4f7ae Merge branch 'sm' into development
Conflicts:
	src/eu/siacs/conversations/services/XmppConnectionService.java
2014-08-30 09:24:58 +02:00
iNPUTmice 4435b0055e reset unsend messages to waiting 2014-08-30 09:22:16 +02:00
iNPUTmice 9075d3854d properly set stanza count on session resume 2014-08-30 09:22:16 +02:00
iNPUTmice 4a6a6c8403 basic message acking 2014-08-30 09:22:16 +02:00
iNPUTmice 9de77b190b proper namespaces for xep-0352 2014-08-30 09:22:05 +02:00
iNPUTmice 6d82a69ba3 send inactive or active on every connect and resume 2014-08-30 09:22:05 +02:00
iNPUTmice 265bd06250 added basic csi 2014-08-30 09:22:05 +02:00
iNPUTmice 9ad5c6925d version bump to 0.6 with changelogs 2014-08-30 08:51:55 +02:00
iNPUTmice 8840d082ba brought npe catcher back for kxml parser 2014-08-30 08:31:05 +02:00
Michael 3714947d5f Merge remote-tracking branch 'upstream/development' into fix_typo 2014-08-29 23:30:47 +02:00
iNPUTmice 5450a2ae46 fixed link to old resource 2014-08-29 14:05:10 +02:00
iNPUTmice b0d777d9ca fixed npe 2014-08-29 12:14:10 +02:00
iNPUTmice 33172246c9 fixed #389 2014-08-29 10:24:25 +02:00
Michael 98dabe9ab4 fix forgotten spelling. 2014-08-28 16:49:52 +02:00
iNPUTmice 85b31b8d8b fixed spelling thanks @betheg 2014-08-28 11:01:24 +02:00
iNPUTmice 431d4ed44b translated missing string in settings 2014-08-27 09:43:53 +02:00
iNPUTmice 450b911cb2 fixing duplicate private muc messages 2014-08-25 19:20:53 +02:00
iNPUTmice 07b422d4c8 fixed message hint 2014-08-25 15:43:50 +02:00
iNPUTmice 4e791c8a01 fixed faulty db creation on first install 2014-08-24 20:53:13 +02:00
Daniel Gultsch a30bc8a3e2 use otr encrypiton instead of plain when contact has exactly one online presence and an otr fingerprint 2014-08-24 11:21:02 +02:00
Daniel Gultsch e0b759340d jump right into edit account if now accounts are configured 2014-08-23 21:31:27 +02:00
Daniel Gultsch d504daec16 changed workflow on inital avatar publication 2014-08-23 20:00:05 +02:00
Daniel Gultsch f7437ecc36 experimental muc message deduplication 2014-08-23 15:57:39 +02:00
Daniel Gultsch ee9872277d removed server compat value in favor of a (small xep list) 2014-08-23 15:56:30 +02:00
iNPUTmice 9b0bf9b5bc fixed another npe 2014-08-22 13:22:34 +02:00
iNPUTmice c40c8ee910 tiny redesign for private muc messages 2014-08-22 13:22:07 +02:00
iNPUTmice 4875b52f09 make avatars persisent / available even without internet 2014-08-21 12:32:50 +02:00
iNPUTmice 301477c764 save newly taken photos in DCIM dir 2014-08-21 09:19:18 +02:00
iNPUTmice 7808e5b77f added roster versioning to calculation of server compat 2014-08-21 07:47:40 +02:00
iNPUTmice 7f5456e41b check if service is bound before adding conferences or contacts 2014-08-21 07:46:55 +02:00
iNPUTmice 9f4043c679 avoid race condition for otr key in jingle 2014-08-21 07:39:14 +02:00
iNPUTmice bd467b6b9d deregister listener in editaccount 2014-08-21 07:38:44 +02:00
iNPUTmice 06da080371 revised manage account activity. removed contexual action mode 2014-08-20 11:32:49 +02:00
iNPUTmice 6345217328 fixed lint error 2014-08-19 15:27:26 +02:00
iNPUTmice 3b79cc2f23 better error display and additional infos (stats) for the edit account activity 2014-08-19 15:06:50 +02:00
iNPUTmice 38f36aa263 more error handling for avatar publication 2014-08-16 17:31:53 +02:00
iNPUTmice 5aa8afdc1c some improvements for the edit account activity 2014-08-16 09:44:37 +02:00
iNPUTmice 32c3dd4f4a moved add/edit account from dialog into seperate activity 2014-08-15 17:31:24 +02:00
iNPUTmice f7c747ef4b better handling of null streams 2014-08-15 13:34:55 +02:00
iNPUTmice 9c18d57e07 refactored Conversations Adapter into seperate class 2014-08-15 13:18:15 +02:00
iNPUTmice 2ab14a6ff2 fixed #356 2014-08-15 13:11:33 +02:00
iNPUTmice 48c780d15a fixed muc pm avatar 2014-08-14 22:09:03 +02:00
iNPUTmice e73a6525c7 fixed bug in caps hash generation. thanks Asterix of the Gajim project 2014-08-14 13:41:20 +02:00
iNPUTmice 510d8a2ae3 another rare npe fixed 2014-08-14 09:59:41 +02:00
iNPUTmice b2cc17c362 trying to fix rotation problems 2014-08-13 13:44:21 +02:00
iNPUTmice 457e7be5e2 fixed #348 2014-08-13 11:22:32 +02:00
iNPUTmice a4faa158c0 only notify ui on significant muc changes 2014-08-13 11:21:33 +02:00
iNPUTmice 07e6873025 try to make openpgp a little more reliable 2014-08-13 11:21:07 +02:00
iNPUTmice 5477ff1aea fixed weird snackbar click issues 2014-08-12 23:23:25 +02:00
iNPUTmice 721b308f28 fixed long press to bring back default in publish avatar activity 2014-08-12 21:03:45 +02:00
iNPUTmice 6952e630c4 show user name as well in confernce details if real name was shown 2014-08-12 11:36:47 +02:00
iNPUTmice 5ed9c2a805 show own avatar in muc details 2014-08-11 23:22:46 +02:00
iNPUTmice 8a82586d5b fixed avatar in notification 2014-08-11 23:18:16 +02:00
iNPUTmice f247abc2dc handle bare jid presences. fixes for otr 2014-08-11 13:46:32 +02:00
Daniel Gultsch 9960cb819e Merge pull request #344 from 1nsan3/development
Hardware search button
2014-08-11 12:52:03 +02:00
Gero Kraus 70423204f4 Updated StartConversationActivity to react on Search Button Pressing 2014-08-10 21:03:57 +02:00
iNPUTmice b35aa3ed07 added limited private muc chat feature (messages are now properly marked) - long press on user icon will sent private messages. fixed #259 2014-08-10 15:27:44 +02:00
iNPUTmice 6de53791b5 fixed rare npe after race condition 2014-08-10 14:04:59 +02:00
iNPUTmice 1a6e42e7c1 potential fix for rejected execution exception 2014-08-10 14:04:35 +02:00
iNPUTmice 0cda7f7819 work around xml parser issues... 2014-08-09 11:37:30 +02:00
iNPUTmice d486d5def9 trying to fix activity has been destroyed error 2014-08-09 11:37:05 +02:00
iNPUTmice a33bf0b4ae show add to roster dialog when trying to start otr session 2014-08-09 11:36:28 +02:00
iNPUTmice a059dfab2c fixed very rare npe 2014-08-09 11:35:49 +02:00
iNPUTmice 937fc51b50 added warning lable if server doesn't support pubsub. refactored feature identification into seperate class 2014-08-09 10:20:16 +02:00
iNPUTmice 0bab1a4613 bug fix for 'back to default' 2014-08-09 09:44:19 +02:00
iNPUTmice 96a41b5b51 ability to bring default picture back with long press in publish avatar 2014-08-09 09:38:52 +02:00
iNPUTmice f6615843f9 grant uri permission on share picture 2014-08-09 09:38:18 +02:00
iNPUTmice de2964cd25 more fixes for notfication in conferences 2014-08-09 09:37:37 +02:00
iNPUTmice 98a80ffc61 save images to external storage instead of internal. this requires more permissions. fixed #150 fixed #177 fixed #333 - this might need some more polish though 2014-08-08 11:49:23 +02:00
iNPUTmice 620d1df82e fixed #320 2014-08-07 14:09:52 +02:00
iNPUTmice 6536c1aeb1 bug fix for not working notification grace period in muc 2014-08-07 11:02:41 +02:00
iNPUTmice 2b4d9e8b60 fixed problems with sha sum calculation on avatar write. delete avatars with non matching sha sum 2014-08-06 18:36:33 +02:00
iNPUTmice ba63727f50 fetch missing avatars from server 2014-08-05 22:58:46 +02:00
iNPUTmice 08755e56a5 show own avatar after publication. no persistancy yet 2014-08-05 13:00:06 +02:00
iNPUTmice 9aba9a4059 error messages for publish avatar 2014-08-05 12:21:08 +02:00
iNPUTmice f8b4d5f338 publish avatars 2014-08-05 01:36:17 +02:00
iNPUTmice 629ff3afcd proper account send to publish avatar activity 2014-08-03 20:42:05 +02:00
iNPUTmice daab16bdef activity for future avatar publications. not working yet 2014-08-03 20:28:13 +02:00
iNPUTmice 88d1bd356c get rid of 'use phones self contact picture option' 2014-07-31 15:18:55 +02:00
iNPUTmice 990f0f6d73 refactored account array adapter into seperate class. added account image 2014-07-31 15:09:34 +02:00
iNPUTmice 27b306444b fixed #326 fixed #202 2014-07-31 13:26:05 +02:00
iNPUTmice 511f74116f fixed npe for the rare case that user has disabled his action bar 2014-07-30 21:30:55 +02:00
iNPUTmice 88e5713a80 fixed npe in start conversation activity 2014-07-30 21:26:33 +02:00
iNPUTmice bc24cf93ab fixed generation of muc pictures with copyonwrite user list 2014-07-30 21:25:59 +02:00
iNPUTmice fe46d36137 fixed rare npe in loading of selfi 2014-07-30 21:24:42 +02:00
iNPUTmice 1521b91b27 fixed #239 - show contact names and pictures in muc if real jid is known 2014-07-29 14:42:17 +02:00
iNPUTmice 4c90bd9b46 fixed bug in message parser 2014-07-27 22:31:33 +02:00
iNPUTmice 0e93e5ce52 trying to work around npe in androids xml parser 2014-07-27 19:06:08 +02:00
iNPUTmice f8fedeb697 fixe race conditons with newIntent 2014-07-27 19:05:39 +02:00
iNPUTmice 2e080401b1 migrated some ArrayLists to CopyOnWriteArrayLists 2014-07-27 18:07:04 +02:00
iNPUTmice 29f089c954 fixed npe with unsuccesfull bind 2014-07-26 15:44:32 +02:00
iNPUTmice 5182a92e58 fixed npe when user was very quick with starting to type in startConversationactivity 2014-07-26 15:44:13 +02:00
iNPUTmice 52ad718251 removed duplicates from muc suggestions 2014-07-24 17:21:21 +02:00
iNPUTmice c7c3db478a included version string in crash reports 2014-07-24 12:33:56 +02:00
iNPUTmice d108a5f2b6 removed more legacy tls error handling stuff 2014-07-24 01:39:46 +02:00
iNPUTmice deab99c997 removed outdated tls error 2014-07-24 01:37:38 +02:00
iNPUTmice 983104f2f0 presonalized read up to this point message 2014-07-24 01:17:34 +02:00
iNPUTmice 7ee2ef5233 answer correctly if both markers and receipts are requested 2014-07-24 01:04:25 +02:00
iNPUTmice 23e5fb5d56 fixed bug with otr session being initilized over and over again 2014-07-23 18:04:29 +02:00
iNPUTmice 5c118f6dd7 more disco. fixed chat markers with jappix 2014-07-23 14:30:27 +02:00
iNPUTmice 1f4ea552cd some cleanup 2014-07-22 18:58:20 +02:00
iNPUTmice 4607e2c546 switched to mtm 2014-07-22 17:27:44 +02:00
iNPUTmice 9fcc195a6d brought settings and manage account menu items back 2014-07-22 17:23:31 +02:00
Daniel Gultsch 84642b7492 refactored message adapter into seperate class 2014-07-22 15:31:54 +02:00
iNPUTmice 66e3ccc2dc save login nick for mucs during join 2014-07-21 22:57:41 +02:00
iNPUTmice e3ebccc762 back to normal invites. fixed #298 2014-07-21 19:55:00 +02:00
iNPUTmice b223784560 added hint to explain the contact has read up to this point 2014-07-21 19:54:26 +02:00
iNPUTmice a787f58a90 fixed #292 2014-07-21 18:20:26 +02:00
iNPUTmice 2fe20ffa8e fixed #267 2014-07-21 16:16:09 +02:00
iNPUTmice f9ed76f5e1 switched to direct invites. fixes #284 2014-07-21 16:04:53 +02:00
iNPUTmice 87aff4c6d8 fixed bug where presence requests where sent on display of contact details 2014-07-21 15:17:01 +02:00
iNPUTmice aa844df144 fixed #290 2014-07-21 15:16:06 +02:00
iNPUTmice 3b7f89bbb0 disable subscription checkboxes when account is offline 2014-07-20 13:21:21 +02:00
iNPUTmice 542cbef53b hide verify snackbar when otr session is ended. fixed npe 2014-07-20 12:36:57 +02:00
iNPUTmice b5005d60de simplified presence subscription in contact details 2014-07-20 03:14:47 +02:00
iNPUTmice 185c485fc6 fixed #254 2014-07-20 02:34:07 +02:00
iNPUTmice 22e504b8f9 ignore groupchats messages that are pending leave 2014-07-20 02:26:23 +02:00
iNPUTmice c65600edc9 pending leaves and joins for muc 2014-07-18 21:57:10 +02:00
iNPUTmice 9cfb4ee6c3 only show muc errors if actually connected 2014-07-18 19:36:29 +02:00
iNPUTmice 4307b1de72 notify ui on roster changes 2014-07-18 15:35:31 +02:00
iNPUTmice 6b74c0594e show snackbar if conference was not found 2014-07-18 12:44:33 +02:00
iNPUTmice 38a9242955 brought muc invites back. + couple of bug fixes + refactoring 2014-07-17 00:03:37 +02:00
iNPUTmice 670dead695 improvements on the dublicate muc messages issue 2014-07-16 19:03:14 +02:00
iNPUTmice 02351de94b made grace period work for muc as well 2014-07-16 12:45:56 +02:00
iNPUTmice 0ec1c022b9 fixed rare npe 2014-07-16 12:42:44 +02:00
iNPUTmice e79a34b651 redesigned muc details a little bit 2014-07-16 12:34:09 +02:00