Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							201bc158bd 
							
						 
					 
					
						
						
							
							proper error parsing. some clean up  
						
						
						
					 
					
						2015-05-20 03:48:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9658146575 
							
						 
					 
					
						
						
							
							fixed npe in new message parser  
						
						
						
					 
					
						2015-05-20 03:48:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1b5631c835 
							
						 
					 
					
						
						
							
							fixed muc mam. added a few security checks  
						
						
						
					 
					
						2015-05-20 03:48:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							eeebebe32a 
							
						 
					 
					
						
						
							
							fixed read/unread markers  
						
						
						
					 
					
						2015-05-20 03:48:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b731995a51 
							
						 
					 
					
						
						
							
							added mam stuff to new message parser  
						
						
						
					 
					
						2015-05-20 03:48:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d261feda74 
							
						 
					 
					
						
						
							
							rewrote parser code. mam id and possible other stuff still missing. also massivly untested  
						
						
						
					 
					
						2015-05-20 03:48:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e32f380dae 
							
						 
					 
					
						
						
							
							provide helper function for getting the content of a child directly  
						
						
						
					 
					
						2015-05-20 03:48:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							73a4ffefdf 
							
						 
					 
					
						
						
							
							added fall back package id for voice recorder plugin  
						
						
						
					 
					
						2015-05-20 03:27:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bb60364488 
							
						 
					 
					
						
						
							
							hide block contact from context menu when server feature is not available  fixed   #1207  
						
						
						
					 
					
						2015-05-19 08:31:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a0575c81ab 
							
						 
					 
					
						
						
							
							use same socket time out for jingle and xmpp connections  
						
						
						
					 
					
						2015-05-18 08:48:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1446a59fa5 
							
						 
					 
					
						
						
							
							use a 20s timeout on socks5 connections  
						
						
						
					 
					
						2015-05-18 08:46:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fbc43a8d38 
							
						 
					 
					
						
						
							
							don't offer initiator his own candidates  
						
						
						
					 
					
						2015-05-18 08:45:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d672d578c9 
							
						 
					 
					
						
						
							
							fixed crash on failed account registry  
						
						
						
					 
					
						2015-05-17 12:32:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fce30f22c9 
							
						 
					 
					
						
						
							
							made white space check in bodyContainsDownloadable less aggresive  
						
						
						
					 
					
						2015-05-16 12:49:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b4a8984b18 
							
						 
					 
					
						
						
							
							pulled new translations from transifex  
						
						
						
					 
					
						2015-05-16 10:19:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4151b72a6e 
							
						 
					 
					
						
						
							
							let jingle connection and manager handle message status  
						
						
						
					 
					
						2015-05-16 04:12:53 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b6a7e56bf6 
							
						 
					 
					
						
						
							
							call StartConversationActivity in init mode only after adding the first account  
						
						
						
					 
					
						2015-05-15 13:58:11 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8dfa701043 
							
						 
					 
					
						
						
							
							added a few location questions  
						
						
						
					 
					
						2015-05-14 12:08:43 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d472157a4 
							
						 
					 
					
						
						
							
							always log reason for failed file transfer  
						
						
						
					 
					
						2015-05-14 11:57:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4414cf3b27 
							
						 
					 
					
						
						
							
							ignore question marks in location question  
						
						
						
					 
					
						2015-05-13 17:10:11 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							82878cded1 
							
						 
					 
					
						
						
							
							show location quick action after receiving a question about the users location  
						
						
						
					 
					
						2015-05-13 16:23:20 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6489ddac6c 
							
						 
					 
					
						
						
							
							clear avatar cache when uploading new avatar  
						
						
						
					 
					
						2015-05-13 14:33:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							51aeeb766c 
							
						 
					 
					
						
						
							
							use zero width white space as message seperator  
						
						
						
					 
					
						2015-05-13 11:56:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							93e620d685 
							
						 
					 
					
						
						
							
							removed debug logging  
						
						
						
					 
					
						2015-05-12 04:40:57 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d3a6aa9f7a 
							
						 
					 
					
						
						
							
							handle conference invites differently to deal with killed activities.  fixes   #1188  
						
						
						
					 
					
						2015-05-12 04:33:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							93e444ac3a 
							
						 
					 
					
						
						
							
							don't set unknown error in muc  
						
						
						
					 
					
						2015-05-12 03:57:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fe5c4cab46 
							
						 
					 
					
						
						
							
							don't reinit conversation when coming back to activity. avoids unnecessary scrolling  
						
						
						
					 
					
						2015-05-12 03:56:13 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ceadf2f6fb 
							
						 
					 
					
						
						
							
							pulled updated translations from transifex  
						
						
						
					 
					
						2015-05-11 14:28:36 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b6f85ba0dd 
							
						 
					 
					
						
						
							
							avoid using paragraph style breaks by accident  
						
						
						
					 
					
						2015-05-11 14:18:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9156665add 
							
						 
					 
					
						
						
							
							increased space between merged messages a bit  
						
						
						
					 
					
						2015-05-11 09:20:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							53e43daa0d 
							
						 
					 
					
						
						
							
							add a little bit of space between merged messages.  
						
						
						
					 
					
						2015-05-11 09:08:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							21deda7b00 
							
						 
					 
					
						
						
							
							no font padding on red hearts  
						
						
						
					 
					
						2015-05-11 08:45:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							22b12091a1 
							
						 
					 
					
						
						
							
							rewrote parts of message adapter to avoid using NULL views  
						
						
						
					 
					
						2015-05-11 07:57:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							239e86a98a 
							
						 
					 
					
						
						
							
							optimized heart render code a bit  
						
						
						
					 
					
						2015-05-10 12:04:11 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							33d1621e3b 
							
						 
					 
					
						
						
							
							added white heart to new rendering as well  
						
						
						
					 
					
						2015-05-10 11:56:23 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e6d336c293 
							
						 
					 
					
						
						
							
							Merge branch 'development' of github.com:siacs/Conversations into development  
						
						
						
					 
					
						2015-05-10 11:45:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1e28f60038 
							
						 
					 
					
						
						
							
							changed conversation red to material red  
						
						
						
					 
					
						2015-05-10 03:14:13 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4c486f5e58 
							
						 
					 
					
						
						
							
							paint single unicode hearts as red and slightly larger  
						
						
						
					 
					
						2015-05-10 03:12:44 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Shimokawa 
							
						 
					 
					
						
						
						
						
							
						
						
							9e78e3e09d 
							
						 
					 
					
						
						
							
							only forward incoming chat messages to Pebble App and Gadgetbridge  
						
						
						
					 
					
						2015-05-08 21:36:20 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d9e5035c08 
							
						 
					 
					
						
						
							
							config option to reset attempt counts when changing network (default=true)  
						
						
						
					 
					
						2015-05-08 06:50:28 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c4a4dd2392 
							
						 
					 
					
						
						
							
							throw proper exception before changing account into error state  
						
						
						
					 
					
						2015-05-08 06:30:06 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e0653c0371 
							
						 
					 
					
						
						
							
							fixed encrypted ibb file transfer which was broken with ART.  fixes   #1172  
						
						
						
					 
					
						2015-05-07 14:19:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							05f0aa614f 
							
						 
					 
					
						
						
							
							fixed npe when binval value of vcard avatar is null  
						
						
						
					 
					
						2015-05-07 11:07:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d74e8a8a0e 
							
						 
					 
					
						
						
							
							fixed npe when missing instructions on failed register  
						
						
						
					 
					
						2015-05-06 04:33:21 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							db726a59b8 
							
						 
					 
					
						
						
							
							fwiw don't allow stanza count to go over MAX_INT  
						
						
						
					 
					
						2015-05-06 04:29:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b7c672e10e 
							
						 
					 
					
						
						
							
							avoid fetching avatars multiple times in parallel  
						
						
						
					 
					
						2015-05-05 10:29:41 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5136bf9832 
							
						 
					 
					
						
						
							
							r/o support for vcard avatars. pep avatars will be prefered  
						
						
						
					 
					
						2015-05-05 06:17:34 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e6aa604ade 
							
						 
					 
					
						
						
							
							enabled sm logging by default at least for development branch  
						
						
						
					 
					
						2015-05-05 06:10:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							61fd5d6696 
							
						 
					 
					
						
						
							
							clean up in attachment chooser code.  fixed   #1168  
						
						
						
					 
					
						2015-05-04 09:54:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2582ece210 
							
						 
					 
					
						
						
							
							open market if share location plugin isn't installed  
						
						
						
					 
					
						2015-05-04 04:38:12 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander Groshev 
							
						 
					 
					
						
						
						
						
							
						
						
							d15da64c5d 
							
						 
					 
					
						
						
							
							Fix typos in URL to the project  
						
						
						
					 
					
						2015-05-03 20:53:27 +03:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							43db9cdf4b 
							
						 
					 
					
						
						
							
							turn send button in cancel button while in whisper mode  
						
						
						
					 
					
						2015-05-03 09:30:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c4bfffe6a9 
							
						 
					 
					
						
						
							
							mark account with incompatible server when no sasl mechansim could be found  
						
						
						
					 
					
						2015-05-02 12:10:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							53fea9e1fe 
							
						 
					 
					
						
						
							
							replace send button with quick action button as long as no text has been entered  
						
						
						
					 
					
						2015-05-02 11:38:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e1fab8a488 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2015-05-01 13:52:19 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bcdfdb9ccf 
							
						 
					 
					
						
						
							
							added config option to be a bit more verbose about stanza counts  
						
						
						
					 
					
						2015-04-29 16:15:07 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f0d51fcb77 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2015-04-29 10:19:03 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6a15bc26b6 
							
						 
					 
					
						
						
							
							npe check after reading image uri  
						
						
						
					 
					
						2015-04-28 22:23:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d94c231a74 
							
						 
					 
					
						
						
							
							adjust dimens slightly to work with v21+ (v21 doesn't count the navigation bar)  
						
						
						
					 
					
						2015-04-28 16:25:32 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							92d14c4a00 
							
						 
					 
					
						
						
							
							increased padding on image buttons on v21 to match material guidelines  
						
						
						
					 
					
						2015-04-28 14:46:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							93e942f96d 
							
						 
					 
					
						
						
							
							made material icons smaller (24dp)  
						
						
						
					 
					
						2015-04-28 14:28:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f3805b8bab 
							
						 
					 
					
						
						
							
							stop conference details from crashing when rotating the screen  
						
						
						
					 
					
						2015-04-28 13:56:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							51bf8ec98e 
							
						 
					 
					
						
						
							
							fixed npe when rotating screen in contact details activity  
						
						
						
					 
					
						2015-04-28 13:31:33 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b1843fb61a 
							
						 
					 
					
						
						
							
							print stack trace on io error  
						
						
						
					 
					
						2015-04-28 09:35:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b10b8e2c50 
							
						 
					 
					
						
						
							
							escape nick in highlight regex pattern  
						
						
						
					 
					
						2015-04-28 09:32:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f8e06d8e9a 
							
						 
					 
					
						
						
							
							revert undo timeout to a more reasonable value  
						
						
						
					 
					
						2015-04-28 09:25:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a4ff8e3633 
							
						 
					 
					
						
						
							
							increased padding around switches in manage accounts  
						
						
						
					 
					
						2015-04-27 12:19:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4caa92e8ff 
							
						 
					 
					
						
						
							
							handle returning from camera without picture  
						
						
						
					 
					
						2015-04-27 12:18:27 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e11d658f5e 
							
						 
					 
					
						
						
							
							use xmppserviceconnection to send iq packets in jingle connection  
						
						
						
					 
					
						2015-04-26 20:27:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c283fec0d1 
							
						 
					 
					
						
						
							
							hard code bitmap configs  
						
						
						
					 
					
						2015-04-26 20:26:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7f2a83a684 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2015-04-26 10:48:36 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0fda254d48 
							
						 
					 
					
						
						
							
							Merge pull request  #1135  from BrianBlade/manage_certificates  
						
						... 
						
						
						
						Add option to remove manually approved certificates 
						
					 
					
						2015-04-25 19:09:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5ea1c547d5 
							
						 
					 
					
						
						
							
							fixed service discovery by properly storing and checking identities  
						
						
						
					 
					
						2015-04-25 18:24:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							82daf849aa 
							
						 
					 
					
						
						
							
							fixed   #1039  
						
						
						
					 
					
						2015-04-25 14:42:32 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							77caf73103 
							
						 
					 
					
						
						
							
							Merge pull request  #1146  from BrianBlade/minor_otr_tweaks  
						
						... 
						
						
						
						OTR: Fix onContactStatusChanged & dont archive OTR 
						
					 
					
						2015-04-25 14:09:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d07baccf97 
							
						 
					 
					
						
						
							
							cleaned up file handling  
						
						
						
					 
					
						2015-04-25 14:08:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5e1492fbff 
							
						 
					 
					
						
						
							
							send invite to other instanzes after creating ad hoc conference.  fixes   #1136  
						
						
						
					 
					
						2015-04-23 17:37:47 +02:00 
						 
				 
			
				
					
						
							
							
								BrianBlade 
							
						 
					 
					
						
						
						
						
							
						
						
							d6443d9b2f 
							
						 
					 
					
						
						
							
							OTR: Fix onContactStatusChanged & dont archive OTR  
						
						... 
						
						
						
						- Fix session handling on contact status change: Do not reset
  potentially active sessions; check peer's OTR-resource on disconnect
- use no-permanent-store hint instead of no-store to ensure
  finished messages are delivered to offline/disconnected clients
- add no-permanent-store to ask compliant servers not to archive
  OTR messages 
						
					 
					
						2015-04-21 22:35:35 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3a627f72fb 
							
						 
					 
					
						
						
							
							fixed direct invites  
						
						
						
					 
					
						2015-04-21 18:36:11 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e9783b80d1 
							
						 
					 
					
						
						
							
							added missing translations from transifex  
						
						
						
					 
					
						2015-04-21 10:13:28 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e7972d3d11 
							
						 
					 
					
						
						
							
							pulled latest translations from transifex  
						
						
						
					 
					
						2015-04-20 20:32:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5d7e1159f5 
							
						 
					 
					
						
						
							
							always hide pgp snackbar after decrypting a message.  fixes   #1075  
						
						
						
					 
					
						2015-04-20 12:13:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							127b7866f0 
							
						 
					 
					
						
						
							
							removed some dead code  
						
						
						
					 
					
						2015-04-20 11:49:44 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d2c9bf31cd 
							
						 
					 
					
						
						
							
							fixed weird touch on snackbar switched conversation bug  
						
						... 
						
						
						
						when touching the border of the snackbar or more precisely the space between the input field and the snackbar Conversations would switch into a random conversation for yet unknown reasons. 
						
					 
					
						2015-04-20 11:39:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9e20a4936e 
							
						 
					 
					
						
						
							
							some code clean up to fix some rare NPE’s  
						
						
						
					 
					
						2015-04-19 19:11:32 +02:00 
						 
				 
			
				
					
						
							
							
								BrianBlade 
							
						 
					 
					
						
						
						
						
							
						
						
							da367dd752 
							
						 
					 
					
						
						
							
							Add option to remove manually approved certificates  
						
						... 
						
						
						
						- "Remove certificates" option brings up a dialog that allows
  to delete certificates from MemorizingTrustManager's keystore
- Reconnect active accounts when certificate-settings are changed
- new preference category "Certificate options" 
						
					 
					
						2015-04-19 18:08:13 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							570a22206d 
							
						 
					 
					
						
						
							
							increased undo delay  
						
						
						
					 
					
						2015-04-17 20:01:09 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c4daa08170 
							
						 
					 
					
						
						
							
							fixed a bug in DNS helper code.  fixes   #1130  
						
						
						
					 
					
						2015-04-16 21:56:03 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							65e760aefd 
							
						 
					 
					
						
						
							
							some bug fixes concerning 0byte files.  fixes   #1126  
						
						
						
					 
					
						2015-04-15 15:36:16 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f99e234b88 
							
						 
					 
					
						
						
							
							maintain state when rotating settings activity  
						
						
						
					 
					
						2015-04-14 15:53:50 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							defb127d6e 
							
						 
					 
					
						
						
							
							Merge branch 'dont_trust_cas_preference' of  https://github.com/BrianBlade/Conversations  into BrianBlade-dont_trust_cas_preference  
						
						... 
						
						
						
						Conflicts:
	src/main/res/values-de/strings.xml
	src/main/res/values/strings.xml 
						
					 
					
						2015-04-14 15:17:06 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							261b505f06 
							
						 
					 
					
						
						
							
							always show save button when account info was modified.  fixes   #918  
						
						
						
					 
					
						2015-04-14 15:00:49 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2f24b09309 
							
						 
					 
					
						
						
							
							fixed disable account when sliding and not clicking the toggle  
						
						
						
					 
					
						2015-04-13 18:19:40 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							62faa163f0 
							
						 
					 
					
						
						
							
							fixed typos  
						
						
						
					 
					
						2015-04-13 18:18:25 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8486f47dd9 
							
						 
					 
					
						
						
							
							Merge pull request  #1123  from lookshe/development  
						
						... 
						
						
						
						Bugfix for issue #1121  
						
					 
					
						2015-04-13 17:57:33 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4bf09bc10b 
							
						 
					 
					
						
						
							
							shut up linter  
						
						
						
					 
					
						2015-04-13 17:35:20 +02:00 
						 
				 
			
				
					
						
							
							
								lookshe 
							
						 
					 
					
						
						
						
						
							
						
						
							6da77bdf3b 
							
						 
					 
					
						
						
							
							Bugfix for issue  #1121  
						
						... 
						
						
						
						check with lowercase to also match JPEG, JPeg ...
changed image url in comment 
						
					 
					
						2015-04-13 16:21:00 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							85cb1e4a37 
							
						 
					 
					
						
						
							
							Maintain private chat on MUC.  fixes   #1097  
						
						
						
					 
					
						2015-04-13 16:00:04 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							845b39cdcc 
							
						 
					 
					
						
						
							
							fixed regression where the selected conversation wasn't highlighted anymore on tabled layout  
						
						
						
					 
					
						2015-04-13 15:59:18 +02:00