Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c7a14092a8
							
						
					 | 
					
						
						
							
							fixed compile bug in free version
						
						
						
						
						
					 | 
					
						2016-02-13 00:03:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c430848ade
							
						
					 | 
					
						
						
							
							push gcm token on bind instead of every connect
						
						
						
						
						
					 | 
					
						2016-02-12 23:37:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							32da65f910
							
						
					 | 
					
						
						
							
							client side support for XEP-0357: Push Notifications
						
						
						
						
						
					 | 
					
						2016-02-12 11:39:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							1bb38e25f2
							
						
					 | 
					
						
						
							
							send muc messages after join
						
						
						
						
						
					 | 
					
						2016-02-10 09:53:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f16690ae1f
							
						
					 | 
					
						
						
							
							allow user to set MAM preferences
						
						
						
						
						
					 | 
					
						2016-02-09 13:01:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							28733e052f
							
						
					 | 
					
						
						
							
							fixed performance regression in on scroll listener
						
						
						
						
						
					 | 
					
						2016-02-04 16:29:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							4fdb0d92fe
							
						
					 | 
					
						
						
							
							prevent previoulsly cleared messages from reloading. fixes #1110
						
						
						
						
						
					 | 
					
						2016-02-04 14:39:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f88b8c703e
							
						
					 | 
					
						
						
							
							add more fault tolerant checks for messages left on server
						
						
						
						
						
					 | 
					
						2016-02-04 11:55:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							0911669b07
							
						
					 | 
					
						
						
							
							count all messages in a query
						
						
						
						
						
					 | 
					
						2016-02-03 16:04:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							1274b0ef39
							
						
					 | 
					
						
						
							
							Revert "get rid of broken totalMessageCount for mam queries"
						
						
						
						
						
						
						
						This reverts commit 58c6f9bfb2. 
						
					 | 
					
						2016-02-03 10:40:44 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f0798216d5
							
						
					 | 
					
						
						
							
							refactored disco cache. avoid making duplicate call. check hash
						
						
						
						
						
					 | 
					
						2016-02-03 10:40:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							4a1a59f0c8
							
						
					 | 
					
						
						
							
							Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into singpolyma-disco-caps
						
						
						
						
						
					 | 
					
						2016-02-02 18:19:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							58c6f9bfb2
							
						
					 | 
					
						
						
							
							get rid of broken totalMessageCount for mam queries
						
						
						
						
						
					 | 
					
						2016-02-02 15:39:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							ba9ba8ffe2
							
						
					 | 
					
						
						
							
							avoid npe when accessing the pgp connection service
						
						
						
						
						
					 | 
					
						2016-02-02 11:21:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e7647e385
							
						
					 | 
					
						
						
							
							opt out handling of the autojoin flag. fixes #1666
						
						
						
						
						
					 | 
					
						2016-02-01 13:54:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							7c0eae8059
							
						
					 | 
					
						
						
							
							expert setting to trigger extended connection options
						
						
						
						
						
					 | 
					
						2016-01-25 21:17:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stephen Paul Weber
							
						 
					 | 
					
						
						
						
						
							
						
						
							bf5b2f73f5
							
						
					 | 
					
						
						
							
							Use a Presence class for presence information
						
						
						
						
						
						
						
						Only has status for now, but doing it so I can add disco to it 
						
					 | 
					
						2016-01-24 17:46:08 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							7b1efe15cd
							
						
					 | 
					
						
						
							
							reuse same xmppconnection for reconnects
						
						
						
						
						
					 | 
					
						2016-01-16 19:21:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5743067ad
							
						
					 | 
					
						
						
							
							nimbuzz.com: don't wait for disco replies to set account to online
						
						
						
						
						
					 | 
					
						2016-01-15 14:26:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							12fd5c46ef
							
						
					 | 
					
						
						
							
							show /me messages in conference notifications without the name of the sender
						
						
						
						
						
					 | 
					
						2016-01-13 17:36:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							4ab8fe13de
							
						
					 | 
					
						
						
							
							let the user decide on whether or not to compress pictures
						
						
						
						
						
					 | 
					
						2016-01-09 16:17:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a3e136b550
							
						
					 | 
					
						
						
							
							show per conference notification settings in details activity
						
						
						
						
						
					 | 
					
						2016-01-08 21:30:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c3e2d2cfba
							
						
					 | 
					
						
						
							
							added missing synchronize when pushing messages from mam backlog
						
						
						
						
						
					 | 
					
						2016-01-04 20:14:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f815a7cd26
							
						
					 | 
					
						
						
							
							properly rotate avatars
						
						
						
						
						
					 | 
					
						2016-01-04 15:17:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c3bdec1ce9
							
						
					 | 
					
						
						
							
							dedublicate bookmarks
						
						
						
						
						
					 | 
					
						2015-12-27 17:29:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							43dd681239
							
						
					 | 
					
						
						
							
							timeout service discovery after 20s
						
						
						
						
						
					 | 
					
						2015-12-15 19:24:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6b22dad20
							
						
					 | 
					
						
						
							
							splite PARANOIA_MODE into three different options
						
						
						
						
						
					 | 
					
						2015-12-14 10:54:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							50817956c2
							
						
					 | 
					
						
						
							
							changed order of send presence and execute mam queries
						
						
						
						
						
					 | 
					
						2015-12-12 16:01:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							5e4b55a0ff
							
						
					 | 
					
						
						
							
							notfiy after mam catchup only if message count > 0
						
						
						
						
						
					 | 
					
						2015-12-11 20:43:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a1ac4fd665
							
						
					 | 
					
						
						
							
							fix cancelation of http downloads and enable resume
						
						
						
						
						
					 | 
					
						2015-12-11 20:33:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							b2c278c91b
							
						
					 | 
					
						
						
							
							set bookmark name to room subject if no subject has been set before
						
						
						
						
						
					 | 
					
						2015-12-11 19:28:44 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							293e820a58
							
						
					 | 
					
						
						
							
							get rid of lastMessageTransmitted in favor of db query
						
						
						
						
						
					 | 
					
						2015-12-11 13:52:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							55c1129a65
							
						
					 | 
					
						
						
							
							notify on mam catchup messages
						
						
						
						
						
					 | 
					
						2015-12-10 23:05:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							2262921ff4
							
						
					 | 
					
						
						
							
							properly clean up timed out mam queries
						
						
						
						
						
					 | 
					
						2015-12-10 18:28:47 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							11e58607c9
							
						
					 | 
					
						
						
							
							when no avatar found show avatar of contact and not the muc user in conferences
						
						
						
						
						
					 | 
					
						2015-12-09 10:30:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							aea664a0ec
							
						
					 | 
					
						
						
							
							show sender name for notications in conferences. fixes #1581
						
						
						
						
						
					 | 
					
						2015-12-09 10:26:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							739648e909
							
						
					 | 
					
						
						
							
							ask for contact permissions when first opening StartConversationActivity
						
						
						
						
						
					 | 
					
						2015-12-07 13:24:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c3e8fb3446
							
						
					 | 
					
						
						
							
							request storage permission when needed on Android 6.0
						
						
						
						
						
					 | 
					
						2015-12-07 13:24:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							739a2d609d
							
						
					 | 
					
						
						
							
							implement direct sharing in android 6.0. fixes #1321
						
						
						
						
						
					 | 
					
						2015-12-07 13:24:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd9a29718b
							
						
					 | 
					
						
						
							
							properly clear muc user avatar caches
						
						
						
						
						
					 | 
					
						2015-12-04 21:36:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9d1e8a34b2
							
						
					 | 
					
						
						
							
							fixed showing avatars for contacts in muc
						
						
						
						
						
					 | 
					
						2015-12-04 18:39:09 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							242887447c
							
						
					 | 
					
						
						
							
							use proposed nick as default nick in mucoptions
						
						
						
						
						
					 | 
					
						2015-12-04 14:07:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							6b592435cd
							
						
					 | 
					
						
						
							
							parse vcard avatars from muc presences
						
						
						
						
						
					 | 
					
						2015-12-03 18:18:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							0eaf7669f7
							
						
					 | 
					
						
						
							
							Merge pull request #1545 from SamWhited/show_new_contact_request_messages
						
						
						
						
						
						
						
						Show status message when contact requests presence 
						
					 | 
					
						2015-12-02 16:38:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sam Whited
							
						 
					 | 
					
						
						
						
						
							
						
						
							a3eb540f05
							
						
					 | 
					
						
						
							
							Show status message when contact requests presence
						
						
						
						
						
						
						
						Remove presence when conversation closed 
						
					 | 
					
						2015-12-02 08:50:52 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							8455e5b5dd
							
						
					 | 
					
						
						
							
							hide message content in notifications in paranoia mode
						
						
						
						
						
					 | 
					
						2015-12-02 12:54:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							dc8967d8fc
							
						
					 | 
					
						
						
							
							introduced build-time paranoia mode that disables unencrypted chats and forces TOR
						
						
						
						
						
					 | 
					
						2015-12-01 22:41:58 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							65b5504e68
							
						
					 | 
					
						
						
							
							introduce config.java variable to optionally show number of connected accounts in notification
						
						
						
						
						
					 | 
					
						2015-12-01 17:15:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f0b1761ec3
							
						
					 | 
					
						
						
							
							initial tor support
						
						
						
						
						
					 | 
					
						2015-12-01 12:00:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							60211a315e
							
						
					 | 
					
						
						
							
							hide subject edit button if not editable by user
						
						
						
						
						
					 | 
					
						2015-11-26 17:44:29 +01:00 | 
					
					
						
						
							
							
							
						
					 |