306 Commits

Author	SHA1	Message	Date
iNPUTmice	5b6140dc64	long press on images revails share with intent	2014-06-02 21:27:40 +02:00
iNPUTmice	1982151630	linked openkeychain install dialog from decrypt messages box	2014-06-01 19:29:57 +02:00
iNPUTmice	c17db8e34e	changed roster to concurrent hashmap	2014-06-01 19:17:05 +02:00
iNPUTmice	32a21e1ab9	unified crypto messages and made lock icon work for conferences	2014-06-01 19:08:42 +02:00
iNPUTmice	8ea73feec4	added warning when public keys are missing	2014-06-01 18:52:27 +02:00
Andreas Straub	f1505f9f36	Fix tile rendering for larger conferences	2014-06-01 16:30:21 +02:00
iNPUTmice	1a4b1f8a2f	show dialog when no contact in a muc has pgp support	2014-06-01 11:24:35 +02:00
iNPUTmice	5d0e1374b2	OpenPGP key display in muc details is now prettier and linked to openkeychain	2014-06-01 10:22:42 +02:00
Alethea Butler	97957bcfb9	Removed TASK_ON_HOME flag from intent created from share	2014-05-31 13:33:46 -04:00
Alethea Butler	d67d792409	Made the navigateUp override behave like a navigate up	2014-05-31 12:53:23 -04:00
Alethea Butler	b04fd2337e	Refactored into onNavigateUp	2014-05-31 11:50:09 -04:00
iNPUTmice	15096aa0dd	Merge branch 'development' of github.com:siacs/Conversations into development	2014-05-31 11:55:24 +02:00
iNPUTmice	57ded7ee58	fixed regression that led to the wakelock not being released again	2014-05-31 11:54:32 +02:00
Alethea Butler	0edfd36195	Up button goes to contacts after initial setup	2014-05-30 23:41:44 -04:00
Alethea Butler	78686e9bce	Disabled the Home button when it's not the Up button	2014-05-30 23:18:50 -04:00
kruks23	75b14a1d5c	More harcoded translations + updated Spanish	2014-05-29 18:17:21 +02:00
Daniel Gultsch	655565eccc	display pgp key id in muc details and use keys to encrypt groupchat	2014-05-28 10:41:55 +02:00
Daniel Gultsch	b605577cd9	encrypted group messages are now properly decrypted	2014-05-28 10:41:55 +02:00
Daniel Gultsch	fd4897e1a5	first tries on crypto muc	2014-05-28 10:41:55 +02:00
iNPUTmice	e348afac54	possible fix for #149 and #142	2014-05-28 10:37:49 +02:00
Daniel Gultsch	7f825f8027	error msg on offline subscription changes	2014-05-24 11:17:55 +02:00
Daniel Gultsch	03854f30c9	Merge pull request #146 from kruks23/development ... More harcoded translations + Spanish	2014-05-24 10:03:42 +02:00
Daniel Gultsch	00377b64c7	Merge pull request #140 from strb/mucicons ... Refactored unknown contact picture generation	2014-05-24 10:01:51 +02:00
kruks23	d74faa3f7c	More harcoded translations + Spanish	2014-05-24 00:17:42 +02:00
kruks23	d6fd0343ae	Title activities translations + contacts translations + update Spanish Translations	2014-05-23 16:20:49 +02:00
Daniel Gultsch	a0dde05ee5	end otr sessions earlier / more often. can lead to unesessary handshakes but can improve reliabilty	2014-05-23 10:54:40 +02:00
Daniel Gultsch	8133dcd881	fixed possible npe	2014-05-23 10:15:58 +02:00
Daniel Gultsch	a5d54d70ee	code cleanup	2014-05-23 10:07:17 +02:00
kruks23	950165033b	Contact details translations + update spanish translations	2014-05-22 22:58:25 +02:00
Daniel Gultsch	b99779432c	offline crud of contacts	2014-05-22 14:33:17 +02:00
Daniel Gultsch	ad960b393d	implementet missing methods on the new roster mgmt	2014-05-22 12:57:47 +02:00
Daniel Gultsch	f0d2ca260e	fixed #136	2014-05-22 09:36:00 +02:00
Daniel Gultsch	1db807ef58	write contacts on system shutdown	2014-05-21 22:22:36 +02:00
Daniel Gultsch	5a6da5afaa	Merge branch 'development' of github.com:siacs/Conversations into development	2014-05-21 20:28:09 +02:00
Daniel Gultsch	6d90a5cd57	further improvment trying to deal with large images	2014-05-21 20:27:53 +02:00
Andreas Straub	0883de0701	Refactored unknown contact picture generation ... Introduce drawTile method in order to remove code duplication	2014-05-21 18:28:51 +02:00
Andreas Straub	2674d40704	Fix highlight detection in MUC channels ... We only detect highlights if a word starts with the nick (matched in case insensitive manner), followed by optional punctuation, followed by another word boundary.	2014-05-21 18:05:20 +02:00
Daniel Gultsch	0de9d57420	cleaned up shared text	2014-05-21 16:43:19 +02:00
Daniel Gultsch	9d2ce5ff98	auto retry image compression with decreasing sample size	2014-05-21 00:39:45 +02:00
Daniel Gultsch	fa9cbeb746	close input stream	2014-05-20 22:54:28 +02:00
Daniel Gultsch	7f0efa089f	trying to deal with larger images	2014-05-20 22:52:57 +02:00
kruks23	aba1ca7918	Update Spanish Translations + harcoded just_now	2014-05-20 18:49:58 +02:00
Daniel Gultsch	f79d92ab67	highlight people in conferences by clicken on their picture	2014-05-20 11:44:43 +02:00
Daniel Gultsch	13f9f23946	fixed ping time out after session resume	2014-05-20 11:05:03 +02:00
Daniel Gultsch	8f92d8d109	ported pending subscription support to new roster mgmt	2014-05-20 10:48:07 +02:00
Daniel Gultsch	371c985c25	made roster persistant aka enabled versioning again	2014-05-19 21:05:17 +02:00
Daniel Gultsch	a6f9a742c0	some code cleanup to deal with the roster mgmt changes from earlier	2014-05-19 15:39:50 +02:00
Daniel Gultsch	993477cd83	reworked roster/contact handling. might break some stuff. not sycing to disk yet	2014-05-19 15:15:09 +02:00
Daniel Gultsch	590e2403ab	bind and session request more compatible	2014-05-18 17:32:20 +02:00
Daniel Gultsch	e857cf979d	fixed #123 fixed122	2014-05-18 13:23:26 +02:00