72 Commits

Author	SHA1	Message	Date
iNPUTmice	cf00f3fade	happy hanukkah	2014-11-16 17:21:21 +01:00
iNPUTmice	ac8c2b7e62	show full time stamp in connection established field	2014-11-16 12:11:14 +01:00
iNPUTmice	2067b9bd8d	made scan and show qr code more accessible in VerifyOtrActivity	2014-11-16 02:10:29 +01: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	d2388a5a7e	Remove extra status wrapper method	2014-11-15 11:31:15 -05:00
Sam Whited	251f4d6d7f	Add incompatible server status	2014-11-15 11:29:58 -05:00
Sam Whited	c09d450db8	Add security error status	2014-11-15 11:21:47 -05: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	07b07115d6	Merge branch 'feature/foreground_service' into development ... Conflicts: src/main/res/values/strings.xml	2014-11-15 15:51:27 +01:00
iNPUTmice	3c6b3506e3	turn on foreground service in expert settings	2014-11-15 15:34:34 +01:00
iNPUTmice	41f7848f2c	handled more error cases	2014-11-15 15:34:12 +01:00
iNPUTmice	47d44448f3	fixed description in notifications and conversation overview	2014-11-15 15:34:12 +01:00
iNPUTmice	cc4f3702a8	made file transfers cancelable	2014-11-15 15:34:12 +01:00
iNPUTmice	4ab558715c	adepted conversationadapter to deal with files	2014-11-15 15:34:12 +01:00
iNPUTmice	e7a70a46e0	some mime and pgp fixes for file transfer	2014-11-15 15:34:12 +01:00
iNPUTmice	c7acfe85c3	progress for http images as well. fixed open button for sent 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	f1e2be4096	check if account is online before doing smp	2014-11-12 12:45:59 +01:00
iNPUTmice	52ca2e7391	Merge branch 'feature/otr_verification' of https://github.com/siacs/Conversations into feature/otr_verification ... Conflicts: src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java	2014-11-11 17:45:16 +01:00
iNPUTmice	d1bf9a3f6d	use auto register for verify otr listeners	2014-11-11 17:42:09 +01:00
iNPUTmice	76f4cf1a73	small bug fix	2014-11-11 17:40:51 +01:00
iNPUTmice	e33fc26cbe	added snackbar to indicate smp. more error handling in verify activity	2014-11-11 17:40:51 +01:00
iNPUTmice	6cd2ff0d88	initial smp support	2014-11-11 17:40:51 +01:00
iNPUTmice	e555fe4b03	auto register/unregister listeners	2014-11-11 17:39:28 +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	8cb97f517f	small bug fix	2014-11-10 23:47:04 +01:00
iNPUTmice	dc98b3dbd5	added snackbar to indicate smp. more error handling in verify activity	2014-11-10 22:03:23 +01:00
iNPUTmice	8740b55d37	initial smp support	2014-11-10 19:23:54 +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	56b4ac1751	use isBareJid instead of getResourcePart().isEmpty()	2014-11-09 19:06:43 +01:00
iNPUTmice	eb9e988361	fixed muc sender history for some cases (where the previous nick was a valid jid)	2014-11-09 18:24:01 +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	7cfcf10f48	Fix contact highlighting in MUC	2014-11-09 07:20:08 -05:00
Sam Whited	02db197a89	Fix crash on account creation	2014-11-09 07:00:40 -05:00
Sam Whited	1a3327f2b1	Create avatar's for JID's w/o localparts	2014-11-09 07:00:40 -05:00
Sam Whited	e49c2b14ed	Fix bug introduced by rebase	2014-11-09 07:00:40 -05:00
Sam Whited	778fb9de6c	Fix letter avatar selection in MUC	2014-11-09 07:00:40 -05:00
Sam Whited	efa4cec24d	More formatting fixes in MUC	2014-11-09 07:00:40 -05:00
Sam Whited	dd426ca6de	Format contact names in MUC properly	2014-11-09 07:00:40 -05:00
Sam Whited	9db624ec7b	It builds again!	2014-11-09 07:00:40 -05:00
Sam Whited	f108fc5a5c	Update more files to use JID objects	2014-11-09 07:00:40 -05:00
Sam Whited	bf9207456e	Update another chunk of stuff to use JID objects	2014-11-09 07:00:40 -05:00
iNPUTmice	ea657ece0d	update conversation fragment on every backend connect	2014-11-08 20:51:27 +01:00
Daniel Gultsch	8a2f20b6ed	Merge pull request #549 from emdete/p2 ... adjust api level wrapping	2014-11-08 13:32:13 +01:00
iNPUTmice	014f5a195b	bug fixes for the previous ui refactoring	2014-11-07 21:49:31 +01:00
iNPUTmice	e45d7bda38	UI code refactoring	2014-11-07 15:38:59 +01:00