Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d49fb5873e 
							
						 
					 
					
						
						
							
							switch about activity to appcompat  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fe4ebb6244 
							
						 
					 
					
						
						
							
							reference support actionbar in all activities  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6e89427d5e 
							
						 
					 
					
						
						
							
							started work on migrating to appcompat  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							454f68799e 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2018-03-07 12:35:28 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0deffef8da 
							
						 
					 
					
						
						
							
							fixed concurrent modification when killing mam queries  
						
						
						
					 
					
						2018-03-01 08:27:30 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7557de5479 
							
						 
					 
					
						
						
							
							use java 8 in push management service  
						
						
						
					 
					
						2018-02-25 14:39:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d4ac8b3122 
							
						 
					 
					
						
						
							
							fixed push registration  
						
						
						
					 
					
						2018-02-25 14:31:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7e09fac1da 
							
						 
					 
					
						
						
							
							do not merge bug reports  
						
						
						
					 
					
						2018-02-25 14:28:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							47dfe3c2e2 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2018-02-25 14:22:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							63cd8e5981 
							
						 
					 
					
						
						
							
							added config param to use a random resource at every bind  
						
						
						
					 
					
						2018-02-24 20:47:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4013123279 
							
						 
					 
					
						
						
							
							MAM: rework hasMessagesLeft to account for prosody’s missing count  
						
						
						
					 
					
						2018-02-24 10:57:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							90ace36b18 
							
						 
					 
					
						
						
							
							only explicitly request device list for users not in roster fixups  
						
						
						
					 
					
						2018-02-24 10:03:22 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a09d63d9a4 
							
						 
					 
					
						
						
							
							only explicitly request device list for users not in roster  
						
						
						
					 
					
						2018-02-24 09:47:07 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							03fa58634b 
							
						 
					 
					
						
						
							
							kill mam query when archiving conversation  
						
						
						
					 
					
						2018-02-24 09:39:17 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1a1d5c2a3e 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations  
						
						
						
					 
					
						2018-02-23 23:12:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7725cb8311 
							
						 
					 
					
						
						
							
							MAM: look at total count for completness. parse fin correctly  
						
						
						
					 
					
						2018-02-23 23:11:54 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							8713fc8a06 
							
						 
					 
					
						
						
							
							Use 'Jabber' instead of 'XMPP' in the welcome message  
						
						
						
					 
					
						2018-02-22 22:04:03 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f81e5e471e 
							
						 
					 
					
						
						
							
							request disco items before disco#info on first connect  
						
						... 
						
						
						
						should make initial connect faster because code is not waiting for omemo code to run 
						
					 
					
						2018-02-20 17:36:07 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e7094af9d5 
							
						 
					 
					
						
						
							
							warn when attempting to write stanza to an unbound stream  
						
						
						
					 
					
						2018-02-20 17:03:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							72cf702e75 
							
						 
					 
					
						
						
							
							mark error notifications as sensitve and local only.  fixes   #2795  
						
						
						
					 
					
						2018-02-20 08:22:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c35ac11a42 
							
						 
					 
					
						
						
							
							check if axolotl service is initialized before displaying keys  
						
						
						
					 
					
						2018-02-19 17:26:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							742727504f 
							
						 
					 
					
						
						
							
							fixed handling of self address messages w/o remoteMsgId  
						
						
						
					 
					
						2018-02-19 15:52:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							014cf66c87 
							
						 
					 
					
						
						
							
							do not allow insecure bind  
						
						
						
					 
					
						2018-02-18 21:54:03 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							17c6d8827c 
							
						 
					 
					
						
						
							
							Make use of Namespace.DATA constant  
						
						
						
					 
					
						2018-02-16 16:12:53 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							9af7b7ae1e 
							
						 
					 
					
						
						
							
							Namespace: Add constant for 'jabber ❌ data'  
						
						
						
					 
					
						2018-02-16 16:12:53 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a3f3cfa0bb 
							
						 
					 
					
						
						
							
							only allow a number of white listed headers according to http upload v0.5  
						
						
						
					 
					
						2018-02-16 11:14:16 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							3fa205d463 
							
						 
					 
					
						
						
							
							Don't add account if user cancels.  Fixes   #2797  
						
						
						
					 
					
						2018-02-15 14:40:21 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							3b7d9b39f7 
							
						 
					 
					
						
						
							
							Pass invite XMPP URI along instead of JID  
						
						
						
					 
					
						2018-02-14 17:03:43 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							c7d2b65982 
							
						 
					 
					
						
						
							
							XmppUri: Add toString() method  
						
						
						
					 
					
						2018-02-14 17:03:43 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d3e755ceb1 
							
						 
					 
					
						
						
							
							null check on invite object  
						
						
						
					 
					
						2018-02-13 15:20:30 +01:00 
						 
				 
			
				
					
						
							
							
								Christoph Scholz 
							
						 
					 
					
						
						
						
						
							
						
						
							9360f5c960 
							
						 
					 
					
						
						
							
							allow roster action with name  
						
						
						
					 
					
						2018-02-12 20:00:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6650c0bd57 
							
						 
					 
					
						
						
							
							always copy firefoxe’s shared files  
						
						
						
					 
					
						2018-02-12 12:31:59 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							eed2d93145 
							
						 
					 
					
						
						
							
							integrate intent integrator to finish activity when needed  
						
						
						
					 
					
						2018-02-12 11:22:51 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							64928d0ff1 
							
						 
					 
					
						
						
							
							http upload: do not crash on invalid slot responses  
						
						
						
					 
					
						2018-02-11 17:54:59 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e2ac1db225 
							
						 
					 
					
						
						
							
							do not cross reference bookmarks and conversations  
						
						
						
					 
					
						2018-02-10 19:06:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2eb2513615 
							
						 
					 
					
						
						
							
							always persist current nick (in bookmark and database)  
						
						
						
					 
					
						2018-02-10 16:24:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							64c956904d 
							
						 
					 
					
						
						
							
							don't cancel animation when switching accounts w/o init  
						
						
						
					 
					
						2018-02-10 13:32:37 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b3561e80f2 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2018-02-10 12:21:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0e8e8be82c 
							
						 
					 
					
						
						
							
							Merge pull request  #2780  from linkmauve/patch-1  
						
						... 
						
						
						
						Fix the French translation for the add_back string 
						
					 
					
						2018-02-10 12:19:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f828b89cbd 
							
						 
					 
					
						
						
							
							skip empty srv records  
						
						
						
					 
					
						2018-02-10 12:16:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							facc56bc7b 
							
						 
					 
					
						
						
							
							return to welcome activity after deleting last account  
						
						
						
					 
					
						2018-02-10 10:45:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							97406ecf51 
							
						 
					 
					
						
						
							
							skip animations for startup activities  
						
						
						
					 
					
						2018-02-09 22:19:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d33fca09cf 
							
						 
					 
					
						
						
							
							add null checks to huawei settings code  
						
						
						
					 
					
						2018-02-09 22:11:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5335cda50c 
							
						 
					 
					
						
						
							
							do not put setup activites on stack twice  
						
						
						
					 
					
						2018-02-09 20:09:58 +01:00 
						 
				 
			
				
					
						
							
							
								linkmauve 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4e373d82dc 
							
						 
					 
					
						
						
							
							Fix the French translation for the add_back string  
						
						... 
						
						
						
						It was translated to something like “add again”, which doesn’t carry the same meaning and can be confusing for users.
