Commit graph

4268 commits

Author SHA1 Message Date
Daniel Gultsch 75749d7c7b Merge branch 'develop' of https://github.com/cijo7/Conversations into cijo7-develop 2017-03-31 09:34:38 +02:00
Daniel Gultsch 9682f4d454 Merge branch 'deprecated-method' of https://github.com/hareshkh/Conversations into hareshkh-deprecated-method 2017-03-31 09:27:22 +02:00
Daniel Gultsch 4bfc54e51d show file size for files smaller 1024 bytes. fixes #2415 2017-03-31 09:26:55 +02:00
Daniel Gultsch cf96a5e840 Merge pull request #2423 from jcgruenhage/patch-1
Fixed Markdown Headings
2017-03-31 08:34:01 +02:00
Jan Christian Grünhage 92ac82f94d Fixed Markdown Headings 2017-03-30 20:11:55 +02:00
cijo-saju 3171dcac8d Fixed deprecated call 2017-03-30 16:27:11 +05:30
cijo-saju 4e898fa4f2 Run in background instead of writing instantaneously 2017-03-30 16:27:11 +05:30
Haresh Khanna c7912ed7ef Changes the deprecated getColor() method 2017-03-29 22:05:35 +05:30
cijo-saju 37465db817 Fixed package access 2017-03-28 21:02:20 +05:30
cijo-saju 024dbd1c32 Removed unused import and fixed some annotations 2017-03-28 20:46:20 +05:30
cijo-saju cb96911da3 Saves some memory 2017-03-28 20:43:14 +05:30
cijo-saju d8901441f6 Deleted unused variable 2017-03-28 20:41:08 +05:30
Daniel Gultsch 892b1b02af Merge pull request #2409 from cijo7/master
Fixed typo in comment
2017-03-26 20:11:37 +02:00
cijo-saju b4318996ac Fixed typo in comment 2017-03-26 22:07:39 +05:30
Daniel Gultsch 3af30d7563 omemo: put auth tag into key (verify auth tag as well) 2017-03-26 12:39:18 +02:00
Daniel Gultsch 2302122d8e made a few exceptions to quote parser for emoticons and quotes 2017-03-26 12:29:12 +02:00
Daniel Gultsch 00e8ba00c4 count messages in backlog to not renotify on prior notifications 2017-03-23 15:34:52 +01:00
Daniel Gultsch 010b341251 do not pipeline first SM request because that might fail when resume fails 2017-03-21 18:08:20 +01:00
Daniel Gultsch c97c5def2c experimental: wait for SM catchup before triggering notifications
wait for a first SM ACK before calculating if we need to trigger any notifications
might have to be changed to an XEP-0199 ping later on. for now sending <r/> after resume seems to work outfine
2017-03-21 17:58:08 +01:00
Daniel Gultsch 76b9010c39 rework last activity logic to something that should work pretty well in Conversations only enviroments 2017-03-20 17:58:58 +01:00
Daniel Gultsch 644a3a729d define strangers as people not in roster instead of no mutual presence subscription 2017-03-20 13:25:36 +01:00
Daniel Gultsch e58f72c20f show strangers with jid instead of name in conversation list 2017-03-20 13:24:33 +01:00
Daniel Gultsch c2c6904eda offer to block entire domain in message from stranger snackbar. fixes #2391 2017-03-20 12:55:48 +01:00
Daniel Gultsch 4171e2b90e do not show block stranger snackbar when blocking command is unavailable. fixes #2393 2017-03-20 12:16:25 +01:00
Daniel Gultsch 0db5928031 version bump to 1.17.1 + changelog 2017-03-20 11:15:23 +01:00
Daniel Gultsch e5f08a5eae pulled translations from transifex 2017-03-20 11:07:27 +01:00
Daniel Gultsch 4d2a1afaf9 call EditText.setText() instead of clear because clear causes problems on some keyboards 2017-03-20 00:09:23 +01:00
Daniel Gultsch 6167ddb4a8 don't mark message as delivery_failed when cancel didn't work. fixes #2387 2017-03-19 20:16:11 +01:00
Daniel Gultsch 30ed6b3cec call messageSent() from UI thread after encrypting pgp message 2017-03-19 20:15:07 +01:00
Daniel Gultsch ce336690e2 pulled translations from transifex 2017-03-17 13:19:37 +01:00
Daniel Gultsch 91a69d7d85 use qr codes instead of aztec. Barcode Scanner is terrible at reading aztec. fixes #2375 2017-03-17 12:56:55 +01:00
Daniel Gultsch 935ac25cbd update unread counter for image messages. fixes #2376 2017-03-17 12:55:33 +01:00
Daniel Gultsch ba32217152 pulled translations from transifex 2017-03-14 11:09:45 +01:00
Daniel Gultsch 95e33b5a97 never mark conversation w/ own server as stranger 2017-03-14 11:09:34 +01:00
Daniel Gultsch 09d68ae603 fixed entity time for timezones with minutes !=0 2017-03-10 17:25:43 +01:00
Daniel Gultsch 0b11d0f7f2 version bump to 1.17.0 + changelog 2017-03-10 10:14:06 +01:00
Daniel Gultsch 9c588ae9eb pulled translations from transifex 2017-03-10 10:10:07 +01:00
Daniel Gultsch 0ee13bbecb send chat states only to private and non-anon mucs 2017-03-09 15:42:27 +01:00
Daniel Gultsch 1fd3bbfe25 display chat states in conferences 2017-03-09 10:58:44 +01:00
Daniel Gultsch 5ea4322d3f send and parse Chat States to and from conferences 2017-03-09 10:58:44 +01:00
Daniel Gultsch 8a3c996164 update gradle version 2017-03-09 10:58:33 +01:00
Daniel Gultsch cdf2bd07df use async avatar loading in AccountAdapter 2017-03-09 10:58:11 +01:00
Daniel Gultsch c3b2f33956 hide keyboard after setting up account 2017-03-09 10:57:33 +01:00
Daniel Gultsch d56fb3cec2 pulled translations from transifex 2017-03-09 08:33:44 +01:00
Daniel Gultsch 19b7179bcd version bump to 1.17.0-beta.2 2017-03-08 22:07:37 +01:00
Daniel Gultsch 7747fc0ea1 notify for muc messages after mam catchup 2017-03-08 22:02:09 +01:00
Daniel Gultsch 6b72e18982 add <x/> element to outgoing MUC PM 2017-03-08 22:01:20 +01:00
Daniel Gultsch 1f3be1597c add origin-id to outgoing messages 2017-03-08 21:30:12 +01:00
Daniel Gultsch 9d043076e8 only take 1:1 conversations into account when determining catchup timestamp 2017-03-08 20:54:13 +01:00
Daniel Gultsch 8ca16a6f63 do not interpret grin >< as quote 2017-03-08 20:21:04 +01:00