saqura 
							
						 
					 
					
						
						
						
						
							
						
						
							05d0c9f4fe 
							
						 
					 
					
						
						
							
							Properly check for MUC MAM support  
						
						... 
						
						
						
						Only use MAM (XEP-0313) in MUCs if it is supported.
This should fix  #1264  
						
					 
					
						2015-10-06 16:23:18 +02:00 
						 
				 
			
				
					
						
							
							
								saqura 
							
						 
					 
					
						
						
						
						
							
						
						
							403db3b080 
							
						 
					 
					
						
						
							
							Show whether MAM is supported in MUCs  
						
						... 
						
						
						
						The conference details in "Advanced Mode" now indicate whether MAM is
supported by the conference server. 
						
					 
					
						2015-10-06 16:23:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							32abc76689 
							
						 
					 
					
						
						
							
							changed store path for files  
						
						
						
					 
					
						2015-10-06 16:18:23 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1d2a24c9c0 
							
						 
					 
					
						
						
							
							clean up log exporting service. properly end service after exporting  
						
						
						
					 
					
						2015-10-06 14:13:07 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e6af502055 
							
						 
					 
					
						
						
							
							clear notification and activate grace period when receiving chat marker from another instance  
						
						
						
					 
					
						2015-10-06 11:44:27 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							89edd83609 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2015-10-05 16:45:33 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							160dfa49a0 
							
						 
					 
					
						
						
							
							try to catch plattform bugs  
						
						
						
					 
					
						2015-10-02 11:58:03 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4b62bd256d 
							
						 
					 
					
						
						
							
							properly recycle bitmaps  
						
						
						
					 
					
						2015-10-02 11:39:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2b9b700c96 
							
						 
					 
					
						
						
							
							don't put conference joins into pending on initial bind  
						
						
						
					 
					
						2015-10-01 16:01:19 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6a0b9971aa 
							
						 
					 
					
						
						
							
							reset muc options immediately befor join  
						
						
						
					 
					
						2015-10-01 13:03:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9dcf074a79 
							
						 
					 
					
						
						
							
							request stanza count after every ibb data stanza to not fill our own stanza queue  
						
						
						
					 
					
						2015-09-30 23:42:02 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							648e29db2c 
							
						 
					 
					
						
						
							
							only invoke MTM in interactive mode after direct user input  
						
						... 
						
						
						
						fixes  #1027 