It would be useful to also check how it has been translated in other languages, and add a source comment for future translators. 
						
					 
					
						2018-02-05 19:30:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							012653f7ed 
							
						 
					 
					
						
						
							
							SM saftey checks  
						
						
						
					 
					
						2018-02-02 16:52:40 +01:00 
						 
				 
			
				
					
						
							
							
								Christian Schneppe 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							40878350c7 
							
						 
					 
					
						
						
							
							fixed crash on receiving files  
						
						
						
					 
					
						2018-02-01 19:47:51 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bcd00bb517 
							
						 
					 
					
						
						
							
							discover file extension in original filename from pgp  
						
						
						
					 
					
						2018-01-29 01:40:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2f1f9f2c2c 
							
						 
					 
					
						
						
							
							do not explicitly request MAM archive for blocked contacts  
						
						
						
					 
					
						2018-01-29 01:39:46 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e48788e821 
							
						 
					 
					
						
						
							
							support new http upload namespace  
						
						
						
					 
					
						2018-01-28 14:17:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4541ac8b7b 
							
						 
					 
					
						
						
							
							direct link from settings to huaweis protected apps  
						
						
						
					 
					
						2018-01-28 13:31:12 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3e9224bde9 
							
						 
					 
					
						
						
							
							add snooze button to notification  
						
						
						
					 
					
						2018-01-28 13:14:30 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c7bdc343ec 
							
						 
					 
					
						
						
							
							show account details when clicking avatar picture in self chat  
						
						
						
					 
					
						2018-01-27 21:34:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8f9640a9e1 
							
						 
					 
					
						
						
							
							just switch to conversations & do not creat when 'creating' self contact  
						
						
						
					 
					
						2018-01-27 21:04:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a33984acc5 
							
						 
					 
					
						
						
							
							encrypt muc PM only to actual recipient  
						
						
						
					 
					
						2018-01-27 20:55:43 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							be70eb5650 
							
						 
					 
					
						
						
							
							improvements for self messages  
						
						... 
						
						
						
						* fix omemo in group chats w/o participants
