57 Commits

Author	SHA1	Message	Date
iNPUTmice	02a89f4ce2	Merge branch 'feature/mam' into development ... Conflicts: src/main/java/eu/siacs/conversations/services/XmppConnectionService.java	2014-12-13 13:55:24 +01:00
iNPUTmice	2368ba518d	refactored phone contacts merger	2014-12-13 13:52:57 +01:00
iNPUTmice	b523518e4b	various mam improvments	2014-12-13 12:25:52 +01:00
iNPUTmice	1dcdc79a71	changed lastMessageReceived into lastMessageTransmitted to account for sent messages as well. (will trigger on sm ack)	2014-12-10 14:08:06 +01:00
iNPUTmice	0ab530932a	added max history age (default 1w). automatically sort newly added mam messages	2014-12-10 14:08:06 +01:00
iNPUTmice	4a94389f05	very basic mam support	2014-12-10 14:08:06 +01:00
iNPUTmice	34558cc277	store last message received date in conversation	2014-12-10 14:08:06 +01:00
iNPUTmice	2b958e51df	removed unnecessary otr error response	2014-12-10 14:07:56 +01:00
iNPUTmice	46e319b241	more safety checks for listener counts	2014-12-03 14:55:09 +01:00
iNPUTmice	eb0f8c08bd	safety net in joinMuc	2014-12-03 00:06:57 +01:00
iNPUTmice	241de062da	cleaned up avatar / tile creation	2014-12-03 00:06:57 +01:00
iNPUTmice	d98486d1ca	fixed npe for broken bookmarks	2014-11-29 19:09:28 +01:00
iNPUTmice	1ff9293ee1	fix for concurrency issue	2014-11-29 13:09:56 +01:00
Michael	dbe8280662	add an listener for the muc roster update. ... this is for the ConferenceDetailsActivity to show precence updates immediately.	2014-11-23 15:19:44 +01:00
Michael	febbefefa5	MUC: set from when join muc.	2014-11-21 19:37:50 +01:00
iNPUTmice	a142dcc263	import fixes	2014-11-20 18:33:04 +01:00
iNPUTmice	8b10ea676c	Merge branch 'development' of https://github.com/siacs/Conversations into development	2014-11-20 18:20:45 +01:00
iNPUTmice	0ad6d0616f	brought ad hoc conferences back. fixed #688 fixed #367	2014-11-20 18:20:42 +01:00
Sam Whited	73d184352e	Remove broken / unused imports	2014-11-19 14:57:23 -05:00
iNPUTmice	e9948f6b84	sent read marker to full jid	2014-11-19 17:40:42 +01:00
iNPUTmice	66087cb360	put error notification into notification service	2014-11-18 15:26:28 +01:00
iNPUTmice	018a0c7978	better usage of synchronized in some places	2014-11-18 03:10:59 +01:00
iNPUTmice	f41c3eee04	context menu for muc participants + refactor trueCounterpart to use Jid class	2014-11-17 20:02:46 +01:00
iNPUTmice	283d5058e5	synchronized around cache clear in avatar service	2014-11-17 20:01:56 +01:00
Daniel Gultsch	155b607f4d	Merge pull request #673 from SamWhited/development ... Fix fetching accounts by JIDs	2014-11-16 17:35:59 +01:00
iNPUTmice	cf00f3fade	happy hanukkah	2014-11-16 17:21:21 +01:00
Sam Whited	5765a91db6	Fix fetching accounts by JIDs ... Fixes a crash when publishing an avatar	2014-11-16 10:04:45 -05:00
iNPUTmice	88c3537b68	parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareable uri where ever possible	2014-11-16 00:20:20 +01:00
Sam Whited	d94b07c916	Make account status an enum	2014-11-15 11:12:41 -05:00
iNPUTmice	35bf13f5ef	Merge branch 'feature/file_transfer' into development ... Conflicts: src/main/res/values/strings.xml	2014-11-15 15:52:15 +01:00
iNPUTmice	bdc86bb8e3	added low priority and removed date in foreground noticfication	2014-11-15 15:34:34 +01:00
iNPUTmice	3c6b3506e3	turn on foreground service in expert settings	2014-11-15 15:34:34 +01:00
iNPUTmice	47d44448f3	fixed description in notifications and conversation overview	2014-11-15 15:34:12 +01:00
iNPUTmice	e0f012dba1	fixed resending for files as well	2014-11-15 15:34:12 +01:00
iNPUTmice	cc4f3702a8	made file transfers cancelable	2014-11-15 15:34:12 +01:00
iNPUTmice	16847a30c8	support for pgp files	2014-11-15 15:34:12 +01:00
iNPUTmice	dac12be53e	copy non local files to private storage first	2014-11-15 15:34:11 +01:00
iNPUTmice	02cbda68a7	bug fixes and various improvements for file transfer	2014-11-15 15:34:11 +01:00
iNPUTmice	7a90ca429b	basic arbitrary file transfer	2014-11-15 15:34:11 +01:00
iNPUTmice	fce78abb1c	temporarliy got rid of some insane work arounds in favor of some maybe less insane work arounds	2014-11-11 00:16:43 +01:00
iNPUTmice	89ee999e1b	more refactoring for presence selection. removed getTo, getFrom and getJid from Element	2014-11-10 01:24:35 +01:00
iNPUTmice	69ef17efc0	migrated some otr stuff to new jid classes	2014-11-09 17:46:00 +01:00
iNPUTmice	c310ada8b3	Merge branch 'development' of https://github.com/siacs/Conversations into development	2014-11-09 17:05:20 +01:00
iNPUTmice	e9af0d4ca7	Merge branch 'master' into development	2014-11-09 17:02:49 +01:00
iNPUTmice	61f046a675	make avatar service not break on empty names	2014-11-09 17:02:39 +01:00
Sam Whited	180a0e4408	Rework `Account.getJid()' to return full JIDs ... Remove `Account.getFullJid()'	2014-11-09 10:57:22 -05:00
iNPUTmice	377bd49ee8	refactored code to always contain full jid for counterpart	2014-11-09 16:21:13 +01:00
Sam Whited	1a3327f2b1	Create avatar's for JID's w/o localparts	2014-11-09 07:00:40 -05:00
Sam Whited	5ce0cd3802	Fields that we sync on should be final	2014-11-09 07:00:40 -05:00
Sam Whited	9db624ec7b	It builds again!	2014-11-09 07:00:40 -05:00