fixes  #792 
fixes  #1439  
					
						2015-09-29 19:24:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							64dbb069ab 
							
						 
					 
					
						
						
							
							rotate thumbnails.  fixes   #1438  
						
						
						
					 
					
						2015-09-29 12:25:32 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5fb77a9739 
							
						 
					 
					
						
						
							
							fixed NPE when executing rename callback in muc  
						
						
						
					 
					
						2015-09-28 15:36:55 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8881b71079 
							
						 
					 
					
						
						
							
							do tab completion only if neither ctrl nor alt are being pressed  
						
						
						
					 
					
						2015-09-28 14:36:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f4d6b676e9 
							
						 
					 
					
						
						
							
							catch rare activity not found exception when opening downloaded files  
						
						
						
					 
					
						2015-09-27 21:27:07 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bbbc30e823 
							
						 
					 
					
						
						
							
							allow tab completion in conferences  
						
						
						
					 
					
						2015-09-27 19:17:44 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5a5e0e7121 
							
						 
					 
					
						
						
							
							use Conversations 1.x.y as user agent string in http upload and download  
						
						
						
					 
					
						2015-09-23 18:05:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d90b3fbf1 
							
						 
					 
					
						
						
							
							swapped icons for foreground services  
						
						
						
					 
					
						2015-09-22 08:50:54 +02:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							a3a13dd9dc 
							
						 
					 
					
						
						
							
							Export logs to SD card preference  
						
						
						
					 
					
						2015-09-21 18:53:29 +01:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							024e697cee 
							
						 
					 
					
						
						
							
							Iterator to go through all messages of a conversation  
						
						
						
					 
					
						2015-09-20 22:17:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a954e32b16 
							
						 
					 
					
						
						
							
							let DnsHelper provide a fallback solution  
						
						
						
					 
					
						2015-09-19 17:31:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							069ddddbc1 
							
						 
					 
					
						
						
							
							fixed content-type indication in http upload  
						
						
						
					 
					
						2015-09-19 17:29:33 +02:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							8f69017d5a 
							
						 
					 
					
						
						
							
							remove the from attribute from sendStartStream()  fixes   #1419  
						
						
						
					 
					
						2015-09-19 15:58:33 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b54b4ca78a 
							
						 
					 
					
						
						
							
							introduced Config variable to use legacy namespace for http upload  
						
						
						
					 
					
						2015-09-17 14:42:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							506b83ddc6 
							
						 
					 
					
						
						
							
							be more careful when publishing device bundle  
						
						
						
					 
					
						2015-09-17 14:18:06 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c173d78950 
							
						 
					 
					
						
						
							
							ignore spoofed stanzas in facebook chat  
						
						
						
					 
					
						2015-09-17 14:13:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							07c7f5bc08 
							
						 
					 
					
						
						
							
							catch IndexOutOfBoundsException when swiping away conversations  
						
						
						
					 
					
						2015-09-17 14:02:28 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7e712d9d4c 
							
						 
					 
					
						
						
							
							fixed rare NPE in DnsHelper. fixed spelling and added logging  
						
						
						
					 
					
						2015-09-17 13:55:27 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b1b13ba0e5 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2015-09-15 22:56:02 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4a4ced1e69 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations  
						
						
						
					 
					
						2015-09-15 22:53:06 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b9002d7fd5 
							
						 
					 
					
						
						
							
							added missing type='submit' to mam queries  
						
						... 
						
						
						
						fixed some nasty inheritance problems along the way
fixes  #1411  
						
					 
					
						2015-09-15 22:52:39 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b5719fd747 
							
						 
					 
					
						
						
							
							work around a NPE caused by arace condition in the http upload  
						
						
						
					 
					
						2015-09-15 22:49:43 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							183dad281c 
							
						 
					 
					
						
						
							
							Merge pull request  #1409  from sespivak/master  
						
						... 
						
						
						
						some string localization for russian language 
						
					 
					
						2015-09-14 17:06:27 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							999d65c187 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2015-09-14 16:53:39 +02:00 
						 
				 
			
				
					
						
							
							
								Sergey Spivak 
							
						 
					 
					
						
						
						
						
							
						
						
							7e06065df2 
							
						 
					 
					
						
						
							
							some string localization for russian language  
						
						
						
					 
					
						2015-09-14 18:36:58 +04:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d13a77bc6 
							
						 
					 
					
						
						
							
							changed http upload namespace to reflect the one in the XEP  
						
						
						
					 
					
						2015-09-14 13:22:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							96575d6290 
							
						 
					 
					
						
						
							
							added possibiltiy to set conferences as moderated (only visible in advanced mode)  
						
						
						
					 
					
						2015-09-13 17:13:46 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							add4302385 
							
						 
					 
					
						
						
							
							pulled new translations from transifex  
						
						
						
					 
					
						2015-09-13 11:07:22 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4220fa948b 
							
						 
					 
					
						
						
							
							added mp4 to well known extensions.  fixes   #1403  
						
						
						
					 
					
						2015-09-12 10:42:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							811e2eaeec 
							
						 
					 
					
						
						
							
							increased dns timeout  
						
						
						
					 
					
						2015-09-10 10:54:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							650abf1c52 
							
						 
					 
					
						
						
							
							added alt as possible modifier key. use mod+(0..9) to jump to a conversation  
						
						
						
					 
					
						2015-09-09 23:28:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6bb9983d58 
							
						 
					 
					
						
						
							
							added rotation detection to up/down navigation  
						
						
						
					 
					
						2015-09-07 20:45:21 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6308dcfdd4 
							
						 
					 
					
						
						
							
							added some key binding  
						
						... 
						
						
						
						* ctrl + tab will open the conversations overview (when available)