* don't create two axolotl messages when messaging self
* fix read marker for self messages 
						
					 
					
						2018-01-27 10:45:05 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3e111e7f58 
							
						 
					 
					
						
						
							
							allow axolotl header to be empty in empty mucs  
						
						
						
					 
					
						2018-01-27 09:15:47 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a5256c3e83 
							
						 
					 
					
						
						
							
							show self messages from other devices as received  
						
						
						
					 
					
						2018-01-27 09:15:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1217faec60 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2018-01-25 12:48:54 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							294e19d962 
							
						 
					 
					
						
						
							
							fixed sharing multiple images  
						
						
						
					 
					
						2018-01-25 12:48:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							676ac32a97 
							
						 
					 
					
						
						
							
							delegate uri permission to service when processing files  
						
						
						
					 
					
						2018-01-23 22:02:28 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0dbad2eea5 
							
						 
					 
					
						
						
							
							updated year in copyright info  
						
						
						
					 
					
						2018-01-23 22:01:56 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							44ce90ccf2 
							
						 
					 
					
						
						
							
							respond to message receipts request when processing carbon copy  
						
						
						
					 
					
						2018-01-23 22:00:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							eee5d885ba 
							
						 
					 
					
						
						
							
							make chat markers opportunistic in private mucs  
						
						
						
					 
					
						2018-01-22 23:21:24 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e62b0ca320 
							
						 
					 
					
						
						
							
							fix NPE when writing Resolver.Result to disk  
						
						
						
					 
					
						2018-01-22 23:20:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							74048593ff 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2018-01-22 21:09:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1e0f288e6a 
							
						 
					 
					
						
						
							
							avoid some unnecessary notification updates  
						
						
						
					 
					
						2018-01-22 12:24:10 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							78c5c508b3 
							
						 
					 
					
						
						
							
							permanently cache last resolver result  
						
						
						
					 
					
						2018-01-21 20:41:30 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3c4ba7e0ce 
							
						 
					 
					
						
						
							
							keep screen on during audio playback.  fixes   #2733  
						
						
						
					 
					
						2018-01-21 16:04:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f2bbb6087c 
							
						 
					 
					
						
						
							
							remove wakelocks in XmlReader  
						
						
						
					 
					
						2018-01-21 12:30:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							42c807ead8 
							
						 
					 
					
						
						
							
							Merge branch 'soft-keyboard-bug' of  https://github.com/harshitbansal05/Conversations  into harshitbansal05-soft-keyboard-bug  
						
						
						
					 
					
						2018-01-21 12:26:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6458351f6c 
							
						 
					 
					
						
						
							
							use countdownlatch to check if TagWriter has finished  
						
						
						
					 
					
						2018-01-20 23:13:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3a8855a672 
							
						 
					 
					
						
						
							
							fixed interupt handling  
						
						
						
					 
					
						2018-01-20 21:57:09 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2b39acf352 
							
						 
					 
					
						
						
							
							postpone notification actions (mark as read, reply) until after messages are loaded  
						
						
						
					 
					
						2018-01-20 20:05:39 +01:00 
						 
				 
			
				
					
						
							
							
								iamharsshit 
							
						 
					 
					
						
						
						
						
							
						
						
							a3bb7c346b 
							
						 
					 
					
						
						
							
							add soft keyboard next button functionality  
						
						
						
					 
					
						2018-01-20 22:43:11 +05:30 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4600b3982e 
							
						 
					 
					
						
						
							
							treat key transport messages differently to not open empty conversations  
						
						
						
					 
					
						2018-01-20 09:36:37 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3ff37511d4 
							
						 
					 
					
						
						
							
							sent message receipts after mam catchup  
						
						
						
					 
					
						2018-01-20 08:54:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6009b8ebf0 
							
						 
					 
					
						
						
							
							disable offline messages. postpone prekey handling until after mam catchup  
						
						
						
					 
					
						2018-01-19 18:17:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							036dd82698 
							
						 
					 
					
						
						
							
							properly handle key transport messages. use prekeyparsing only when that attribute is set  
						
						
						
					 
					
						2018-01-18 20:58:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6663eb0a12 
							
						 
					 
					
						
						
							
							show warning toast if PM is disabled in MUC  
						
						
						
					 
					
						2018-01-18 17:35:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5d11fe7dc6 
							
						 
					 
					
						
						
							
							added a few todos to source code  
						
						
						
					 
					
						2018-01-15 11:13:35 +01:00 
						 
				 
			
				
					
						
							
							
								Christoph Scholz 
							
						 
					 
					
						
						
						
						
							
						
						
							d6bbcbd866 
							
						 
					 
					
						
						
							
							setting room subject also sets room name  
						
						
						
					 
					
						2018-01-13 21:02:06 +01:00 
						 
				 
			
				
					
						
							
							
								daivat15 
							
						 
					 
					
						
						
						
						
							
						
						
							de23b37ee2 
							
						 
					 
					
						
						
							
							Gradle Update to 3.0.1 with aapt  
						
						... 
						
						
						
						Gradle Update to 3.0.1 with aapt
