f579602456
Merge branch 'master' into development
2015-05-25 11:15:14 +02:00
36034815ee
use same sm check inside xmppconnection and out
2015-05-25 04:54:11 +02:00
a535d45ec3
log connection age and reshedule ping check
2015-05-25 04:49:36 +02:00
9d1a8c607f
Merge branch 'development' of github.com:siacs/Conversations into development
2015-05-21 09:19:56 +02:00
75977818ea
Merge branch 'master' into development
2015-05-21 09:19:26 +02:00
3cdac228f9
fixed with attaching wrong files when returning to activity and background service is still alive
2015-05-21 05:21:22 +02:00
d908b70340
Merge pull request #1212 from emdete/add_jid_to_show_location
...
fix to detect the sender jid correctly
2015-05-20 18:31:18 +02:00
4759607a77
fix to detect the sender jid correctly
2015-05-20 15:45:08 +02:00
bb065680e5
Merge pull request #1211 from emdete/add_jid_to_show_location
...
add extra jid to intend "show location"
2015-05-20 12:48:03 +02:00
2364710afb
added ShortcutBadger as a dependency to create unread counts on launcher icon
2015-05-20 12:47:04 +02:00
78847d0749
add extra jid to intend "show location"
2015-05-20 11:37:10 +02:00
70ebe35ffe
Merge branch 'master' into development
2015-05-20 08:25:42 +02:00
8064832dca
don't allow user to accidentally send empty messages
2015-05-20 08:25:00 +02:00
201bc158bd
proper error parsing. some clean up
2015-05-20 03:48:14 +02:00
9658146575
fixed npe in new message parser
2015-05-20 03:48:14 +02:00
1b5631c835
fixed muc mam. added a few security checks
2015-05-20 03:48:14 +02:00
eeebebe32a
fixed read/unread markers
2015-05-20 03:48:14 +02:00
b731995a51
added mam stuff to new message parser
2015-05-20 03:48:14 +02:00
d261feda74
rewrote parser code. mam id and possible other stuff still missing. also massivly untested
2015-05-20 03:48:14 +02:00
e32f380dae
provide helper function for getting the content of a child directly
2015-05-20 03:48:14 +02:00
73a4ffefdf
added fall back package id for voice recorder plugin
2015-05-20 03:27:52 +02:00
bb60364488
hide block contact from context menu when server feature is not available fixed #1207
2015-05-19 08:31:56 +02:00
a0575c81ab
use same socket time out for jingle and xmpp connections
2015-05-18 08:48:08 +02:00
1446a59fa5
use a 20s timeout on socks5 connections
2015-05-18 08:46:04 +02:00
fbc43a8d38
don't offer initiator his own candidates
2015-05-18 08:45:50 +02:00
d672d578c9
fixed crash on failed account registry
2015-05-17 12:32:04 +02:00
fce30f22c9
made white space check in bodyContainsDownloadable less aggresive
2015-05-16 12:49:04 +02:00
4151b72a6e
let jingle connection and manager handle message status
2015-05-16 04:12:53 +02:00
b6a7e56bf6
call StartConversationActivity in init mode only after adding the first account
2015-05-15 13:58:11 +02:00
b69ee7125d
Force Nameprepping of JID domain parts
...
The IDN.toAscii()/IDN.toUnicode() family only namepreps the original
domain passed to it if it contained non-ASCII characters. This means
that for all-ASCII domains, no canonicalization is performed, which
leads to issues like case-sensitivity. This workaround explicitly
namepreps domain parts before calling IDN.toAscii() on them, in order to
get a canonicalized representation (most notably, case invariance). A
basic DB migration is also included.
2015-05-14 15:52:55 +02:00
8dfa701043
added a few location questions
2015-05-14 12:08:43 +02:00
8d472157a4
always log reason for failed file transfer
2015-05-14 11:57:51 +02:00
4414cf3b27
ignore question marks in location question
2015-05-13 17:10:11 +02:00
82878cded1
show location quick action after receiving a question about the users location
2015-05-13 16:23:20 +02:00
6489ddac6c
clear avatar cache when uploading new avatar
2015-05-13 14:33:52 +02:00
51aeeb766c
use zero width white space as message seperator
2015-05-13 11:56:59 +02:00
93e620d685
removed debug logging
2015-05-12 04:40:57 +02:00
d3a6aa9f7a
handle conference invites differently to deal with killed activities. fixes #1188
2015-05-12 04:33:04 +02:00
93e444ac3a
don't set unknown error in muc
2015-05-12 03:57:05 +02:00
fe5c4cab46
don't reinit conversation when coming back to activity. avoids unnecessary scrolling
2015-05-12 03:56:13 +02:00
b6f85ba0dd
avoid using paragraph style breaks by accident
2015-05-11 14:18:30 +02:00
9156665add
increased space between merged messages a bit
2015-05-11 09:20:08 +02:00
53e43daa0d
add a little bit of space between merged messages.
2015-05-11 09:08:56 +02:00
21deda7b00
no font padding on red hearts
2015-05-11 08:45:38 +02:00
22b12091a1
rewrote parts of message adapter to avoid using NULL views
2015-05-11 07:57:52 +02:00
239e86a98a
optimized heart render code a bit
2015-05-10 12:04:11 +02:00
33d1621e3b
added white heart to new rendering as well
2015-05-10 11:56:23 +02:00
e6d336c293
Merge branch 'development' of github.com:siacs/Conversations into development
2015-05-10 11:45:01 +02:00
1e28f60038
changed conversation red to material red
2015-05-10 03:14:13 +02:00
4c486f5e58
paint single unicode hearts as red and slightly larger
2015-05-10 03:12:44 +02:00
Daniel Gultsch