* ctrl + up / down will navigate between conversations 
						
					 
					
						2015-09-07 15:46:27 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							88cdd03f0f 
							
						 
					 
					
						
						
							
							catch npe in setupIme method  
						
						
						
					 
					
						2015-09-07 13:31:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							eff173ebc2 
							
						 
					 
					
						
						
							
							indicate broken pep in server info  
						
						
						
					 
					
						2015-09-06 19:40:28 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							a95c451f1e 
							
						 
					 
					
						
						
							
							Only show that have sessions in fingerprint list  
						
						... 
						
						
						
						Doesn't access database directly anymore but goes through AxolotlService
now to obtain list of fingerprints associated with an Account/Contact.
This should prevent orphaned keys littering the UI which previously
couldn't be removed through the Clear Devices function.
Together with 1c79982da84964c1d81179a0927d9cd1eadf53de this fixes  #1393  
						
					 
					
						2015-09-06 15:15:57 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							2bb033267b 
							
						 
					 
					
						
						
							
							Don't manually add keys to the store  
						
						... 
						
						
						
						There is no need to preemptively add the keys to the store oneself.
SessionBuilder will take care of this for us. What's more, this will
prevent IdentityKeys from otherwise invalid bundles to show up in our
UI. 
						
					 
					
						2015-09-06 15:15:57 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2c4a6b0912 
							
						 
					 
					
						
						
							
							add null pointer check to db migration  
						
						
						
					 
					
						2015-09-05 18:47:37 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							e2d506c96a 
							
						 
					 
					
						
						
							
							Never build a session with oneself  
						
						... 
						
						
						
						If we detect our own ID is not in our own devicelist on receiving an