Gradle Update to 3.0.1 with aapt fix try 
						
					 
					
						2018-01-11 18:30:09 +05:30 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8b10f96272 
							
						 
					 
					
						
						
							
							disable copy in password field  
						
						
						
					 
					
						2018-01-10 16:57:54 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d68a610ac6 
							
						 
					 
					
						
						
							
							change edit button in quick edit dialog to accept  
						
						
						
					 
					
						2018-01-09 10:30:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							965c8cbbd5 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2018-01-09 10:14:00 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							55016f10e6 
							
						 
					 
					
						
						
							
							fix color of show password button  
						
						
						
					 
					
						2018-01-09 10:13:53 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7ab8ed625d 
							
						 
					 
					
						
						
							
							fix wrong avatar shown when true jid doesn't match in muc  
						
						
						
					 
					
						2018-01-09 10:13:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4d7d7623a0 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2018-01-01 12:02:15 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2c2e77a168 
							
						 
					 
					
						
						
							
							ShareWithActivity: refactor for java 8  
						
						
						
					 
					
						2018-01-01 11:56:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							97bc93aeb0 
							
						 
					 
					
						
						
							
							do not use theme in uri activity  
						
						
						
					 
					
						2017-12-19 12:50:19 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b5828127ee 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2017-12-18 13:48:30 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							127557df56 
							
						 
					 
					
						
						
							
							show pep as available if omemo_all_access has been installed on server  
						
						
						
					 
					
						2017-12-18 13:47:53 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c5ee541906 
							
						 
					 
					
						
						
							
							clear muc avatar after going online  
						
						
						
					 
					
						2017-12-18 13:19:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e0ec6ad8b6 
							
						 
					 
					
						
						
							
							fixed omemo device list not getting annouced on empty list  
						
						
						
					 
					
						2017-12-18 13:18:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1753dcac76 
							
						 
					 
					
						
						
							
							save muc subject to disk and use crypto targets for offline name generation  
						
						
						
					 
					
						2017-12-17 16:23:19 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2b0551a522 
							
						 
					 
					
						
						
							
							store new intent in welcome account activity  
						
						
						
					 
					
						2017-12-16 21:05:56 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0cc6ff05f8 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2017-12-16 20:45:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							21615477ed 
							
						 
					 
					
						
						
							
							transport invitee from welcome activity to start conversations activity  
						
						
						
					 
					
						2017-12-16 20:38:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c58fcb1dc6 
							
						 
					 
					
						
						
							
							create avatar in background thread  
						
						
						
					 
					
						2017-12-16 14:22:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9b95f1102c 
							
						 
					 
					
						
						
							
							PublishProfilePictureActivity: refresh on status change  
						
						
						
					 
					
						2017-12-16 11:00:49 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ccf75ef45a 
							
						 
					 
					
						
						
							
							removed 'contact-only' hint from publish avtar screen  
						
						
						
					 
					
						2017-12-15 21:47:16 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bb6d5463fe 
							
						 
					 
					
						
						
							
							use JPEG as file format for avatar and compress to <9400 chars  
						
						
						
					 
					
						2017-12-15 20:49:48 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0be41e0aab 
							
						 
					 
					
						
						
							
							refactor StartConversationsActivity  
						
						
						
					 
					
						2017-12-15 19:13:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cc6a001ac2 
							
						 
					 
					
						
						
							
							remove NFC handling + let edit account handle own jids  
						
						
						
					 
					
						2017-12-15 18:25:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6a9abd0e49 
							
						 
					 
					
						
						
							
							Merge pull request  #2720  from af8a524db1/uri_message  
						
						... 
						
						
						
						Handle 'message action' XMPP URIs 
						
					 
					
						2017-12-15 16:17:05 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cdd6bdab98 
							
						 
					 
					
						
						
							
							increased max lines to 8  
						
						
						
					 
					
						2017-12-15 16:14:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d339b6521 
							
						 
					 
					
						
						
							
							remove NFC + light refactoring of XmppActivity  
						
						
						
					 
					
						2017-12-15 16:14:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							df37e34e02 
							
						 
					 
					
						
						
							
							use show password widget in Change Password Activity  
						
						
						
					 
					
						2017-12-15 12:31:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a817a96c58 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2017-12-15 12:01:45 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a0c8e6170b 
							
						 
					 
					
						
						
							
							limit height of input field to 6 lines  
						
						
						
					 
					
						2017-12-15 02:54:03 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4d4586eaea 
							
						 
					 
					
						
						
							
							Conference Details: hide settings in offline mucs  
						
						
						
					 
					
						2017-12-15 02:53:52 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							60ae269870 
							
						 
					 
					
						
						
							
							removed password repeat field in favor of show password field  
						
						
						
					 
					
						2017-12-15 02:51:54 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							38797177c7 
							
						 
					 
					
						
						
							
							ChatMarkers: parse own account from true counterpart  
						
						
						
					 
					
						2017-12-14 19:34:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a6864878ba 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2017-12-14 12:25:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							120ddcf8c9 
							
						 
					 
					
						
						
							
							fixed treatAsDownload() for empty messages  
						
						
						
					 
					
						2017-12-14 12:25:21 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							7dc68522a2 
							
						 
					 
					
						
						
							
							Handle NFC action in UriHandlerActivity  
						
						
						
					 
					
						2017-12-13 21:20:30 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							d5f8a4dacb 
							
						 
					 
					
						
						
							
							StartConversationActivity: Scan QR codes via UriHandlerActivity  
						
						
						
					 
					
						2017-12-13 21:20:30 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							75e16d0f54 
							
						 
					 
					
						
						
							
							UriHandlerActivity: Handle 'message action' XMPP URI  
						
						
						
					 
					
						2017-12-13 21:20:30 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							0fac4be94d 
							
						 
					 
					
						
						
							
							XmppUri: Parse 'message action' query  
						
						
						
					 
					
						2017-12-13 21:16:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							782b8fb744 
							
						 
					 
					
						
						
							
							fixup for pep omemo notification dedup  
						
						
						
					 
					
						2017-12-13 20:28:30 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							edf3c41e58 
							
						 
					 
					
						
						
							
							Add ShareViaAccountActivity  
						
						
						
					 
					
						2017-12-12 17:15:16 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							a7927d181b 
							
						 
					 
					
						
						
							
							AccountAdapter: Allow hiding of state button  
						
						
						
					 
					
						2017-12-12 17:15:13 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							b8b7cc2635 
							
						 
					 
					
						
						
							
							Implement simple URI handler activity  
						
						
						
					 
					
						2017-12-12 14:05:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9a796df2a3 
							
						 
					 
					
						
						
							
							add getAccountJids to DatabaseBackend  
						
						
						
					 
					
						2017-12-11 15:56:15 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							37bd26c75f 
							
						 
					 
					
						
						
							
							save changed server id in replaced messages  
						
						
						
					 
					
						2017-12-11 15:55:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							946d97074f 
							
						 
					 
					
						
						
							
							try to detect invalid nick (w/ emoji) in MUCs  
						
						
						
					 
					
						2017-12-11 15:55:10 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							43242a293e 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2017-12-09 19:00:09 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a973833a4f 
							
						 
					 
					
						
						
							
							support error messages in quick edit dialog  
						
						
						
					 
					
						2017-12-09 18:46:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d349f634d0 
							
						 
					 
					
						
						
							
							ignore data uri after aesgcm uri  
						
						
						
					 
					
						2017-12-09 14:45:54 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							efd8876001 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2017-12-09 10:43:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9bdaeb340b 
							
						 
					 
					
						
						
							
							fix format string  
						
						
						
					 
					
						2017-12-09 10:42:24 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							665c5da8ae 
							
						 
					 
					
						
						
							
							fix xmpp uri regression  
						
						
						
					 
					
						2017-12-08 18:44:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							172d249369 
							
						 
					 
					
						
						
							
							initialize emoji helper in StartConversationActivity  
						
						
						
					 
					
						2017-12-08 18:43:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cdee6523e4 
							
						 
					 
					
						
						
							
							fix XmppUri for empty uris  
						
						
						
					 
					
						2017-12-08 14:24:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1b0cd77c57 
							
						 
					 
					
						
						
							
							XmppConnection: refactor registration code. 'Open Website' on PAYMENT_REQUIRED failure  
						
						
						
					 
					
						2017-12-08 14:23:38 +01:00 
						 
				 
			
				
					
						
							
							
								Georg Lukas 
							
						 
					 
					
						
						
						
						
							
						
						
							d96180f0ee 
							
						 
					 
					
						
						
							
							XEP-0393: fix off-by-one error in block detector ('`ii`ii')  
						
						
						
					 
					
						2017-12-07 14:48:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							328c6dea0f 
							
						 
					 
					
						
						
							
							fixed workaround that allowed us to expire devices  
						
						
						
					 
					
						2017-12-07 14:47:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a4b44ee730 
							
						 
					 
					
						
						
							
							Styler: do not style across multiple messages  
						
						
						
					 
					
						2017-12-06 16:58:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c489b6a8eb 
							
						 
					 
					
						
						
							
							put device id into setting for doze  
						
						
						
					 
					
						2017-12-06 16:57:43 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							97821f0633 
							
						 
					 
					
						
						
							
							possible fix for retry loop on pgp key annoucement  
						
						
						
					 
					
						2017-12-05 19:16:53 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0e6d3db926 
							
						 
					 
					
						
						
							
							Do not show xmpp uris as links that have invalid jids  
						
						
						
					 
					
						2017-12-05 19:02:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5885bc7f25 
							
						 
					 
					
						
						
							
							show warning when opening invalid jid  
						
						
						
					 
					
						2017-12-05 17:29:05 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b5fe8789e9 
							
						 
					 
					
						
						
							
							Refined avatar generation a bit  
						
						
						
					 
					
						2017-12-05 14:15:10 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							614372dcbb 
							
						 
					 
					
						
						
							
							ConversationsAdapter: Do not show image preview. Show pictogram instead  
						
						
						
					 
					
						2017-12-05 14:14:52 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9869310699 
							
						 
					 
					
						
						
							
							avoid some false positive quotes  
						
						
						
					 
					
						2017-12-04 16:50:15 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							95553750a3 
							
						 
					 
					
						
						
							
							Conference Options: fix context menus for people not in roster  
						
						
						
					 
					
						2017-12-03 18:09:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4b5db2fb45 
							
						 
					 
					
						
						
							
							read marker from mam. only trust true counterpart when mam:2 is being used  
						
						
						
					 
					
						2017-12-02 22:13:59 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ffb3eeb913 
							
						 
					 
					
						
						
							
							MAM: update previously sent messages with server msg id during mam query  
						
						
						
					 
					
						2017-12-02 20:52:30 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fc8a5641db 
							
						 
					 
					
						
						
							
							MAM: assume true counterpart is safe to extract when using mam:2  
						
						
						
					 
					
						2017-12-02 18:11:03 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							61f3539839 
							
						 
					 
					
						
						
							
							MAM: do not use private messages when finding last id in muc  
						
						
						
					 
					
						2017-12-02 17:48:54 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							97df4a682b 
							
						 
					 
					
						
						
							
							MessageParser: ignore groupchat messages retrieved from user archive  
						
						
						
					 
					
						2017-12-02 17:48:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6449881961 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2017-12-01 23:16:37 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							75b4926025 
							
						 
					 
					
						
						
							
							fixed publish-options migration  
						
						
						
					 
					
						2017-12-01 18:54:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							23e9c73c94 
							
						 
					 
					
						
						
							
							attempt to enable MAM(ejabberd) on muc configuration  
						
						
						
					 
					
						2017-12-01 17:36:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b158e9fd42 
							
						 
					 
					
						
						
							
							do not return muc whispers as last markable message  
						
						
						
					 
					
						2017-11-30 17:26:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							86f09dd9b9 
							
						 
					 
					
						
						
							
							PresenceParser: work around for ejabberd not including status code 110 in shut down presence  
						
						
						
					 
					
						2017-11-30 13:21:03 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							21480c9b98 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2017-11-28 11:15:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							64dd622d32 
							
						 
					 
					
						
						
							
							make 'markable' attribute persistent  
						
						
						
					 
					
						2017-11-25 20:55:43 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7f4f30c849 
							
						 
					 
					
						
						
							
							ListItemAdapter: use ViewHolder  
						
						
						
					 
					
						2017-11-23 23:26:19 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d95ff134d9 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2017-11-23 21:00:49 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9381c1d3e2 
							
						 
					 
					
						
						
							
							fixed content description for previous ViewHolder refactor  
						
						
						
					 
					
						2017-11-23 20:32:51 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							333e7a6510 
							
						 
					 
					
						
						
							
							deduplicate read markers if one with real jid is found  
						
						
						
					 
					
						2017-11-23 18:19:05 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							513427c8a8 
							
						 
					 
					
						
						
							
							MAM: start muc catchup with last sent message if serverId is available  
						
						
						
					 
					
						2017-11-23 18:18:30 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7d04e6331a 
							
						 
					 
					
						
						
							
							ConversationAdapter: use view holder  
						
						
						
					 
					
						2017-11-23 09:59:49 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							900ad2f7ef 
							
						 
					 
					
						
						
							
							ConversationsAdapter: Use EmojiWrapper instead of EmojiTextView  
						
						
						
					 
					
						2017-11-23 09:36:51 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d7c5937c20 
							
						 
					 
					
						
						
							
							process emoji charsequence instead of using EmojiTextView  
						
						
						
					 
					
						2017-11-22 21:17:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							03c34649b4 
							
						 
					 
					
						
						
							
							shorten >4 names to a, b, c +n more  
						
						
						
					 
					
						2017-11-22 17:57:28 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8696cf2235 
							
						 
					 
					
						
						
							
							PgpService: feed result intent back into decryption  
						
						
						
					 
					
						2017-11-22 13:36:10 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4596cad3cb 
							
						 
					 
					
						
						
							
							MessageParser: don't refresh view after parsing chat state when combined with message  
						
						
						
					 
					
						2017-11-21 16:17:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							381fe82b01 
							
						 
					 
					
						
						
							
							save full jid when sending in muc. check chat markers against 'sender'  
						
						
						
					 
					
						2017-11-21 15:42:46 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							79ea0713bb 
							
						 
					 
					
						
						
							
							MessageAdapter: code reformat  
						
						
						
					 
					
						2017-11-21 13:26:45 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							702d6cf2a5 
							
						 
					 
					
						
						
							
							MessageParser: dismiss notification when receiving read marker from another client  
						
						
						
					 
					
						2017-11-21 13:26:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							05b6fdb9f1 
							
						 
					 
					
						
						
							
							use empty wake lock tag  
						
						
						
					 
					
						2017-11-21 13:25:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							52e09d17e8 
							
						 
					 
					
						
						
							
							MessageAdapter: do not apply empty size spans  
						
						
						
					 
					
						2017-11-21 12:41:05 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9548a4f6af 
							
						 
					 
					
						
						
							
							ConversationAdapter: do not show file icon when file has been deleted  
						
						
						
					 
					
						2017-11-21 12:40:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							28e005f926 
							
						 
					 
					
						
						
							
							send and show read markers in private, non-anonymous groups  
						
						
						
					 
					
						2017-11-20 11:26:20 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1c65a17ff1 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2017-11-20 11:16:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1780a4257f 
							
						 
					 
					
						
						
							
							ConversationsAdapter: code cleanup  
						
						
						
					 
					
						2017-11-20 11:12:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							47adc9cdcf 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2017-11-18 11:26:22 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e452d5d46d 
							
						 
					 
					
						
						
							
							stop scrolling before changing conversations.  fixes   #2700  
						
						
						
					 
					
						2017-11-17 21:00:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5e15c48206 
							
						 
					 
					
						
						
							
							refactore phone helper to ignore security exception  
						
						
						
					 
					
						2017-11-17 10:28:51 +01:00 
						 
				 
			
				
					
						
							
							
								licaon-kter 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1cc8a446f0 
							
						 
					 
					
						
						
							
							Fix typo  
						
						
						
					 
					
						2017-11-16 17:02:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							013822fe82 
							
						 
					 
					
						
						
							
							excute db read and writes on different threads  
						
						
						
					 
					
						2017-11-16 15:53:03 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3dbe5db44b 
							
						 
					 
					
						
						
							
							Rename 'conference' to 'group chat'  
						
						
						
					 
					
						2017-11-16 13:30:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2d42646893 
							
						 
					 
					
						
						
							
							JingleConnection: fixed rare npe when canceling jingle  
						
						
						
					 
					
						2017-11-16 12:49:15 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c52492ada0 
							
						 
					 
					
						
						
							
							apperently some servers will ommit the from even for stanzas not going to them  
						
						
						
					 
					
						2017-11-16 12:48:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							75a485cbc1 
							
						 
					 
					
						
						
							
							catch all sorts of date parsing errors  
						
						
						
					 
					
						2017-11-16 12:47:49 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8e4440a49a 
							
						 
					 
					
						
						
							
							fixed ImStyleParser to not style '**test**'  
						
						
						
					 
					
						2017-11-14 17:57:22 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3efa1c46ab 
							
						 
					 
					
						
						
							
							remove numeric hint from captcha  
						
						
						
					 
					
						2017-11-14 09:14:03 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fced4a454e 
							
						 
					 
					
						
						
							
							ConversationsAdapter: Do not show attachment icon + text if attachment is audio or location  
						
						
						
					 
					
						2017-11-13 18:37:12 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8e4df80619 
							
						 
					 
					
						
						
							
							Merge branch 'patch-1' of  https://github.com/Kandr0s/Conversations  into Kandr0s-patch-1  
						
						
						
					 
					
						2017-11-13 14:51:56 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3faf951f47 
							
						 
					 
					
						
						
							
							disable swipe to left to dismiss conversation  
						
						
						
					 
					
						2017-11-13 14:51:45 +01:00 
						 
				 
			
				
					
						
							
							
								Kandr0s 
							
						 
					 
					
						
						
						
						
							
						
						
							308f451959 
							
						 
					 
					
						
						
							
							Show Drawable if Location/File/Voice  
						
						
						
					 
					
						2017-11-13 13:39:06 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7c55d78b0a 
							
						 
					 
					
						
						
							
							set attach icons in dark theme to 70% alpha  
						
						
						
					 
					
						2017-11-12 19:23:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bc9da1fbf4 
							
						 
					 
					
						
						
							
							remove prosody push from blacklist  
						
						
						
					 
					
						2017-11-12 19:22:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							49365511e4 
							
						 
					 
					
						
						
							
							trying to catch various dead system exception when scheduling new alarms and such  
						
						
						
					 
					
						2017-11-12 19:22:07 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7e93f4519a 
							
						 
					 
					
						
						
							
							catch all RuntimeExceptions when using MetadataRetriever  
						
						
						
					 
					
						2017-11-12 19:20:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a6d1559755 
							
						 
					 
					
						
						
							
							styler: ignore closing keyword when preceded by whitespace  
						
						
						
					 
					
						2017-11-10 20:19:22 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							513795fdf8 
							
						 
					 
					
						
						
							
							use view context instead activity to show toast in ConversationFragment  
						
						
						
					 
					
						2017-11-10 20:18:47 +01:00