update, we reannounce ourselves. This used to have the side effect of
modifying the list of devices we thought were in the update set, causing
us to accidentally build a session with ourselves.
This lead to our own key being set to TRUSTED_INACTIVE, resulting in red
lock icons on messages sent by the own device.
We fix this by having publishOwnDeviceId() operate on a copy of the
original set. This commit also includes a db migration which deletes
sessions with oneself and sets own keys back to TRUSTED. 
						
					 
					
						2015-09-05 17:29:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a32a577e36 
							
						 
					 
					
						
						
							
							ignore timeout exceptions on secondary dns requests  
						
						
						
					 
					
						2015-09-05 14:26:31 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7eb228d1a5 
							
						 
					 
					
						
						
							
							Issues with URLs with multiple dots in file.  fixes   #1373  
						
						
						
					 
					
						2015-09-04 19:58:53 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1848b46195 
							
						 
					 
					
						
						
							
							invoke onEnterPressed callback only if shift is not pressed  
						
						
						
					 
					
						2015-09-04 19:33:31 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9baa87e5c9 
							
						 
					 
					
						
						
							
							minimize softkeyboard only if it has been in fullscreen mode  
						
						
						
					 
					
						2015-09-04 18:02:53 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							204cee4a17 
							
						 
					 
					
						
						
							
							show an send button instead of the enter key in softkeyboards when enterIsSend and showEnterKey are both set  
						
						
						
					 
					
						2015-09-04 14:48:00 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							b265341848 
							
						 
					 
					
						
						
							
							Ensure uris is empty before onStart adds to it  
						
						... 
						
						
						
						Fixes  #1382  
					
						2015-09-02 22:03:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fc594e249a 
							
						 
					 
					
						
						
							
							added special error state for dns timeout  
						
						
						
					 
					
						2015-09-01 22:37:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							91b0605bc2 
							
						 
					 
					
						
						
							
							use same method to add message hints to otr message everywhere it is needed  
						
						
						
					 
					
						2015-09-01 22:36:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							74cf8320bc 
							
						 
					 
					
						
						
							
							tag axolotl messages with pretty-please-store  
						
						
						
					 
					
						2015-09-01 00:13:19 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aaf3ecaf41 
							
						 
					 
					
						
						
							
							made useImageAsIs determination a bit more foolproof (samsung)  
						
						
						
					 
					
						2015-08-31 20:19:26 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ca262d3523 
							
						 
					 
					
						
						
							
							single task mode for start conversations activity  
						
						
						
					 
					
						2015-08-30 11:37:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b0c19d6bac 
							
						 
					 
					
						
						
							
							fixed bug that prevented newly opened conversations to load the entire history via mam.  fixes   #1328  
						
						
						
					 
					
						2015-08-30 11:24:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8f4b7686c9 
							
						 
					 
					
						
						
							
							catch invalid base64 on omemo key decoding  
						
						
						
					 
					
						2015-08-30 11:11:54 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3db7087658 
							
						 
					 
					
						
						
							
							use build in method on >= lolipop devices to discover dns servers  
						
						
						
					 
					
						2015-08-28 13:05:34 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bc9f6d91ac 
							
						 
					 
					
						
						
							
							pulled updated translations from transifex  
						
						
						
					 
					
						2015-08-28 13:04:57 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							384c441990 
							
						 
					 
					
						
						
							
							reformating and upper bound for waiting on stanza writer  
						
						
						
					 
					
						2015-08-28 11:42:11 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5298f4e2aa 
							
						 
					 
					
						
						
							
							fixed type=timeout  
						
						
						
					 
					
						2015-08-28 11:41:41 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cb70df7a34 
							
						 
					 
					
						
						
							
							added XEP number for http file upload  
						
						
						
					 
					
						2015-08-27 19:18:35 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							eff9e417e0 
							
						 
					 
					
						
						
							
							use dedicated colors for primary and primary_dark  
						
						
						
					 
					
						2015-08-26 21:17:29 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c5abddc584 
							
						 
					 
					
						
						
							
							fixed highlight text color for white chat bubbles  
						
						
						
					 
					
						2015-08-26 21:12:19 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							1156ccbce2 
							
						 
					 
					
						
						
							
							Fix error handling for announce check retrieval  
						
						... 
						
						
						
						Only aborts when a timeout was received. Error conditions (most notably
item-not-found) are interpreted as no other devices existing. 
						
					 
					
						2015-08-26 20:52:44 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cd451856b2 
							
						 
					 
					
						
						
							
							explictitly handle iq timeouts in bind and session iqs  
						
						
						
					 
					
						2015-08-26 20:47:08 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							c4a548ada0 
							
						 
					 
					
						
						
							
							Only announce device after publishing bundle  
						
						
						
					 
					
						2015-08-26 15:45:21 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f6b7a25e29 
							
						 
					 
					
						
						
							
							moved actual iq callback out of synchronized find callback block  
						
						
						
					 
					
						2015-08-26 14:01:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ea2ce78d6e 
							
						 
					 
					
						
						
							
							be more restrictive about marking messages as sent_received in muc parser  
						
						
						
					 
					
						2015-08-26 12:11:12 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3e0636367a 
							
						 
					 
					
						
						
							
							Revert "improved compatibility with muc components that change the message id"  
						
						... 
						
						
						
						This reverts commit df86b0fc47 
						
					 
					
						2015-08-26 11:39:18 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							0eeaccd974 
							
						 
					 
					
						
						
							
							Fix key publishing  
						
						... 
						
						
						
						Remove invalid check for result code, which prevented publishing if the
node was empty to begin with.
Fix pepBroken check 
						
					 
					
						2015-08-26 00:27:39 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							25a9d59412 
							
						 
					 
					
						
						
							
							Add more logging to pep attemp counter logic  
						
						
						
					 
					
						2015-08-25 18:52:36 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							eafcf38ec9 
							
						 
					 
					
						
						
							
							Limit number of PEP publish tries  
						
						... 
						
						
						
						If PEP publish tries are repeatedly triggered by empty PEP updates, stop
attempting to publish after 3 tries. This should work around broken PEP
implementations in older ejabberd and OpenFire versions. 
						
					 
					
						2015-08-25 18:43:44 +02:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							ae9de26f59 
							
						 
					 
					
						
						
							
							remove unused imports.  
						
						
						
					 
					
						2015-08-25 12:40:22 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							b84fecf51a 
							
						 
					 
					
						
						
							
							Pass through device IDs when updating own list  
						
						
						
					 
					
						2015-08-25 12:17:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5eae1e52d2 
							
						 
					 
					
						
						
							
							cleared up some error messages in axolotl service and execute publishOwnDevicesWhenNeeded() only if processing our own jid  
						
						
						
					 
					
						2015-08-25 11:43:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							25c49d5e34 
							
						 
					 
					
						
						
							
							catch some db query exceptions  
						
						
						
					 
					
						2015-08-25 11:12:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7617a19280 
							
						 
					 
					
						
						
							
							additonal null checks in file backend  
						
						
						
					 
					
						2015-08-25 11:11:53 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							476db24c10 
							
						 
					 
					
						
						
							
							fixed session time  
						
						
						
					 
					
						2015-08-25 11:11:32 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f6374f466b 
							
						 
					 
					
						
						
							
							increased carbon grace period to 90s  
						
						
						
					 
					
						2015-08-24 21:25:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							98e7d9c74e 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2015-08-24 21:24:48 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							730a5c644b 
							
						 
					 
					
						
						
							
							renamed plain text to unencrypted.  fixes   #1331  
						
						
						
					 
					
						2015-08-24 21:15:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							865e08401b 
							
						 
					 
					
						
						
							
							fixed regression with mlinks stream managment.  fixes   #1206  
						
						
						
					 
					
						2015-08-24 20:56:36 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fb0b4bb445 
							
						 
					 
					
						
						
							
							added setting to allow for white backgrounds in incoming message bubbles  
						
						
						
					 
					
						2015-08-24 20:56:25 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d36ae091b6 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						
						
					 
					
						2015-08-24 18:18:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d0b8bd0f8a 
							
						 
					 
					
						
						
							
							catch invalid base64 in axolotl key parsing  
						
						
						
					 
					
						2015-08-24 18:18:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							deb9c20e5e 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						
						
					 
					
						2015-08-23 21:06:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c19adebaf0 
							
						 
					 
					
						
						
							
							open files with capital extensions as well.  fixes   #1354  
						
						
						
					 
					
						2015-08-23 21:00:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							91a3cee6d2 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						
						
					 
					
						2015-08-23 19:44:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8043833156 
							
						 
					 
					
						
						
							
							bugfix: next encryption is now being properly detected  
						
						
						
					 
					
						2015-08-23 19:40:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7bd0f31244 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						
						
					 
					
						2015-08-23 17:57:53 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0dfb9bd1a0 
							
						 
					 
					
						
						
							
							introduce special iq type for internal timeouts. always use != result to check for error in callbacks  
						
						
						
					 
					
						2015-08-23 17:53:23 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							777dd4b51e 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						
						
					 
					
						2015-08-23 17:29:46 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bbfd98b726 
							
						 
					 
					
						
						
							
							reformating  
						
						
						
					 
					
						2015-08-23 17:29:31 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d51c4b9655 
							
						 
					 
					
						
						
							
							deal with another set of stream:features after bind  
						
						
						
					 
					
						2015-08-23 17:26:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b0710cdf04 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						
						
					 
					
						2015-08-23 13:57:14 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							e1dc7f990d 
							
						 
					 
					
						
						
							
							Add error handling to OMEMO PEP code  
						
						... 
						
						
						
						Log received errors and abort processing 
						
					 
					
						2015-08-23 13:23:51 +02:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							c0502c2165 
							
						 
					 
					
						
						
							
							remove the READ_PHONE_STATE permission.  
						
						
						
					 
					
						2015-08-23 13:07:27 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3d6fb9b21d 
							
						 
					 
					
						
						
							
							remove callbacks directly from iterator  
						
						
						
					 
					
						2015-08-23 10:20:29 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1688b65965 
							
						 
					 
					
						
						
							
							don't make subsequent iq request when original stanza returned an error  
						
						
						
					 
					
						2015-08-23 08:27:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							496f531e2e 
							
						 
					 
					
						
						
							
							modified clearIqCallbacks into 2-step process  
						
						
						
					 
					
						2015-08-23 08:01:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							06fffc13cd 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						
						
					 
					
						2015-08-19 13:16:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7c822c9b75 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2015-08-19 13:03:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9e26375d2f 
							
						 
					 
					
						
						
							
							simulate old behaviour with messages being set to waiting while offline  
						
						
						
					 
					
						2015-08-19 13:00:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c9b2638778 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						
						
					 
					
						2015-08-19 12:49:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							52f0622dd3 
							
						 
					 
					
						
						
							
							fixed nasty 'stuck at sending' bug that got introduced in  32826ec29d 
						
						
						
					 
					
						2015-08-19 12:47:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dafcee6a5b 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						
						
					 
					
						2015-08-19 12:29:23 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6e1870b00a 
							
						 
					 
					
						
						
							
							check if inputstream is null before cropping avatar images  
						
						
						
					 
					
						2015-08-19 12:25:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9ebd6d503c 
							
						 
					 
					
						
						
							
							catch package manager has died exception  
						
						
						
					 
					
						2015-08-19 12:24:42 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9edcca1045 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						
						
					 
					
						2015-08-16 15:01:06 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5b1dda9148 
							
						 
					 
					
						
						
							
							deal with broken frameworks  
						
						
						
					 
					
						2015-08-16 14:55:40 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d7b3060fc8 
							
						 
					 
					
						
						
							
							catch broken base64 in avatars  
						
						
						
					 
					
						2015-08-16 14:55:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							51a2645349 
							
						 
					 
					
						
						
							
							synchronize packetCallbacks  
						
						
						
					 
					
						2015-08-16 12:12:22 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c082066118 
							
						 
					 
					
						
						
							
							catch null pointer in ScramSHA1 sasl  
						
						
						
					 
					
						2015-08-16 11:50:33 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5501502e89 
							
						 
					 
					
						
						
							
							Merge branch 'depend_on_sm' into development  
						
						
						
					 
					
						2015-08-15 19:18:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ecac1e5943 
							
						 
					 
					
						
						
							
							Merge branch 'development'  
						
						
						
					 
					
						2015-08-15 19:12:51 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							6aec49f06d 
							
						 
					 
					
						
						
							
							Update license string with libraries  
						
						
						
					 
					
						2015-08-15 19:07:55 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							45d68c200e 
							
						 
					 
					
						
						
							
							Display error message if all contact keys purged  
						
						
						
					 
					
						2015-08-15 18:52:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							83e1e6468e 
							
						 
					 
					
						
						
							
							fully depend on sm  
						
						
						
					 
					
						2015-08-15 16:57:07 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1f34fb742c 
							
						 
					 
					
						
						
							
							Merge branch 'development'  
						
						
						
					 
					
						2015-08-15 14:26:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							32826ec29d 
							
						 
					 
					
						
						
							
							provide extra interface to close sockets.  fixes   #1330  
						
						
						
					 
					
						2015-08-15 14:14:33 +02:00 
						 
				 
			
				
					
						
							
							
								hlad 
							
						 
					 
					
						
						
						
						
							
						
						
							4539643f27 
							
						 
					 
					
						
						
							
							show HTTP upload availability on Edit account screen  
						
						
						
					 
					
						2015-08-14 22:24:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dad90762b4 
							
						 
					 
					
						
						
							
							do not touch pictures that are already in the right format  
						
						... 
						
						
						
						fixed  #522  
					
						2015-08-11 16:50:00 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3677c6ec98 
							
						 
					 
					
						
						
							
							use same code that is used to open files for images  
						
						... 
						
						
						
						fixes  #1323  
					
						2015-08-11 15:24:06 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c0dcf4a55a 
							
						 
					 
					
						
						
							
							changed color of 'whispered' prefix  
						
						... 
						
						
						
						fixes  #1326  
					
						2015-08-11 15:13:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fd81491b05 
							
						 
					 
					
						
						
							
							put wake locks on out of band file transfers  
						
						
						
					 
					
						2015-08-10 19:48:36 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d30515a85a 
							
						 
					 
					
						
						
							
							report wrong file size in otr encrypted jingle file transfers to be compatible with conversations > 1.6  
						
						
						
					 
					
						2015-08-10 12:55:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b5e90850d8 
							
						 
					 
					
						
						
							
							provide more detailed error toasts for http file download  
						
						
						
					 
					
						2015-08-10 12:15:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b7f00ddac3 
							
						 
					 
					
						
						
							
							fixed image preview in notfications for images that arrived over jingle  
						
						
						
					 
					
						2015-08-08 17:19:40 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a6e00837af 
							
						 
					 
					
						
						
							
							decreased right hand side padding in contact keys  
						
						
						
					 
					
						2015-08-08 14:09:02 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8b9b74ff7e 
							
						 
					 
					
						
						
							
							renamed multi-end / axolotl to OMEMO  
						
						
						
					 
					
						2015-08-08 13:29:21 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							efdf3b6c1c 
							
						 
					 
					
						
						
							
							removed dead code  
						
						
						
					 
					
						2015-08-08 13:13:23 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cac577fa4e 
							
						 
					 
					
						
						
							
							don't request ack for iq stanzas before stream managment is initialized  
						
						... 
						
						
						
						fixes  #1322  
					
						2015-08-08 10:26:36 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							7437d0fe0c 
							
						 
					 
					
						
						
							
							Increase number of published prekeys for release  
						
						
						
					 
					
						2015-08-07 12:30:39 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							53ce5d223e 
							
						 
					 
					
						
						
							
							request server-ACKs for iq stanzas  
						
						
						
					 
					
						2015-08-06 20:48:55 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6694af8fca 
							
						 
					 
					
						
						
							
							fail old/invalid iq stanzas on bind  
						
						
						
					 
					
						2015-08-06 14:54:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5c0853f302 
							
						 
					 
					
						
						
							
							hide multi-end and otr encryption in conferences  
						
						
						
					 
					
						2015-08-06 13:09:53 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							34b22dea48 
							
						 
					 
					
						
						
							
							Improve TrustKeysActivity slider responsiveness  
						
						... 
						
						
						
						Slider used to skip back on drag-and-drop action. The switch doesn't
trigger explicit whole UI refreshes anymore, it now directly adjusts the
"done" button's locked status. 
						
					 
					
						2015-08-05 22:24:13 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a1c43d8fdf 
							
						 
					 
					
						
						
							
							added config.java variable to hide openpgp as an encryption method  
						
						
						
					 
					
						2015-08-05 18:52:34 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e10e9942de 
							
						 
					 
					
						
						
							
							changed text selection color  
						
						
						
					 
					
						2015-08-05 18:30:49 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c617cf6ef8 
							
						 
					 
					
						
						
							
							added Config.java varibale to lock account creation to specfic domain  
						
						
						
					 
					
						2015-08-03 22:58:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9b91d0bf75 
							
						 
					 
					
						
						
							
							sync translations with transifex  
						
						
						
					 
					
						2015-08-03 14:04:26 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a6bbe4d4ce 
							
						 
					 
					
						
						
							
							lets try jpeg for a while  
						
						
						
					 
					
						2015-08-01 23:37:41 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2bf30bb296 
							
						 
					 
					
						
						
							
							temporarily renamed new encryption method to 'Multi-End' until a better name has been found  
						
						
						
					 
					
						2015-08-01 23:36:59 +02:00