Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								df992d2566 
								
							 
						 
						
							
							
								
								don't reset whisper on reInit.  fixes   #1637  
							
							 
							
							
							
						 
						
							2016-02-19 20:54:43 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ad60bc002c 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2016-02-19 11:14:16 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								49a3f6f281 
								
							 
						 
						
							
							
								
								never parse show in presences as offline  
							
							 
							
							
							
						 
						
							2016-02-19 11:09:28 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ac687d6bbd 
								
							 
						 
						
							
							
								
								don't log start reason  
							
							 
							
							
							
						 
						
							2016-02-17 16:52:57 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								59978e157c 
								
							 
						 
						
							
							
								
								only offer message correction for the very last message  
							
							 
							
							
							
						 
						
							2016-02-17 16:51:36 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								3626e4b3a0 
								
							 
						 
						
							
							
								
								fixed regression that caused messages in muc not being send  
							
							 
							
							
							
						 
						
							2016-02-17 16:50:48 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c2fbdbde83 
								
							 
						 
						
							
							
								
								log reason why otr message won't be parsed  
							
							 
							
							
							
						 
						
							2016-02-16 14:22:47 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								86b1865eec 
								
							 
						 
						
							
							
								
								fixed regression that caused ui to redraw a lot  
							
							 
							
							
							
						 
						
							2016-02-16 14:22:21 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								349dd8291d 
								
							 
						 
						
							
							
								
								made clear that archiving preferences are server side  
							
							 
							
							
							
						 
						
							2016-02-16 12:52:31 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a9b957e8a2 
								
							 
						 
						
							
							
								
								added setting to opt-out of message correction. renamed preferences and options to settings  
							
							 
							
							
							
						 
						
							2016-02-16 09:57:59 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								0ca4a33bfb 
								
							 
						 
						
							
							
								
								added some OTR logging  
							
							 
							
							
							
						 
						
							2016-02-16 09:15:41 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c0b3a3ff0c 
								
							 
						 
						
							
							
								
								basic support for XEP-0308: Last Message Correction.  fixes   #864  
							
							 
							
							
							
						 
						
							2016-02-15 23:15:04 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								335058b78b 
								
							 
						 
						
							
							
								
								removed unnecessary conditions when sending read marker  
							
							 
							
							
							
						 
						
							2016-02-15 23:09:42 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c4b1df1bf3 
								
							 
						 
						
							
							
								
								add missing type='submit' attribute to enable push form  
							
							 
							
							
							
						 
						
							2016-02-15 22:12:39 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c3f0503a91 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2016-02-15 12:35:35 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8ccb2005b3 
								
							 
						 
						
							
							
								
								only show load more messages button when mam is available  
							
							 
							
							... 
							
							
							
							also update ui after that button has been pressed. fixes  #1695  
							
						 
						
							2016-02-14 23:53:17 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								356199978e 
								
							 
						 
						
							
							
								
								fixed server info push not showing up when unavailable  
							
							 
							
							
							
						 
						
							2016-02-14 18:19:11 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								92a6e956fd 
								
							 
						 
						
							
							
								
								be more carefull when checking push availability  
							
							 
							
							
							
						 
						
							2016-02-14 15:36:37 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								300326fba3 
								
							 
						 
						
							
							
								
								deleted invalid gcm strings  
							
							 
							
							
							
						 
						
							2016-02-14 14:14:53 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								251f2479c2 
								
							 
						 
						
							
							
								
								optional mode to close tcp connection when going into background  
							
							 
							
							... 
							
							
							
							acts only when push is available. disable all non-push accounts to test properly 
							
						 
						
							2016-02-14 13:20:23 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								6f9f871928 
								
							 
						 
						
							
							
								
								send push enable to server. simplified logging  
							
							 
							
							
							
						 
						
							2016-02-13 14:20:07 +01:00  
						
					 
				
					
						
							
							
								 
								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
							
						 
						
							 
							
							
							
							
								
							
							
								93dad9b737 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2016-02-11 22:45:40 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f37098a54f 
								
							 
						 
						
							
							
								
								catch all axolotl parse exception at once.  fixes   #1692  
							
							 
							
							
							
						 
						
							2016-02-11 12:26:43 +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
							
						 
						
							 
							
							
							
							
								
							
							
								91ec4839ac 
								
							 
						 
						
							
							
								
								prepend instead off append mam messages to conversations when going in reverse  
							
							 
							
							
							
						 
						
							2016-02-04 16:40:18 +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
							
						 
						
							 
							
							
							
							
								
							
							
								17791a703e 
								
							 
						 
						
							
							
								
								removed unecessary logging when muc tiles update  
							
							 
							
							
							
						 
						
							2016-02-04 10:27:38 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7dd9545ea3 
								
							 
						 
						
							
							
								
								use TLSv1.2 as SSL context on supported plattforms  
							
							 
							
							
							
						 
						
							2016-02-03 18:17:16 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								1d572c61d0 
								
							 
						 
						
							
							
								
								cache server caps  
							
							 
							
							
							
						 
						
							2016-02-03 17:19:05 +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
							
						 
						
							 
							
							
							
							
								
							
							
								01bad12708 
								
							 
						 
						
							
							
								
								fixed 'unencrypted' not showing up for conferences when encryption is forced  
							
							 
							
							
							
						 
						
							2016-02-02 18:15:57 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								58c6f9bfb2 
								
							 
						 
						
							
							
								
								get rid of broken totalMessageCount for mam queries  
							
							 
							
							
							
						 
						
							2016-02-02 15:39:46 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								fab0a45955 
								
							 
						 
						
							
							
								
								re-read common name from certificates on startup  
							
							 
							
							
							
						 
						
							2016-02-02 13:43:20 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ba9ba8ffe2 
								
							 
						 
						
							
							
								
								avoid npe when accessing the pgp connection service  
							
							 
							
							
							
						 
						
							2016-02-02 11:21:29 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f30df7a535 
								
							 
						 
						
							
							
								
								catch a few NPE when parsing invalid pep nodes  
							
							 
							
							
							
						 
						
							2016-02-02 11:21:07 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								3978c04782 
								
							 
						 
						
							
							
								
								respect autojoin setting on newly created bookmarks as well  
							
							 
							
							
							
						 
						
							2016-02-01 14:22:52 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								1e7647e385 
								
							 
						 
						
							
							
								
								opt out handling of the autojoin flag.  fixes   #1666  
							
							 
							
							
							
						 
						
							2016-02-01 13:54:08 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								336daea875 
								
							 
						 
						
							
							
								
								made create context menu call in StartConversationsActivity more failsafe  
							
							 
							
							
							
						 
						
							2016-02-01 12:31:46 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a3e11415ec 
								
							 
						 
						
							
							
								
								refactored user handling in conferences. show try again button when conference has errors  
							
							 
							
							
							
						 
						
							2016-02-01 12:11:40 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								2eef37174e 
								
							 
						 
						
							
							
								
								fixed false set of subject in conference with empty body tag  
							
							 
							
							
							
						 
						
							2016-01-31 14:42:35 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								82870b27ed 
								
							 
						 
						
							
							
								
								prefer dns servers from networsk with the default route  
							
							 
							
							
							
						 
						
							2016-01-29 12:12:23 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c416948f8b 
								
							 
						 
						
							
							
								
								be more careful with resetting the stream id  
							
							 
							
							
							
						 
						
							2016-01-29 12:09:55 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								28ebf927fb 
								
							 
						 
						
							
							
								
								try to make in-valid-session detection work for pgp  
							
							 
							
							
							
						 
						
							2016-01-29 12:09:31 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d2c5a939ed 
								
							 
						 
						
							
							
								
								show values in formfieldwrappers and allow form to be set to read only  
							
							 
							
							
							
						 
						
							2016-01-26 17:23:24 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								edc6ce4ff2 
								
							 
						 
						
							
							
								
								hide jid row in list item list when jid is  null  
							
							 
							
							
							
						 
						
							2016-01-26 14:47:34 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7c0eae8059 
								
							 
						 
						
							
							
								
								expert setting to trigger extended connection options  
							
							 
							
							
							
						 
						
							2016-01-25 21:17:53 +01:00  
						
					 
				
					
						
							
							
								 
								Stephen Paul Weber
							
						 
						
							 
							
							
							
							
								
							
							
								ae84ff2f0c 
								
							 
						 
						
							
							
								
								Do disco for caps hashes we have never seen  
							
							 
							
							... 
							
							
							
							Then cache it 
							
						 
						
							2016-01-24 17:46:08 -05:00  
						
					 
				
					
						
							
							
								 
								Stephen Paul Weber
							
						 
						
							 
							
							
							
							
								
							
							
								000f59d614 
								
							 
						 
						
							
							
								
								Fetch cached caps result on new presence  
							
							 
							
							
							
						 
						
							2016-01-24 17:46:08 -05: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
							
						 
						
							 
							
							
							
							
								
							
							
								31fd425c9a 
								
							 
						 
						
							
							
								
								changed FileBackend API to allow files instead of messages to be copied and resized  
							
							 
							
							
							
						 
						
							2016-01-24 12:17:00 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8850a1fbe3 
								
							 
						 
						
							
							
								
								added FormWrapper and form field validation  
							
							 
							
							
							
						 
						
							2016-01-23 20:32:00 +01:00  
						
					 
				
					
						
							
							
								 
								Stephen Paul Weber
							
						 
						
							 
							
							
							
							
								
							
							
								ad36a4ba89 
								
							 
						 
						
							
							
								
								Persisitence and loading for ServiceDiscoveryResult  
							
							 
							
							
							
						 
						
							2016-01-23 10:53:56 -05:00  
						
					 
				
					
						
							
							
								 
								Stephen Paul Weber
							
						 
						
							 
							
							
							
							
								
							
							
								56f8fff935 
								
							 
						 
						
							
							
								
								Implement toJSON on ServiceDiscoveryResult  
							
							 
							
							
							
						 
						
							2016-01-23 10:52:45 -05:00  
						
					 
				
					
						
							
							
								 
								Stephen Paul Weber
							
						 
						
							 
							
							
							
							
								
							
							
								1e335d527b 
								
							 
						 
						
							
							
								
								Generate capHash from any discovery result  
							
							 
							
							
							
						 
						
							2016-01-23 10:52:44 -05:00  
						
					 
				
					
						
							
							
								 
								Stephen Paul Weber
							
						 
						
							 
							
							
							
							
								
							
							
								fccce229c6 
								
							 
						 
						
							
							
								
								Factor out a representation of XEP-0030 results  
							
							 
							
							... 
							
							
							
							And the parser from Element to this representation. 
							
						 
						
							2016-01-23 10:52:40 -05:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								0569a1e769 
								
							 
						 
						
							
							
								
								introduced boolean form field wrapper  
							
							 
							
							
							
						 
						
							2016-01-23 16:23:23 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								39fdf4a333 
								
							 
						 
						
							
							
								
								added support for field types jid-single and text-private  
							
							 
							
							
							
						 
						
							2016-01-23 12:44:08 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								6140861143 
								
							 
						 
						
							
							
								
								reset stanza queue when resetting xmppconnection  
							
							 
							
							
							
						 
						
							2016-01-23 11:40:32 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								43521891f0 
								
							 
						 
						
							
							
								
								show fetch errors in trust keys activity  
							
							 
							
							
							
						 
						
							2016-01-23 11:39:02 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ba98fe4f86 
								
							 
						 
						
							
							
								
								use extract account from intent method and final EXTRA_ACCOUNT variable  
							
							 
							
							
							
						 
						
							2016-01-22 20:46:24 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a6c5430cdd 
								
							 
						 
						
							
							
								
								added UI wrapper for (some) form fields  
							
							 
							
							
							
						 
						
							2016-01-22 20:22:47 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a47430c2f7 
								
							 
						 
						
							
							
								
								added convenience method to extract account from intent  
							
							 
							
							
							
						 
						
							2016-01-22 20:21:45 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								40005cec1b 
								
							 
						 
						
							
							
								
								added config variable to allow non-tls connections  
							
							 
							
							
							
						 
						
							2016-01-22 11:20:31 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								77c0fb0b2a 
								
							 
						 
						
							
							
								
								changed spacing in create dialogs and notify user when no accounts are activated  
							
							 
							
							
							
						 
						
							2016-01-22 11:14:56 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								3ff40a9733 
								
							 
						 
						
							
							
								
								increased padding in create contact/conference dialog  
							
							 
							
							
							
						 
						
							2016-01-21 18:10:19 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								eacc7ed1e6 
								
							 
						 
						
							
							
								
								add convenience to get an account object from a spinner  
							
							 
							
							
							
						 
						
							2016-01-21 17:57:24 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								20f6a4704c 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2016-01-20 17:18:53 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								e71acdef29 
								
							 
						 
						
							
							
								
								catch security exception when user prevents access to address book  
							
							 
							
							
							
						 
						
							2016-01-20 16:18:15 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								0619685e55 
								
							 
						 
						
							
							
								
								add intent!=null check in onActivityResultin PublishProfilePicture  
							
							 
							
							
							
						 
						
							2016-01-20 16:11:17 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ba143a2730 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:siacs/Conversations  
							
							 
							
							
							
						 
						
							2016-01-16 22:48:27 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								0b239243d9 
								
							 
						 
						
							
							
								
								Merge pull request  #1655  from adithyaphilip/pgp-fix  
							
							 
							
							... 
							
							
							
							Fixes having to choose PGP twice, upgrades openpgp-api to 10 
							
						 
						
							2016-01-16 21:35:38 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								3acaec7bcd 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2016-01-16 21:21:14 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a83365ee95 
								
							 
						 
						
							
							
								
								make ConversationsActivity more resistent against being restarted  
							
							 
							
							
							
						 
						
							2016-01-16 21:18:59 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7b1efe15cd 
								
							 
						 
						
							
							
								
								reuse same xmppconnection for reconnects  
							
							 
							
							
							
						 
						
							2016-01-16 19:21:11 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								41ae4af1b8 
								
							 
						 
						
							
							
								
								made constructor private in Account entity  
							
							 
							
							
							
						 
						
							2016-01-16 18:57:47 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ad5bcb7d43 
								
							 
						 
						
							
							
								
								removed some unused methods from db backend  
							
							 
							
							
							
						 
						
							2016-01-16 18:57:19 +01:00  
						
					 
				
					
						
							
							
								 
								Adithya Abraham Philip
							
						 
						
							 
							
							
							
							
								
							
							
								a9a3ef0f67 
								
							 
						 
						
							
							
								
								fixed PGP having to be selected twice  
							
							 
							
							
							
						 
						
							2016-01-16 04:26:01 +05:30  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								494a04ffb1 
								
							 
						 
						
							
							
								
								hide prepare image toasts when attaching multiple images  
							
							 
							
							
							
						 
						
							2016-01-15 23:47:55 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d85854b686 
								
							 
						 
						
							
							
								
								show toast when image cropper get oom  
							
							 
							
							
							
						 
						
							2016-01-15 23:47:16 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								943d0391d4 
								
							 
						 
						
							
							
								
								catch exception when reading message id from database  
							
							 
							
							
							
						 
						
							2016-01-15 23:46:52 +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
							
						 
						
							 
							
							
							
							
								
							
							
								635210d278 
								
							 
						 
						
							
							
								
								pulled translations for 1.9.0 release from transifex  
							
							 
							
							
							
						 
						
							2016-01-14 21:52:17 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								aa6955a0d6 
								
							 
						 
						
							
							
								
								fixed typo when reading battery_op setting  
							
							 
							
							
							
						 
						
							2016-01-14 20:38:16 +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
							
						 
						
							 
							
							
							
							
								
							
							
								14428da108 
								
							 
						 
						
							
							
								
								show key fetch error in activity when there are no keys to be used  
							
							 
							
							
							
						 
						
							2016-01-13 12:19:56 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								571eb2f7f9 
								
							 
						 
						
							
							
								
								check for file storage permission before selecting avatar  
							
							 
							
							
							
						 
						
							2016-01-13 12:05:59 +01:00  
						
					 
				
					
						
							
							
								 
								Dheeraj CVR
							
						 
						
							 
							
							
							
							
								
							
							
								ffb49c7217 
								
							 
						 
						
							
							
								
								use batch transactions when writing roster  
							
							 
							
							... 
							
							
							
							Fixes https://github.com/siacs/Conversations/issues/1648  
							
						 
						
							2016-01-13 11:56:35 +04:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								3e9fd0185a 
								
							 
						 
						
							
							
								
								throw security exception instead of going to next srv entry  
							
							 
							
							
							
						 
						
							2016-01-12 23:42:47 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								da298cfe59 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:siacs/Conversations  
							
							 
							
							
							
						 
						
							2016-01-12 23:41:35 +01:00  
						
					 
				
					
						
							
							
								 
								Sam Whited
							
						 
						
							 
							
							
							
							
								
							
							
								a6b729df43 
								
							 
						 
						
							
							
								
								s/TOR/Tor/g  
							
							 
							
							
							
						 
						
							2016-01-12 15:41:39 -06:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d122d224bb 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2016-01-12 16:43:38 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								893751a1d2 
								
							 
						 
						
							
							
								
								move some ssl socket modifiers into a seperate helper class  
							
							 
							
							
							
						 
						
							2016-01-12 16:33:15 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5f1e30288a 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/moparisthebest/Conversations  into moparisthebest-master  
							
							 
							
							
							
						 
						
							2016-01-12 15:35:50 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								921d567dcb 
								
							 
						 
						
							
							
								
								use match_parent as height in conversations overview  
							
							 
							
							
							
						 
						
							2016-01-12 15:35:23 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								da6076028f 
								
							 
						 
						
							
							
								
								Revert "Add additional warnings to OMEMO purge key function"  
							
							 
							
							... 
							
							
							
							This reverts commit 3bea5b25cd . 
							
						 
						
							2016-01-12 09:48:49 +01:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								3bea5b25cd 
								
							 
						 
						
							
							
								
								Add additional warnings to OMEMO purge key function  
							
							 
							
							... 
							
							
							
							People continue to press the "don't press this" button. Maybe adding
some warnings indicating that this button will not fix their problems
will help... 
							
						 
						
							2016-01-12 09:33:54 +01:00  
						
					 
				
					
						
							
							
								 
								moparisthebest
							
						 
						
							 
							
							
							
							
								
							
							
								217f6603c0 
								
							 
						 
						
							
							
								
								Implement XEP-0368: SRV records for XMPP over TLS  
							
							 
							
							
							
						 
						
							2016-01-11 17:25:16 -05:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								20ec9ff2c6 
								
							 
						 
						
							
							
								
								reworked that loop that iterates over various servers  
							
							 
							
							
							
						 
						
							2016-01-11 19:05:25 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a85bba0010 
								
							 
						 
						
							
							
								
								new art renders  
							
							 
							
							
							
						 
						
							2016-01-11 18:29:02 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7f1de73784 
								
							 
						 
						
							
							
								
								don't use the word phone in strings  
							
							 
							
							
							
						 
						
							2016-01-11 15:34:26 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								4d38ba906f 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2016-01-11 11:19:41 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c296d6f446 
								
							 
						 
						
							
							
								
								ask to be excluded from battery optimization  
							
							 
							
							
							
						 
						
							2016-01-11 11:17:45 +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
							
						 
						
							 
							
							
							
							
								
							
							
								708d7c5b98 
								
							 
						 
						
							
							
								
								automatically adjust image compression to keep files under 512MiB  
							
							 
							
							
							
						 
						
							2016-01-09 16:16:18 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								6acb80a83a 
								
							 
						 
						
							
							
								
								added Config.java variable to change the default notification behaviour to always  
							
							 
							
							
							
						 
						
							2016-01-08 22:07:23 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								9dce42ac7f 
								
							 
						 
						
							
							
								
								don't show snackbar when notifications are disabled or paused  
							
							 
							
							
							
						 
						
							2016-01-08 21:35:20 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a3e136b550 
								
							 
						 
						
							
							
								
								show per conference notification settings in details activity  
							
							 
							
							
							
						 
						
							2016-01-08 21:30:46 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								0bb3ae37f0 
								
							 
						 
						
							
							
								
								show icon in conversations overview when notifications are disabled  
							
							 
							
							
							
						 
						
							2016-01-08 14:41:55 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5dd5685885 
								
							 
						 
						
							
							
								
								Merge pull request  #1641  from fiaxh/uuid-fix  
							
							 
							
							... 
							
							
							
							Correct uuid check according to RFC 4122 
							
						 
						
							2016-01-08 00:17:21 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c59eb75a59 
								
							 
						 
						
							
							
								
								avoid duplicate messages when sending files to mucs.  fixes   #1635  
							
							 
							
							
							
						 
						
							2016-01-06 12:59:13 +01:00  
						
					 
				
					
						
							
							
								 
								fiaxh
							
						 
						
							 
							
							
							
							
								
							
							
								62d0eebe5c 
								
							 
						 
						
							
							
								
								Correct uuid check according to RFC 4122  
							
							 
							
							
							
						 
						
							2016-01-05 20:07:29 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c3e2d2cfba 
								
							 
						 
						
							
							
								
								added missing synchronize when pushing messages from mam backlog  
							
							 
							
							
							
						 
						
							2016-01-04 20:14:29 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								fb97f9d18f 
								
							 
						 
						
							
							
								
								null check in getOriginalPath  
							
							 
							
							
							
						 
						
							2016-01-04 20:14:08 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								501034fe0e 
								
							 
						 
						
							
							
								
								Allow entering a JID from 'choose contact'. thanks @singpolyma  
							
							 
							
							... 
							
							
							
							fixes  #1611 
fixes  #1602  
							
						 
						
							2016-01-04 17:27:54 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								fdb6b0e30d 
								
							 
						 
						
							
							
								
								only report error after third unsuccesful attempt to connect  
							
							 
							
							
							
						 
						
							2016-01-04 15:33:11 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f815a7cd26 
								
							 
						 
						
							
							
								
								properly rotate avatars  
							
							 
							
							
							
						 
						
							2016-01-04 15:17:02 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								95bf0630f0 
								
							 
						 
						
							
							
								
								show trust keys activties if own keys are undecided  
							
							 
							
							
							
						 
						
							2016-01-04 12:11:58 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c116f735dc 
								
							 
						 
						
							
							
								
								add obb url to unencrypted messages  
							
							 
							
							
							
						 
						
							2016-01-03 19:39:06 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a319446d41 
								
							 
						 
						
							
							
								
								edit account activity was still showing the omemo key with leading 0x05.  fixes   #1631  
							
							 
							
							
							
						 
						
							2016-01-03 19:38:48 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d875061407 
								
							 
						 
						
							
							
								
								removed xhtml body.  fixes   #1594  
							
							 
							
							
							
						 
						
							2016-01-01 16:52:32 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								73e2389eee 
								
							 
						 
						
							
							
								
								use actual message timestamp instead of delay when updating last seen.  fixes   #1618  
							
							 
							
							
							
						 
						
							2015-12-31 18:06:11 +01:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								58d213f291 
								
							 
						 
						
							
							
								
								Fix OMEMO session creating loggin  
							
							 
							
							... 
							
							
							
							Now prints the correct JID to the log when finding devices without
sessions. 
							
						 
						
							2015-12-31 15:48:43 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								cfccf5e90d 
								
							 
						 
						
							
							
								
								handle null names in getColorForName  
							
							 
							
							
							
						 
						
							2015-12-29 10:32:54 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7bb67ee660 
								
							 
						 
						
							
							
								
								strip leading 0x05 off omemo fingerprints  
							
							 
							
							
							
						 
						
							2015-12-27 18:37:31 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								703d95fcf8 
								
							 
						 
						
							
							
								
								lower case all fingerprints.  fixes   #1521  
							
							 
							
							
							
						 
						
							2015-12-27 18:37:12 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c3bdec1ce9 
								
							 
						 
						
							
							
								
								dedublicate bookmarks  
							
							 
							
							
							
						 
						
							2015-12-27 17:29:32 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								bcf99db3df 
								
							 
						 
						
							
							
								
								fixed stuck at omemo encryption when x509 verification is being used  
							
							 
							
							
							
						 
						
							2015-12-27 17:29:19 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f49158a44b 
								
							 
						 
						
							
							
								
								register context menu long click listener on message text.  fixes   #1614  
							
							 
							
							
							
						 
						
							2015-12-27 17:28:42 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								be91c0741f 
								
							 
						 
						
							
							
								
								made text selectable again unless text contains more than 1 link  
							
							 
							
							... 
							
							
							
							fixes  #1615  
							
						 
						
							2015-12-26 19:18:37 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c40372fc0d 
								
							 
						 
						
							
							
								
								code cleanup  
							
							 
							
							
							
						 
						
							2015-12-23 22:30:14 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f46cbb38a9 
								
							 
						 
						
							
							
								
								show certificate information  
							
							 
							
							
							
						 
						
							2015-12-23 19:18:53 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d0bad09f13 
								
							 
						 
						
							
							
								
								save certificate when verifying with x509  
							
							 
							
							
							
						 
						
							2015-12-23 17:41:26 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ae491764f2 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2015-12-20 19:37:27 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								534013fd0c 
								
							 
						 
						
							
							
								
								store identity key in XmppAxolotlSession instead of the fingerprint  
							
							 
							
							
							
						 
						
							2015-12-19 15:44:11 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ade89beb96 
								
							 
						 
						
							
							
								
								use presence name not server name when verification is being used  
							
							 
							
							
							
						 
						
							2015-12-19 13:07:38 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								15c8cb8ac6 
								
							 
						 
						
							
							
								
								add more debugging to certificate checks after new omemo session was established  
							
							 
							
							
							
						 
						
							2015-12-19 12:44:55 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								e8bf5cada4 
								
							 
						 
						
							
							
								
								only offer plain and omemo encryption when x509 verification is enabled  
							
							 
							
							
							
						 
						
							2015-12-19 12:44:12 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f05f97251c 
								
							 
						 
						
							
							
								
								prefer server name over address book name when x509 verification is being used  
							
							 
							
							
							
						 
						
							2015-12-19 12:43:09 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								20b4e756fe 
								
							 
						 
						
							
							
								
								add 'store' message hint to displayed chat markers  
							
							 
							
							
							
						 
						
							2015-12-17 15:32:03 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f510b2ba2d 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2015-12-17 15:20:28 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								0f9058ffef 
								
							 
						 
						
							
							
								
								throw exception at the end of the stream  
							
							 
							
							
							
						 
						
							2015-12-17 15:20:06 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								e10a0b0c4c 
								
							 
						 
						
							
							
								
								let message parser not artifically fail on messages with no to attribute  
							
							 
							
							
							
						 
						
							2015-12-17 14:30:00 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								43dd681239 
								
							 
						 
						
							
							
								
								timeout service discovery after 20s  
							
							 
							
							
							
						 
						
							2015-12-15 19:24:05 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								85f36e9dbc 
								
							 
						 
						
							
							
								
								default force encryption to false  
							
							 
							
							
							
						 
						
							2015-12-14 10:58:55 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f6b22dad20 
								
							 
						 
						
							
							
								
								splite PARANOIA_MODE into three different options  
							
							 
							
							
							
						 
						
							2015-12-14 10:54:55 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								042939e44d 
								
							 
						 
						
							
							
								
								make message text non-selectable.  fixes   #1606  
							
							 
							
							
							
						 
						
							2015-12-14 10:44:43 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								aa472a0098 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2015-12-13 11:09:42 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								50817956c2 
								
							 
						 
						
							
							
								
								changed order of send presence and execute mam queries  
							
							 
							
							
							
						 
						
							2015-12-12 16:01:33 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								88523bbb50 
								
							 
						 
						
							
							
								
								more detailed logging  
							
							 
							
							
							
						 
						
							2015-12-12 15:58:22 +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
							
						 
						
							 
							
							
							
							
								
							
							
								61b0681109 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2015-12-11 13:27:33 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5ffb87059c 
								
							 
						 
						
							
							
								
								renamed pretty-please-store message hint to store  
							
							 
							
							
							
						 
						
							2015-12-10 23:37:38 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								15f220747f 
								
							 
						 
						
							
							
								
								some more NPE checks  
							
							 
							
							
							
						 
						
							2015-12-10 23:16:39 +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
							
						 
						
							 
							
							
							
							
								
							
							
								ede92235d7 
								
							 
						 
						
							
							
								
								disable sm logging  
							
							 
							
							
							
						 
						
							2015-12-10 18:26:31 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5bd70cfee8 
								
							 
						 
						
							
							
								
								always show conversations with pending subscription requests  
							
							 
							
							
							
						 
						
							2015-12-09 12:18:06 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5e151c7311 
								
							 
						 
						
							
							
								
								wait with status change to online after all disco queries have been made  
							
							 
							
							
							
						 
						
							2015-12-09 11:16:03 +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
							
						 
						
							 
							
							
							
							
								
							
							
								1de74c2337 
								
							 
						 
						
							
							
								
								also verify sessions in CBE mode that got created by key transport messages  
							
							 
							
							
							
						 
						
							2015-12-08 17:15:08 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b9fc7ebe24 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2015-12-07 13:54:59 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ac06cb2e4f 
								
							 
						 
						
							
							
								
								modified contact permission dialog  
							
							 
							
							
							
						 
						
							2015-12-07 13:24:41 +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
							
						 
						
							 
							
							
							
							
								
							
							
								904edf5d59 
								
							 
						 
						
							
							
								
								hide prepare file toast after preparing the file  
							
							 
							
							
							
						 
						
							2015-12-06 11:57:11 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								bd765c59ce 
								
							 
						 
						
							
							
								
								check availabiltiy of pgp before sharing files  
							
							 
							
							
							
						 
						
							2015-12-05 19:03:17 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b7f326372d 
								
							 
						 
						
							
							
								
								be more carefull with pending uris  
							
							 
							
							
							
						 
						
							2015-12-05 19:02:57 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								6358f641e7 
								
							 
						 
						
							
							
								
								check for query object as condition to trigger deduplication instead of serverId  
							
							 
							
							
							
						 
						
							2015-12-05 18:41:38 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								41dcd8005b 
								
							 
						 
						
							
							
								
								parse stanza-id from messages  
							
							 
							
							
							
						 
						
							2015-12-04 22:03:46 +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
							
						 
						
							 
							
							
							
							
								
							
							
								196c8e593f 
								
							 
						 
						
							
							
								
								Merge pull request  #1595  from fiaxh/pgp_database_signature  
							
							 
							
							... 
							
							
							
							Regenerate PGP signatures once 
							
						 
						
							2015-12-04 15:35:51 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								0664d6ac7b 
								
							 
						 
						
							
							
								
								avoid some NPEs  
							
							 
							
							
							
						 
						
							2015-12-04 15:35:22 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								3e3cb047be 
								
							 
						 
						
							
							
								
								rely on message id if message id is uuid and pgp encryption was used to deduplicate messages.  fixes   #1357  
							
							 
							
							
							
						 
						
							2015-12-04 15:34:45 +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
							
						 
						
							 
							
							
							
							
								
							
							
								f1c0b7372f 
								
							 
						 
						
							
							
								
								enabled previously disabled http upload  
							
							 
							
							
							
						 
						
							2015-12-03 12:45:12 +01:00  
						
					 
				
					
						
							
							
								 
								fiaxh
							
						 
						
							 
							
							
							
							
								
							
							
								e5f154316c 
								
							 
						 
						
							
							
								
								Unset all PGP signatures once  
							
							 
							
							... 
							
							
							
							... so they will be redone to match the changed status. 
							
						 
						
							2015-12-02 18:06:48 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b60c902810 
								
							 
						 
						
							
							
								
								pulled new translations from transifex  
							
							 
							
							
							
						 
						
							2015-12-02 17:27:56 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								3553b15c9f 
								
							 
						 
						
							
							
								
								renamed x509 verified omemo to v\OMEMO  
							
							 
							
							
							
						 
						
							2015-12-02 17:24:56 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								aa21797f43 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:siacs/Conversations  
							
							 
							
							
							
						 
						
							2015-12-02 16:38:33 +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
							
						 
						
							 
							
							
							
							
								
							
							
								025cbf7d44 
								
							 
						 
						
							
							
								
								show tor config in paranoid mode  
							
							 
							
							
							
						 
						
							2015-12-02 15:34:09 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								02c6793ca9 
								
							 
						 
						
							
							
								
								fixed avatar loading for non-file uris  
							
							 
							
							
							
						 
						
							2015-12-02 15:30:03 +01:00  
						
					 
				
					
						
							
							
								 
								Philip Flohr
							
						 
						
							 
							
							
							
							
								
							
							
								0329c9c738 
								
							 
						 
						
							
							
								
								users are now able to crop their avatar pictures using the android-crop  
							
							 
							
							... 
							
							
							
							library 
							
						 
						
							2015-12-02 14:25:20 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8455e5b5dd 
								
							 
						 
						
							
							
								
								hide message content in notifications in paranoia mode  
							
							 
							
							
							
						 
						
							2015-12-02 12:54:55 +01:00  
						
					 
				
					
						
							
							
								 
								Sam Whited
							
						 
						
							 
							
							
							
							
								
							
							
								e1aeb376ac 
								
							 
						 
						
							
							
								
								s/.../…/ in default strings  
							
							 
							
							
							
						 
						
							2015-12-01 21:59:44 -06: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
							
						 
						
							 
							
							
							
							
								
							
							
								2cd43f7042 
								
							 
						 
						
							
							
								
								fixed crashes when activity got destroyed when selecting pgp key  
							
							 
							
							
							
						 
						
							2015-12-01 14:18:07 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d42c82abf2 
								
							 
						 
						
							
							
								
								combine multiple message receipts into single message  
							
							 
							
							
							
						 
						
							2015-12-01 12:22:47 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								2225b0b6d5 
								
							 
						 
						
							
							
								
								add error state for unavailable tor network  
							
							 
							
							
							
						 
						
							2015-12-01 12:00:50 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b4a259837e 
								
							 
						 
						
							
							
								
								always use http proxy for http requests. (socks is leaking dns)  
							
							 
							
							
							
						 
						
							2015-12-01 12:00:50 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8ffcc11f27 
								
							 
						 
						
							
							
								
								refactored socks5 connection code. make jingle transport use that new code  
							
							 
							
							
							
						 
						
							2015-12-01 12:00:50 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ebccb67a72 
								
							 
						 
						
							
							
								
								do socks5 connect manually  
							
							 
							
							
							
						 
						
							2015-12-01 12:00:50 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f0b1761ec3 
								
							 
						 
						
							
							
								
								initial tor support  
							
							 
							
							
							
						 
						
							2015-12-01 12:00:50 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								06cadab7cc 
								
							 
						 
						
							
							
								
								changed method signature of calcSampleSize  
							
							 
							
							
							
						 
						
							2015-11-30 16:03:04 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								60211a315e 
								
							 
						 
						
							
							
								
								hide subject edit button if not editable by user  
							
							 
							
							
							
						 
						
							2015-11-26 17:44:29 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								23ef1c660a 
								
							 
						 
						
							
							
								
								encrypt pgp messages to self  
							
							 
							
							
							
						 
						
							2015-11-26 17:44:11 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								fd6ed5b989 
								
							 
						 
						
							
							
								
								detect server identity and added muc-workaround for slack  
							
							 
							
							
							
						 
						
							2015-11-26 06:55:57 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								84120a341a 
								
							 
						 
						
							
							
								
								removed unnecessary configuration fetch after join  
							
							 
							
							
							
						 
						
							2015-11-26 06:53:24 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								210de7d781 
								
							 
						 
						
							
							
								
								removed unecessary chat state  
							
							 
							
							
							
						 
						
							2015-11-26 06:53:02 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ecb4615f2a 
								
							 
						 
						
							
							
								
								fail jingle file transfer if axolotl key message could not be created.  fixes   #1576  
							
							 
							
							
							
						 
						
							2015-11-26 06:52:46 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a557d38e4d 
								
							 
						 
						
							
							
								
								pgp fixes and revert configuration changes  
							
							 
							
							
							
						 
						
							2015-11-25 20:47:02 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8228e82f51 
								
							 
						 
						
							
							
								
								Merge pull request  #1569  from fiaxh/conference_one_other_occupant  
							
							 
							
							... 
							
							
							
							Show own avatar in tile for conferences with only one other occupant next to theirs 
							
						 
						
							2015-11-24 07:09:12 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								fbb7cb99f7 
								
							 
						 
						
							
							
								
								Merge pull request  #1558  from fiaxh/pgp_api_9.0  
							
							 
							
							... 
							
							
							
							Use OpenPGP-API 9.0 
							
						 
						
							2015-11-24 06:52:24 +01:00  
						
					 
				
					
						
							
							
								 
								fiaxh
							
						 
						
							 
							
							
							
							
								
							
							
								2c1f7e115c 
								
							 
						 
						
							
							
								
								PgpEngine: Get account from conversation instead of from contact.  fixes   #1568 ,  fixes   #1544  
							
							 
							
							
							
						 
						
							2015-11-15 13:24:07 +00:00  
						
					 
				
					
						
							
							
								 
								fiaxh
							
						 
						
							 
							
							
							
							
								
							
							
								724ca8c9a9 
								
							 
						 
						
							
							
								
								Own contact picture in tile for conferences with only one other occupant  
							
							 
							
							
							
						 
						
							2015-11-15 10:34:10 +00:00  
						
					 
				
					
						
							
							
								 
								fiaxh
							
						 
						
							 
							
							
							
							
								
							
							
								c7a519498a 
								
							 
						 
						
							
							
								
								Sign empty status  
							
							 
							
							
							
						 
						
							2015-11-09 13:50:02 +00:00  
						
					 
				
					
						
							
							
								 
								fiaxh
							
						 
						
							 
							
							
							
							
								
							
							
								fac1d4e0bd 
								
							 
						 
						
							
							
								
								Use OpenPGP-API 9.0  
							
							 
							
							
							
						 
						
							2015-11-09 13:49:57 +00:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								c6e54e7e5a 
								
							 
						 
						
							
							
								
								Move migration 19 before 17  
							
							 
							
							... 
							
							
							
							Migration 17 depends on Account deserialization, so any migrations that
touch the accounts table need to be applied beforehand.
Re-writing the migration to work directly on the database would lead to
a lot of code duplication, so it's not worth it at this time, but might
become necessary later on to avoid dependency cycles. 
							
						 
						
							2015-11-06 14:50:55 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								fb9ba0a734 
								
							 
						 
						
							
							
								
								don't close socket on disconnect  
							
							 
							
							
							
						 
						
							2015-11-01 07:45:00 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								baf76d883c 
								
							 
						 
						
							
							
								
								indicate cbe in chat message hint  
							
							 
							
							
							
						 
						
							2015-10-31 22:55:04 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								bca29cf7fd 
								
							 
						 
						
							
							
								
								explicitly mark verified omemo keys in UI  
							
							 
							
							
							
						 
						
							2015-10-31 10:57:57 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								34bcc59f72 
								
							 
						 
						
							
							
								
								fixed session objects not being build on start up  
							
							 
							
							
							
						 
						
							2015-10-30 12:05:21 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								6a458b853c 
								
							 
						 
						
							
							
								
								Merge pull request  #1513  from fiaxh/pgp_background_decryption  
							
							 
							
							... 
							
							
							
							PGP messages background decryption 
							
						 
						
							2015-10-30 10:18:27 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8553d5a563 
								
							 
						 
						
							
							
								
								moved db calls made from UI into serial background thread  
							
							 
							
							
							
						 
						
							2015-10-29 17:20:01 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ef7857ac8d 
								
							 
						 
						
							
							
								
								avoid npe when checking for stream restart  
							
							 
							
							
							
						 
						
							2015-10-29 14:38:35 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c7ff196f58 
								
							 
						 
						
							
							
								
								push CN into nick pep node when uploading certificate. subscribe to nick node  
							
							 
							
							
							
						 
						
							2015-10-29 13:41:08 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7410e2023a 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:siacs/Conversations  
							
							 
							
							
							
						 
						
							2015-10-29 12:08:32 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								1221cff561 
								
							 
						 
						
							
							
								
								load avatars in message adapter in background task  
							
							 
							
							
							
						 
						
							2015-10-29 12:08:15 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a7fd629c05 
								
							 
						 
						
							
							
								
								show encryption type in warned/red messages  
							
							 
							
							
							
						 
						
							2015-10-28 22:40:09 +01:00  
						
					 
				
					
						
							
							
								 
								fiaxh
							
						 
						
							 
							
							
							
							
								
							
							
								016a57f123 
								
							 
						 
						
							
							
								
								Show PGP "please wait" message only when actually decrypting  
							
							 
							
							
							
						 
						
							2015-10-28 20:57:15 +00:00  
						
					 
				
					
						
							
							
								 
								fiaxh
							
						 
						
							 
							
							
							
							
								
							
							
								29a849cb92 
								
							 
						 
						
							
							
								
								Decrypt PGP messages in background  
							
							 
							
							
							
						 
						
							2015-10-28 19:57:11 +00:00  
						
					 
				
					
						
							
							
								 
								Sam Whited
							
						 
						
							 
							
							
							
							
								
							
							
								e747ecef4d 
								
							 
						 
						
							
							
								
								Don't synchronize on non-final field  
							
							 
							
							
							
						 
						
							2015-10-26 20:13:48 -05:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ec473a4437 
								
							 
						 
						
							
							
								
								Merge pull request  #1520  from saqura/self_handle_orientation  
							
							 
							
							... 
							
							
							
							Handle some orientation changes manually 
							
						 
						
							2015-10-26 09:30:08 +01:00  
						
					 
				
					
						
							
							
								 
								saqura
							
						 
						
							 
							
							
							
							
								
							
							
								48f172fc9e 
								
							 
						 
						
							
							
								
								Reset the margins manually after rotating  
							
							 
							
							
							
						 
						
							2015-10-26 00:59:32 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								56afdcc94a 
								
							 
						 
						
							
							
								
								invalidate menu after backend connection.  
							
							 
							
							... 
							
							
							
							fixes the menu not being shown after rotation in edit account details 
							
						 
						
							2015-10-25 22:46:06 +01:00  
						
					 
				
					
						
							
							
								 
								saqura
							
						 
						
							 
							
							
							
							
								
							
							
								1f2b2c8834 
								
							 
						 
						
							
							
								
								Handle some orientation changes manually  
							
							 
							
							... 
							
							
							
							Currently most activities get destroyed/recreated when rotating the
device. This commit prevents this from happening where it is not
necessary.
The most obvious improvements are:
 * The options menu in the EditAccountActivity does not disappear when
   rotating the device.
 * CSI inactive/active states are no longer sent on every rotate. 
							
						 
						
							2015-10-25 21:34:16 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								1bd68a42b2 
								
							 
						 
						
							
							
								
								join muc even if initial conference configuration fetch failed  
							
							 
							
							
							
						 
						
							2015-10-22 11:20:36 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								3c45f00443 
								
							 
						 
						
							
							
								
								fixed read conversations showing up as notifications after a restart  
							
							 
							
							
							
						 
						
							2015-10-21 17:41:44 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f4a33a007c 
								
							 
						 
						
							
							
								
								open unknown files with wildcard intent  
							
							 
							
							
							
						 
						
							2015-10-20 17:41:07 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								569b9f4e66 
								
							 
						 
						
							
							
								
								open manage account + certificate chooser when cbe mode is enabled  
							
							 
							
							
							
						 
						
							2015-10-20 15:27:33 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								53125dbccc 
								
							 
						 
						
							
							
								
								move chat state reset from background switch to foreground switch to account for chat states sent in the mean time  
							
							 
							
							
							
						 
						
							2015-10-19 23:22:29 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								9b07059b6e 
								
							 
						 
						
							
							
								
								update last seen in mucs.  fixes   #1508  
							
							 
							
							
							
						 
						
							2015-10-19 23:20:33 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								efab290c28 
								
							 
						 
						
							
							
								
								add nick to bookmark when entering full jid in join conference dialog  
							
							 
							
							
							
						 
						
							2015-10-19 23:20:00 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								adca670196 
								
							 
						 
						
							
							
								
								synchronize around the disco object  
							
							 
							
							
							
						 
						
							2015-10-19 23:03:19 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								be38b1e5f4 
								
							 
						 
						
							
							
								
								disconnet in background thread  
							
							 
							
							
							
						 
						
							2015-10-17 16:10:56 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								e956c7b2a2 
								
							 
						 
						
							
							
								
								only try EXTERNAL auth if client certificate is set for account  
							
							 
							
							
							
						 
						
							2015-10-17 16:10:31 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								3c6c424d31 
								
							 
						 
						
							
							
								
								don't retry building broken omemo keys  
							
							 
							
							
							
						 
						
							2015-10-17 15:51:21 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								0f405c2e11 
								
							 
						 
						
							
							
								
								allow redownloading files from remote hosts.  fixes   #1504  
							
							 
							
							
							
						 
						
							2015-10-17 15:23:46 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								e9e31b1c9b 
								
							 
						 
						
							
							
								
								load axolotl session cache on first device update  
							
							 
							
							
							
						 
						
							2015-10-17 14:44:59 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a83aae341f 
								
							 
						 
						
							
							
								
								improved error reporting in trust keys activity  
							
							 
							
							
							
						 
						
							2015-10-17 14:09:26 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								cfeb67d71d 
								
							 
						 
						
							
							
								
								introduced code to verify omemo device keys with x509 certificates.  
							
							 
							
							... 
							
							
							
							cleaned up TrustKeysActivity to automatically close if there is nothing to do 
							
						 
						
							2015-10-16 23:48:42 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								fb7359e6a3 
								
							 
						 
						
							
							
								
								block code when doing unforced disconnect  
							
							 
							
							
							
						 
						
							2015-10-16 09:58:31 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c1716a35e3 
								
							 
						 
						
							
							
								
								moved other name parsing into seperate method  
							
							 
							
							
							
						 
						
							2015-10-15 20:05:55 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								fc96dcaa4d 
								
							 
						 
						
							
							
								
								use constants for oids in xmppdomainverifier  
							
							 
							
							
							
						 
						
							2015-10-15 19:14:41 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5b271e1ed8 
								
							 
						 
						
							
							
								
								more checks for xmppdomainverifier and better wildcard handling  
							
							 
							
							
							
						 
						
							2015-10-15 18:06:26 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								e75c2cd731 
								
							 
						 
						
							
							
								
								use own XmppDomainVerifier instead of deprecated StrictHostnameVerifier.  fixes   #1189  
							
							 
							
							
							
						 
						
							2015-10-15 17:08:38 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								1738673c53 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2015-10-14 23:05:00 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								4b93351f8f 
								
							 
						 
						
							
							
								
								changed some source strings  
							
							 
							
							
							
						 
						
							2015-10-14 23:03:01 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								30dbf97a1c 
								
							 
						 
						
							
							
								
								clear bitmap cache before running out of memory  
							
							 
							
							
							
						 
						
							2015-10-14 22:55:59 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5f9476448f 
								
							 
						 
						
							
							
								
								make unread status and notifications presistent across restarts  
							
							 
							
							
							
						 
						
							2015-10-14 21:18:34 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								0587ba2ad2 
								
							 
						 
						
							
							
								
								work with muc services that change the message id  
							
							 
							
							
							
						 
						
							2015-10-14 11:15:18 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								beca748634 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2015-10-13 23:36:16 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								76828950ee 
								
							 
						 
						
							
							
								
								cleaned up some code. log last tag  
							
							 
							
							
							
						 
						
							2015-10-13 23:34:09 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f24649c819 
								
							 
						 
						
							
							
								
								set cursor to end of jid in edit account  
							
							 
							
							
							
						 
						
							2015-10-13 16:58:08 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								212d1a8c91 
								
							 
						 
						
							
							
								
								add config variable to enable x509 verification  
							
							 
							
							
							
						 
						
							2015-10-12 13:18:20 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								933538a39d 
								
							 
						 
						
							
							
								
								code clean up  
							
							 
							
							
							
						 
						
							2015-10-12 12:36:54 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b519411d34 
								
							 
						 
						
							
							
								
								enable SASL EXTERNAL (certificate login  
							
							 
							
							
							
						 
						
							2015-10-11 20:45:01 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7be331bbb2 
								
							 
						 
						
							
							
								
								add menu item in account details to renew certificate  
							
							 
							
							
							
						 
						
							2015-10-11 16:10:52 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								09816b61df 
								
							 
						 
						
							
							
								
								make add account from key visible  
							
							 
							
							
							
						 
						
							2015-10-11 16:10:52 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								fdd88aa530 
								
							 
						 
						
							
							
								
								Clean up  
							
							 
							
							... 
							
							
							
							Fixes some random linter warnings. 
							
						 
						
							2015-10-11 16:05:44 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								a7c7a42136 
								
							 
						 
						
							
							
								
								Improve InvalidJidException handling in Jid class  
							
							 
							
							... 
							
							
							
							This code should never be triggered anway, so with this 'fix', we should
at least get more meaningful stack traces. Plus, it makes the linter
happy by preventing NullPointerExceptions. 
							
						 
						
							2015-10-11 16:05:44 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								da31582911 
								
							 
						 
						
							
							
								
								Merge pull request  #1461  from akallabeth/captcha_support  
							
							 
							
							... 
							
							
							
							Implemented account registration with captcha 
							
						 
						
							2015-10-11 15:56:42 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								540f6510de 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:siacs/Conversations  
							
							 
							
							
							
						 
						
							2015-10-11 14:27:41 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								9e1393bc1c 
								
							 
						 
						
							
							
								
								prevent null pointer when trying to display device fingerprints of not existing sessions  
							
							 
							
							
							
						 
						
							2015-10-11 14:27:09 +02:00  
						
					 
				
					
						
							
							
								 
								Armin Novak
							
						 
						
							 
							
							
							
							
								
							
							
								6a6cb43b17 
								
							 
						 
						
							
							
								
								Captcha support.  
							
							 
							
							
							
						 
						
							2015-10-11 13:11:50 +02:00  
						
					 
				
					
						
							
							
								 
								Safwat Halaby
							
						 
						
							 
							
							
							
							
								
							
							
								08174e3b05 
								
							 
						 
						
							
							
								
								Fixed a typo in string.xml  
							
							 
							
							
							
						 
						
							2015-10-10 12:03:25 +03:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b23cb5a9e4 
								
							 
						 
						
							
							
								
								initial UI work to allow setting up accounts from certifcates  
							
							 
							
							
							
						 
						
							2015-10-09 13:37:08 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ef605e4cbd 
								
							 
						 
						
							
							
								
								do not dismiss editAccountActivity when still trying to register new account  
							
							 
							
							
							
						 
						
							2015-10-09 10:49:30 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								e65068d226 
								
							 
						 
						
							
							
								
								catch exception when unregistering receivers that have not been registered before  
							
							 
							
							
							
						 
						
							2015-10-08 00:52:04 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f81e44d339 
								
							 
						 
						
							
							
								
								removed oob element from file messages  
							
							 
							
							
							
						 
						
							2015-10-08 00:35:23 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								52a5e72b02 
								
							 
						 
						
							
							
								
								introduced expert options to set status to away and xa if screen is off or if phone is silenced  
							
							 
							
							
							
						 
						
							2015-10-08 00:35:04 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								043e19dd65 
								
							 
						 
						
							
							
								
								add xhtml image tag to unencrypted image urls. add oob tag to all files that are on remote hosts  
							
							 
							
							
							
						 
						
							2015-10-07 12:08:25 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8f066d00e0 
								
							 
						 
						
							
							
								
								do mam query after join  
							
							 
							
							
							
						 
						
							2015-10-06 16:58:56 +02:00  
						
					 
				
					
						
							
							
								 
								saqura
							
						 
						
							 
							
							
							
							
								
							
							
								fd61d67dab 
								
							 
						 
						
							
							
								
								Use MAM for MUC initial history retrieval  
							
							 
							
							... 
							
							
							
							If the MUC supports MAM (XEP-0313), use it to retrieve the history
when joining. 
							
						 
						
							2015-10-06 16:23:45 +02:00  
						
					 
				
					
						
							
							
								 
								saqura
							
						 
						
							 
							
							
							
							
								
							
							
								05d0c9f4fe 
								
							 
						 
						
							
							
								
								Properly check for MUC MAM support  
							
							 
							
							... 
							
							
							
							Only use MAM (XEP-0313) in MUCs if it is supported.
This should fix  #1264  
							
						 
						
							2015-10-06 16:23:18 +02:00  
						
					 
				
					
						
							
							
								 
								saqura
							
						 
						
							 
							
							
							
							
								
							
							
								403db3b080 
								
							 
						 
						
							
							
								
								Show whether MAM is supported in MUCs  
							
							 
							
							... 
							
							
							
							The conference details in "Advanced Mode" now indicate whether MAM is
supported by the conference server. 
							
						 
						
							2015-10-06 16:23:05 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								32abc76689 
								
							 
						 
						
							
							
								
								changed store path for files  
							
							 
							
							
							
						 
						
							2015-10-06 16:18:23 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								1d2a24c9c0 
								
							 
						 
						
							
							
								
								clean up log exporting service. properly end service after exporting  
							
							 
							
							
							
						 
						
							2015-10-06 14:13:07 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								e6af502055 
								
							 
						 
						
							
							
								
								clear notification and activate grace period when receiving chat marker from another instance  
							
							 
							
							
							
						 
						
							2015-10-06 11:44:27 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								89edd83609 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2015-10-05 16:45:33 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								160dfa49a0 
								
							 
						 
						
							
							
								
								try to catch plattform bugs  
							
							 
							
							
							
						 
						
							2015-10-02 11:58:03 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								4b62bd256d 
								
							 
						 
						
							
							
								
								properly recycle bitmaps  
							
							 
							
							
							
						 
						
							2015-10-02 11:39:30 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								2b9b700c96 
								
							 
						 
						
							
							
								
								don't put conference joins into pending on initial bind  
							
							 
							
							
							
						 
						
							2015-10-01 16:01:19 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								6a0b9971aa 
								
							 
						 
						
							
							
								
								reset muc options immediately befor join  
							
							 
							
							
							
						 
						
							2015-10-01 13:03:15 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								9dcf074a79 
								
							 
						 
						
							
							
								
								request stanza count after every ibb data stanza to not fill our own stanza queue  
							
							 
							
							
							
						 
						
							2015-09-30 23:42:02 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								648e29db2c 
								
							 
						 
						
							
							
								
								only invoke MTM in interactive mode after direct user input  
							
							 
							
							... 
							
							
							
							fixes  #1027 
fixes  #792 
fixes  #1439  
							
						 
						
							2015-09-29 19:24:52 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								64dbb069ab 
								
							 
						 
						
							
							
								
								rotate thumbnails.  fixes   #1438  
							
							 
							
							
							
						 
						
							2015-09-29 12:25:32 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5fb77a9739 
								
							 
						 
						
							
							
								
								fixed NPE when executing rename callback in muc  
							
							 
							
							
							
						 
						
							2015-09-28 15:36:55 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8881b71079 
								
							 
						 
						
							
							
								
								do tab completion only if neither ctrl nor alt are being pressed  
							
							 
							
							
							
						 
						
							2015-09-28 14:36:10 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f4d6b676e9 
								
							 
						 
						
							
							
								
								catch rare activity not found exception when opening downloaded files  
							
							 
							
							
							
						 
						
							2015-09-27 21:27:07 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								bbbc30e823 
								
							 
						 
						
							
							
								
								allow tab completion in conferences  
							
							 
							
							
							
						 
						
							2015-09-27 19:17:44 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5a5e0e7121 
								
							 
						 
						
							
							
								
								use Conversations 1.x.y as user agent string in http upload and download  
							
							 
							
							
							
						 
						
							2015-09-23 18:05:51 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8d90b3fbf1 
								
							 
						 
						
							
							
								
								swapped icons for foreground services  
							
							 
							
							
							
						 
						
							2015-09-22 08:50:54 +02:00  
						
					 
				
					
						
							
							
								 
								fiaxh
							
						 
						
							 
							
							
							
							
								
							
							
								a3a13dd9dc 
								
							 
						 
						
							
							
								
								Export logs to SD card preference  
							
							 
							
							
							
						 
						
							2015-09-21 18:53:29 +01:00  
						
					 
				
					
						
							
							
								 
								fiaxh
							
						 
						
							 
							
							
							
							
								
							
							
								024e697cee 
								
							 
						 
						
							
							
								
								Iterator to go through all messages of a conversation  
							
							 
							
							
							
						 
						
							2015-09-20 22:17:32 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a954e32b16 
								
							 
						 
						
							
							
								
								let DnsHelper provide a fallback solution  
							
							 
							
							
							
						 
						
							2015-09-19 17:31:24 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								069ddddbc1 
								
							 
						 
						
							
							
								
								fixed content-type indication in http upload  
							
							 
							
							
							
						 
						
							2015-09-19 17:29:33 +02:00  
						
					 
				
					
						
							
							
								 
								Michael
							
						 
						
							 
							
							
							
							
								
							
							
								8f69017d5a 
								
							 
						 
						
							
							
								
								remove the from attribute from sendStartStream()  fixes   #1419  
							
							 
							
							
							
						 
						
							2015-09-19 15:58:33 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b54b4ca78a 
								
							 
						 
						
							
							
								
								introduced Config variable to use legacy namespace for http upload  
							
							 
							
							
							
						 
						
							2015-09-17 14:42:50 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								506b83ddc6 
								
							 
						 
						
							
							
								
								be more careful when publishing device bundle  
							
							 
							
							
							
						 
						
							2015-09-17 14:18:06 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c173d78950 
								
							 
						 
						
							
							
								
								ignore spoofed stanzas in facebook chat  
							
							 
							
							
							
						 
						
							2015-09-17 14:13:38 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								07c7f5bc08 
								
							 
						 
						
							
							
								
								catch IndexOutOfBoundsException when swiping away conversations  
							
							 
							
							
							
						 
						
							2015-09-17 14:02:28 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7e712d9d4c 
								
							 
						 
						
							
							
								
								fixed rare NPE in DnsHelper. fixed spelling and added logging  
							
							 
							
							
							
						 
						
							2015-09-17 13:55:27 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b1b13ba0e5 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2015-09-15 22:56:02 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								4a4ced1e69 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:siacs/Conversations  
							
							 
							
							
							
						 
						
							2015-09-15 22:53:06 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b9002d7fd5 
								
							 
						 
						
							
							
								
								added missing type='submit' to mam queries  
							
							 
							
							... 
							
							
							
							fixed some nasty inheritance problems along the way
fixes  #1411  
							
						 
						
							2015-09-15 22:52:39 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b5719fd747 
								
							 
						 
						
							
							
								
								work around a NPE caused by arace condition in the http upload  
							
							 
							
							
							
						 
						
							2015-09-15 22:49:43 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								183dad281c 
								
							 
						 
						
							
							
								
								Merge pull request  #1409  from sespivak/master  
							
							 
							
							... 
							
							
							
							some string localization for russian language 
							
						 
						
							2015-09-14 17:06:27 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								999d65c187 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2015-09-14 16:53:39 +02:00  
						
					 
				
					
						
							
							
								 
								Sergey Spivak
							
						 
						
							 
							
							
							
							
								
							
							
								7e06065df2 
								
							 
						 
						
							
							
								
								some string localization for russian language  
							
							 
							
							
							
						 
						
							2015-09-14 18:36:58 +04:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8d13a77bc6 
								
							 
						 
						
							
							
								
								changed http upload namespace to reflect the one in the XEP  
							
							 
							
							
							
						 
						
							2015-09-14 13:22:10 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								96575d6290 
								
							 
						 
						
							
							
								
								added possibiltiy to set conferences as moderated (only visible in advanced mode)  
							
							 
							
							
							
						 
						
							2015-09-13 17:13:46 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								add4302385 
								
							 
						 
						
							
							
								
								pulled new translations from transifex  
							
							 
							
							
							
						 
						
							2015-09-13 11:07:22 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								4220fa948b 
								
							 
						 
						
							
							
								
								added mp4 to well known extensions.  fixes   #1403  
							
							 
							
							
							
						 
						
							2015-09-12 10:42:56 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								811e2eaeec 
								
							 
						 
						
							
							
								
								increased dns timeout  
							
							 
							
							
							
						 
						
							2015-09-10 10:54:15 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								650abf1c52 
								
							 
						 
						
							
							
								
								added alt as possible modifier key. use mod+(0..9) to jump to a conversation  
							
							 
							
							
							
						 
						
							2015-09-09 23:28:37 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								6bb9983d58 
								
							 
						 
						
							
							
								
								added rotation detection to up/down navigation  
							
							 
							
							
							
						 
						
							2015-09-07 20:45:21 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								6308dcfdd4 
								
							 
						 
						
							
							
								
								added some key binding  
							
							 
							
							... 
							
							
							
							* ctrl + tab will open the conversations overview (when available)
* ctrl + up / down will navigate between conversations 
							
						 
						
							2015-09-07 15:46:27 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								88cdd03f0f 
								
							 
						 
						
							
							
								
								catch npe in setupIme method  
							
							 
							
							
							
						 
						
							2015-09-07 13:31:24 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								eff173ebc2 
								
							 
						 
						
							
							
								
								indicate broken pep in server info  
							
							 
							
							
							
						 
						
							2015-09-06 19:40:28 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								a95c451f1e 
								
							 
						 
						
							
							
								
								Only show that have sessions in fingerprint list  
							
							 
							
							... 
							
							
							
							Doesn't access database directly anymore but goes through AxolotlService
now to obtain list of fingerprints associated with an Account/Contact.
This should prevent orphaned keys littering the UI which previously
couldn't be removed through the Clear Devices function.
Together with 1c79982da84964c1d81179a0927d9cd1eadf53de this fixes  #1393  
							
						 
						
							2015-09-06 15:15:57 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								2bb033267b 
								
							 
						 
						
							
							
								
								Don't manually add keys to the store  
							
							 
							
							... 
							
							
							
							There is no need to preemptively add the keys to the store oneself.
SessionBuilder will take care of this for us. What's more, this will
prevent IdentityKeys from otherwise invalid bundles to show up in our
UI. 
							
						 
						
							2015-09-06 15:15:57 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								2c4a6b0912 
								
							 
						 
						
							
							
								
								add null pointer check to db migration  
							
							 
							
							
							
						 
						
							2015-09-05 18:47:37 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								e2d506c96a 
								
							 
						 
						
							
							
								
								Never build a session with oneself  
							
							 
							
							... 
							
							
							
							If we detect our own ID is not in our own devicelist on receiving an
update, we reannounce ourselves. This used to have the side effect of
modifying the list of devices we thought were in the update set, causing
us to accidentally build a session with ourselves.
This lead to our own key being set to TRUSTED_INACTIVE, resulting in red
lock icons on messages sent by the own device.
We fix this by having publishOwnDeviceId() operate on a copy of the
original set. This commit also includes a db migration which deletes
sessions with oneself and sets own keys back to TRUSTED. 
							
						 
						
							2015-09-05 17:29:58 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a32a577e36 
								
							 
						 
						
							
							
								
								ignore timeout exceptions on secondary dns requests  
							
							 
							
							
							
						 
						
							2015-09-05 14:26:31 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7eb228d1a5 
								
							 
						 
						
							
							
								
								Issues with URLs with multiple dots in file.  fixes   #1373  
							
							 
							
							
							
						 
						
							2015-09-04 19:58:53 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								1848b46195 
								
							 
						 
						
							
							
								
								invoke onEnterPressed callback only if shift is not pressed  
							
							 
							
							
							
						 
						
							2015-09-04 19:33:31 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								9baa87e5c9 
								
							 
						 
						
							
							
								
								minimize softkeyboard only if it has been in fullscreen mode  
							
							 
							
							
							
						 
						
							2015-09-04 18:02:53 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								204cee4a17 
								
							 
						 
						
							
							
								
								show an send button instead of the enter key in softkeyboards when enterIsSend and showEnterKey are both set  
							
							 
							
							
							
						 
						
							2015-09-04 14:48:00 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								b265341848 
								
							 
						 
						
							
							
								
								Ensure uris is empty before onStart adds to it  
							
							 
							
							... 
							
							
							
							Fixes  #1382  
							
						 
						
							2015-09-02 22:03:15 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								fc594e249a 
								
							 
						 
						
							
							
								
								added special error state for dns timeout  
							
							 
							
							
							
						 
						
							2015-09-01 22:37:52 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								91b0605bc2 
								
							 
						 
						
							
							
								
								use same method to add message hints to otr message everywhere it is needed  
							
							 
							
							
							
						 
						
							2015-09-01 22:36:56 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								74cf8320bc 
								
							 
						 
						
							
							
								
								tag axolotl messages with pretty-please-store  
							
							 
							
							
							
						 
						
							2015-09-01 00:13:19 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								aaf3ecaf41 
								
							 
						 
						
							
							
								
								made useImageAsIs determination a bit more foolproof (samsung)  
							
							 
							
							
							
						 
						
							2015-08-31 20:19:26 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ca262d3523 
								
							 
						 
						
							
							
								
								single task mode for start conversations activity  
							
							 
							
							
							
						 
						
							2015-08-30 11:37:52 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b0c19d6bac 
								
							 
						 
						
							
							
								
								fixed bug that prevented newly opened conversations to load the entire history via mam.  fixes   #1328  
							
							 
							
							
							
						 
						
							2015-08-30 11:24:37 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8f4b7686c9 
								
							 
						 
						
							
							
								
								catch invalid base64 on omemo key decoding  
							
							 
							
							
							
						 
						
							2015-08-30 11:11:54 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								3db7087658 
								
							 
						 
						
							
							
								
								use build in method on >= lolipop devices to discover dns servers  
							
							 
							
							
							
						 
						
							2015-08-28 13:05:34 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								bc9f6d91ac 
								
							 
						 
						
							
							
								
								pulled updated translations from transifex  
							
							 
							
							
							
						 
						
							2015-08-28 13:04:57 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								384c441990 
								
							 
						 
						
							
							
								
								reformating and upper bound for waiting on stanza writer  
							
							 
							
							
							
						 
						
							2015-08-28 11:42:11 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5298f4e2aa 
								
							 
						 
						
							
							
								
								fixed type=timeout  
							
							 
							
							
							
						 
						
							2015-08-28 11:41:41 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								cb70df7a34 
								
							 
						 
						
							
							
								
								added XEP number for http file upload  
							
							 
							
							
							
						 
						
							2015-08-27 19:18:35 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								eff9e417e0 
								
							 
						 
						
							
							
								
								use dedicated colors for primary and primary_dark  
							
							 
							
							
							
						 
						
							2015-08-26 21:17:29 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c5abddc584 
								
							 
						 
						
							
							
								
								fixed highlight text color for white chat bubbles  
							
							 
							
							
							
						 
						
							2015-08-26 21:12:19 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								1156ccbce2 
								
							 
						 
						
							
							
								
								Fix error handling for announce check retrieval  
							
							 
							
							... 
							
							
							
							Only aborts when a timeout was received. Error conditions (most notably
item-not-found) are interpreted as no other devices existing. 
							
						 
						
							2015-08-26 20:52:44 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								cd451856b2 
								
							 
						 
						
							
							
								
								explictitly handle iq timeouts in bind and session iqs  
							
							 
							
							
							
						 
						
							2015-08-26 20:47:08 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								c4a548ada0 
								
							 
						 
						
							
							
								
								Only announce device after publishing bundle  
							
							 
							
							
							
						 
						
							2015-08-26 15:45:21 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f6b7a25e29 
								
							 
						 
						
							
							
								
								moved actual iq callback out of synchronized find callback block  
							
							 
							
							
							
						 
						
							2015-08-26 14:01:37 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ea2ce78d6e 
								
							 
						 
						
							
							
								
								be more restrictive about marking messages as sent_received in muc parser  
							
							 
							
							
							
						 
						
							2015-08-26 12:11:12 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								3e0636367a 
								
							 
						 
						
							
							
								
								Revert "improved compatibility with muc components that change the message id"  
							
							 
							
							... 
							
							
							
							This reverts commit df86b0fc47 . 
							
						 
						
							2015-08-26 11:39:18 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								0eeaccd974 
								
							 
						 
						
							
							
								
								Fix key publishing  
							
							 
							
							... 
							
							
							
							Remove invalid check for result code, which prevented publishing if the
node was empty to begin with.
Fix pepBroken check 
							
						 
						
							2015-08-26 00:27:39 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								25a9d59412 
								
							 
						 
						
							
							
								
								Add more logging to pep attemp counter logic  
							
							 
							
							
							
						 
						
							2015-08-25 18:52:36 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								eafcf38ec9 
								
							 
						 
						
							
							
								
								Limit number of PEP publish tries  
							
							 
							
							... 
							
							
							
							If PEP publish tries are repeatedly triggered by empty PEP updates, stop
attempting to publish after 3 tries. This should work around broken PEP
implementations in older ejabberd and OpenFire versions. 
							
						 
						
							2015-08-25 18:43:44 +02:00  
						
					 
				
					
						
							
							
								 
								Michael
							
						 
						
							 
							
							
							
							
								
							
							
								ae9de26f59 
								
							 
						 
						
							
							
								
								remove unused imports.  
							
							 
							
							
							
						 
						
							2015-08-25 12:40:22 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								b84fecf51a 
								
							 
						 
						
							
							
								
								Pass through device IDs when updating own list  
							
							 
							
							
							
						 
						
							2015-08-25 12:17:09 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5eae1e52d2 
								
							 
						 
						
							
							
								
								cleared up some error messages in axolotl service and execute publishOwnDevicesWhenNeeded() only if processing our own jid  
							
							 
							
							
							
						 
						
							2015-08-25 11:43:10 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								25c49d5e34 
								
							 
						 
						
							
							
								
								catch some db query exceptions  
							
							 
							
							
							
						 
						
							2015-08-25 11:12:10 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7617a19280 
								
							 
						 
						
							
							
								
								additonal null checks in file backend  
							
							 
							
							
							
						 
						
							2015-08-25 11:11:53 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								476db24c10 
								
							 
						 
						
							
							
								
								fixed session time  
							
							 
							
							
							
						 
						
							2015-08-25 11:11:32 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f6374f466b 
								
							 
						 
						
							
							
								
								increased carbon grace period to 90s  
							
							 
							
							
							
						 
						
							2015-08-24 21:25:04 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								98e7d9c74e 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2015-08-24 21:24:48 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								730a5c644b 
								
							 
						 
						
							
							
								
								renamed plain text to unencrypted.  fixes   #1331  
							
							 
							
							
							
						 
						
							2015-08-24 21:15:47 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								865e08401b 
								
							 
						 
						
							
							
								
								fixed regression with mlinks stream managment.  fixes   #1206  
							
							 
							
							
							
						 
						
							2015-08-24 20:56:36 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								fb0b4bb445 
								
							 
						 
						
							
							
								
								added setting to allow for white backgrounds in incoming message bubbles  
							
							 
							
							
							
						 
						
							2015-08-24 20:56:25 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d36ae091b6 
								
							 
						 
						
							
							
								
								Merge branch 'master' into development  
							
							 
							
							
							
						 
						
							2015-08-24 18:18:24 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d0b8bd0f8a 
								
							 
						 
						
							
							
								
								catch invalid base64 in axolotl key parsing  
							
							 
							
							
							
						 
						
							2015-08-24 18:18:01 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								deb9c20e5e 
								
							 
						 
						
							
							
								
								Merge branch 'master' into development  
							
							 
							
							
							
						 
						
							2015-08-23 21:06:58 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c19adebaf0 
								
							 
						 
						
							
							
								
								open files with capital extensions as well.  fixes   #1354  
							
							 
							
							
							
						 
						
							2015-08-23 21:00:51 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								91a3cee6d2 
								
							 
						 
						
							
							
								
								Merge branch 'master' into development  
							
							 
							
							
							
						 
						
							2015-08-23 19:44:58 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8043833156 
								
							 
						 
						
							
							
								
								bugfix: next encryption is now being properly detected  
							
							 
							
							
							
						 
						
							2015-08-23 19:40:45 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7bd0f31244 
								
							 
						 
						
							
							
								
								Merge branch 'master' into development  
							
							 
							
							
							
						 
						
							2015-08-23 17:57:53 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								0dfb9bd1a0 
								
							 
						 
						
							
							
								
								introduce special iq type for internal timeouts. always use != result to check for error in callbacks  
							
							 
							
							
							
						 
						
							2015-08-23 17:53:23 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								777dd4b51e 
								
							 
						 
						
							
							
								
								Merge branch 'master' into development  
							
							 
							
							
							
						 
						
							2015-08-23 17:29:46 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								bbfd98b726 
								
							 
						 
						
							
							
								
								reformating  
							
							 
							
							
							
						 
						
							2015-08-23 17:29:31 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d51c4b9655 
								
							 
						 
						
							
							
								
								deal with another set of stream:features after bind  
							
							 
							
							
							
						 
						
							2015-08-23 17:26:50 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b0710cdf04 
								
							 
						 
						
							
							
								
								Merge branch 'master' into development  
							
							 
							
							
							
						 
						
							2015-08-23 13:57:14 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								e1dc7f990d 
								
							 
						 
						
							
							
								
								Add error handling to OMEMO PEP code  
							
							 
							
							... 
							
							
							
							Log received errors and abort processing 
							
						 
						
							2015-08-23 13:23:51 +02:00  
						
					 
				
					
						
							
							
								 
								Michael
							
						 
						
							 
							
							
							
							
								
							
							
								c0502c2165 
								
							 
						 
						
							
							
								
								remove the READ_PHONE_STATE permission.  
							
							 
							
							
							
						 
						
							2015-08-23 13:07:27 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								3d6fb9b21d 
								
							 
						 
						
							
							
								
								remove callbacks directly from iterator  
							
							 
							
							
							
						 
						
							2015-08-23 10:20:29 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								1688b65965 
								
							 
						 
						
							
							
								
								don't make subsequent iq request when original stanza returned an error  
							
							 
							
							
							
						 
						
							2015-08-23 08:27:05 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								496f531e2e 
								
							 
						 
						
							
							
								
								modified clearIqCallbacks into 2-step process  
							
							 
							
							
							
						 
						
							2015-08-23 08:01:47 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								06fffc13cd 
								
							 
						 
						
							
							
								
								Merge branch 'master' into development  
							
							 
							
							
							
						 
						
							2015-08-19 13:16:59 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7c822c9b75 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2015-08-19 13:03:14 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								9e26375d2f 
								
							 
						 
						
							
							
								
								simulate old behaviour with messages being set to waiting while offline  
							
							 
							
							
							
						 
						
							2015-08-19 13:00:52 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c9b2638778 
								
							 
						 
						
							
							
								
								Merge branch 'master' into development  
							
							 
							
							
							
						 
						
							2015-08-19 12:49:24 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								52f0622dd3 
								
							 
						 
						
							
							
								
								fixed nasty 'stuck at sending' bug that got introduced in  32826ec29d 
							
							 
							
							
							
						 
						
							2015-08-19 12:47:50 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								dafcee6a5b 
								
							 
						 
						
							
							
								
								Merge branch 'master' into development  
							
							 
							
							
							
						 
						
							2015-08-19 12:29:23 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								6e1870b00a 
								
							 
						 
						
							
							
								
								check if inputstream is null before cropping avatar images  
							
							 
							
							
							
						 
						
							2015-08-19 12:25:17 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								9ebd6d503c 
								
							 
						 
						
							
							
								
								catch package manager has died exception  
							
							 
							
							
							
						 
						
							2015-08-19 12:24:42 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								9edcca1045 
								
							 
						 
						
							
							
								
								Merge branch 'master' into development  
							
							 
							
							
							
						 
						
							2015-08-16 15:01:06 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5b1dda9148 
								
							 
						 
						
							
							
								
								deal with broken frameworks  
							
							 
							
							
							
						 
						
							2015-08-16 14:55:40 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d7b3060fc8 
								
							 
						 
						
							
							
								
								catch broken base64 in avatars  
							
							 
							
							
							
						 
						
							2015-08-16 14:55:24 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								51a2645349 
								
							 
						 
						
							
							
								
								synchronize packetCallbacks  
							
							 
							
							
							
						 
						
							2015-08-16 12:12:22 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c082066118 
								
							 
						 
						
							
							
								
								catch null pointer in ScramSHA1 sasl  
							
							 
							
							
							
						 
						
							2015-08-16 11:50:33 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5501502e89 
								
							 
						 
						
							
							
								
								Merge branch 'depend_on_sm' into development  
							
							 
							
							
							
						 
						
							2015-08-15 19:18:38 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ecac1e5943 
								
							 
						 
						
							
							
								
								Merge branch 'development'  
							
							 
							
							
							
						 
						
							2015-08-15 19:12:51 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								6aec49f06d 
								
							 
						 
						
							
							
								
								Update license string with libraries  
							
							 
							
							
							
						 
						
							2015-08-15 19:07:55 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								45d68c200e 
								
							 
						 
						
							
							
								
								Display error message if all contact keys purged  
							
							 
							
							
							
						 
						
							2015-08-15 18:52:47 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								83e1e6468e 
								
							 
						 
						
							
							
								
								fully depend on sm  
							
							 
							
							
							
						 
						
							2015-08-15 16:57:07 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								1f34fb742c 
								
							 
						 
						
							
							
								
								Merge branch 'development'  
							
							 
							
							
							
						 
						
							2015-08-15 14:26:37 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								32826ec29d 
								
							 
						 
						
							
							
								
								provide extra interface to close sockets.  fixes   #1330  
							
							 
							
							
							
						 
						
							2015-08-15 14:14:33 +02:00  
						
					 
				
					
						
							
							
								 
								hlad
							
						 
						
							 
							
							
							
							
								
							
							
								4539643f27 
								
							 
						 
						
							
							
								
								show HTTP upload availability on Edit account screen  
							
							 
							
							
							
						 
						
							2015-08-14 22:24:05 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								dad90762b4 
								
							 
						 
						
							
							
								
								do not touch pictures that are already in the right format  
							
							 
							
							... 
							
							
							
							fixed  #522  
							
						 
						
							2015-08-11 16:50:00 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								3677c6ec98 
								
							 
						 
						
							
							
								
								use same code that is used to open files for images  
							
							 
							
							... 
							
							
							
							fixes  #1323  
							
						 
						
							2015-08-11 15:24:06 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c0dcf4a55a 
								
							 
						 
						
							
							
								
								changed color of 'whispered' prefix  
							
							 
							
							... 
							
							
							
							fixes  #1326  
							
						 
						
							2015-08-11 15:13:17 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								fd81491b05 
								
							 
						 
						
							
							
								
								put wake locks on out of band file transfers  
							
							 
							
							
							
						 
						
							2015-08-10 19:48:36 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d30515a85a 
								
							 
						 
						
							
							
								
								report wrong file size in otr encrypted jingle file transfers to be compatible with conversations > 1.6  
							
							 
							
							
							
						 
						
							2015-08-10 12:55:37 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b5e90850d8 
								
							 
						 
						
							
							
								
								provide more detailed error toasts for http file download  
							
							 
							
							
							
						 
						
							2015-08-10 12:15:14 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b7f00ddac3 
								
							 
						 
						
							
							
								
								fixed image preview in notfications for images that arrived over jingle  
							
							 
							
							
							
						 
						
							2015-08-08 17:19:40 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a6e00837af 
								
							 
						 
						
							
							
								
								decreased right hand side padding in contact keys  
							
							 
							
							
							
						 
						
							2015-08-08 14:09:02 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8b9b74ff7e 
								
							 
						 
						
							
							
								
								renamed multi-end / axolotl to OMEMO  
							
							 
							
							
							
						 
						
							2015-08-08 13:29:21 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								efdf3b6c1c 
								
							 
						 
						
							
							
								
								removed dead code  
							
							 
							
							
							
						 
						
							2015-08-08 13:13:23 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								cac577fa4e 
								
							 
						 
						
							
							
								
								don't request ack for iq stanzas before stream managment is initialized  
							
							 
							
							... 
							
							
							
							fixes  #1322  
							
						 
						
							2015-08-08 10:26:36 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								7437d0fe0c 
								
							 
						 
						
							
							
								
								Increase number of published prekeys for release  
							
							 
							
							
							
						 
						
							2015-08-07 12:30:39 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								53ce5d223e 
								
							 
						 
						
							
							
								
								request server-ACKs for iq stanzas  
							
							 
							
							
							
						 
						
							2015-08-06 20:48:55 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								6694af8fca 
								
							 
						 
						
							
							
								
								fail old/invalid iq stanzas on bind  
							
							 
							
							
							
						 
						
							2015-08-06 14:54:37 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5c0853f302 
								
							 
						 
						
							
							
								
								hide multi-end and otr encryption in conferences  
							
							 
							
							
							
						 
						
							2015-08-06 13:09:53 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								34b22dea48 
								
							 
						 
						
							
							
								
								Improve TrustKeysActivity slider responsiveness  
							
							 
							
							... 
							
							
							
							Slider used to skip back on drag-and-drop action. The switch doesn't
trigger explicit whole UI refreshes anymore, it now directly adjusts the
"done" button's locked status. 
							
						 
						
							2015-08-05 22:24:13 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a1c43d8fdf 
								
							 
						 
						
							
							
								
								added config.java variable to hide openpgp as an encryption method  
							
							 
							
							
							
						 
						
							2015-08-05 18:52:34 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								e10e9942de 
								
							 
						 
						
							
							
								
								changed text selection color  
							
							 
							
							
							
						 
						
							2015-08-05 18:30:49 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c617cf6ef8 
								
							 
						 
						
							
							
								
								added Config.java varibale to lock account creation to specfic domain  
							
							 
							
							
							
						 
						
							2015-08-03 22:58:17 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								9b91d0bf75 
								
							 
						 
						
							
							
								
								sync translations with transifex  
							
							 
							
							
							
						 
						
							2015-08-03 14:04:26 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a6bbe4d4ce 
								
							 
						 
						
							
							
								
								lets try jpeg for a while  
							
							 
							
							
							
						 
						
							2015-08-01 23:37:41 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								2bf30bb296 
								
							 
						 
						
							
							
								
								temporarily renamed new encryption method to 'Multi-End' until a better name has been found  
							
							 
							
							
							
						 
						
							2015-08-01 23:36:59 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5529337da3 
								
							 
						 
						
							
							
								
								use content-type in http slot request and stick with during upload  
							
							 
							
							
							
						 
						
							2015-08-01 22:37:17 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f9dec7cf86 
								
							 
						 
						
							
							
								
								fixed calculated file size in http slot request  
							
							 
							
							
							
						 
						
							2015-08-01 22:23:58 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								6cd9383e53 
								
							 
						 
						
							
							
								
								Let UNTRUSTED/UNDECIDED keys become INACTIVE  
							
							 
							
							
							
						 
						
							2015-08-01 18:30:11 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								60cd307f73 
								
							 
						 
						
							
							
								
								enable axolotl encryption for jingle supported file transfers  
							
							 
							
							
							
						 
						
							2015-08-01 01:19:16 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								6059b96456 
								
							 
						 
						
							
							
								
								Provide process function for key transport message  
							
							 
							
							
							
						 
						
							2015-07-31 23:28:09 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								909f761ca1 
								
							 
						 
						
							
							
								
								Refactor axolotl message processing workflow  
							
							 
							
							... 
							
							
							
							XmppAxolotlMessage is now entirely responsible for handling encryption
and decryption of messages, only leveraging XmppAxolotlSession as a
packing/unpacking primitive for payload keys.
Removed pseudo-dead session generation code step from prepareMessage
function, as sessions have been created by invoking the
TrustKeysActivity for a while now.
Added prepareKeyTransportMessage function, which creates a message with
no payload. The key that is packed into the header keyElements can then
be used for other purposes (e.g. encrypted file transfer). 
							
						 
						
							2015-07-31 21:31:45 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								50b14434ee 
								
							 
						 
						
							
							
								
								Reformat code  
							
							 
							
							
							
						 
						
							2015-07-31 21:31:45 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								5c421da1e1 
								
							 
						 
						
							
							
								
								Change to new wire protocol version  
							
							 
							
							
							
						 
						
							2015-07-31 21:31:45 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								26ac7c9030 
								
							 
						 
						
							
							
								
								added missing carbon column message table create statement  
							
							 
							
							... 
							
							
							
							fixes  #1310  
							
						 
						
							2015-07-31 13:08:35 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								658919f239 
								
							 
						 
						
							
							
								
								improved 'next encryption' selection  
							
							 
							
							
							
						 
						
							2015-07-31 00:52:46 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5191e4ce95 
								
							 
						 
						
							
							
								
								removed expert setting to 'force encryption'. merged certifcate and encryption settings into same category  
							
							 
							
							
							
						 
						
							2015-07-31 00:51:30 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								74ab36fda2 
								
							 
						 
						
							
							
								
								Fix session logic: enforce same type of encryption  
							
							 
							
							
							
						 
						
							2015-07-30 19:18:09 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								1ed550b5c5 
								
							 
						 
						
							
							
								
								fixed some colors in message adapter  
							
							 
							
							
							
						 
						
							2015-07-30 12:40:50 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								58d80f58be 
								
							 
						 
						
							
							
								
								use gcm for file encryption over http  
							
							 
							
							
							
						 
						
							2015-07-29 23:45:37 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								b7c64cd19d 
								
							 
						 
						
							
							
								
								Reset lock color for non-axolotl messages  
							
							 
							
							
							
						 
						
							2015-07-29 20:25:14 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								2b3bb02261 
								
							 
						 
						
							
							
								
								Highlight selected message's fingerprint in list  
							
							 
							
							
							
						 
						
							2015-07-29 20:21:37 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								e07853ea62 
								
							 
						 
						
							
							
								
								Rerender message bubbles on encryption change  
							
							 
							
							
							
						 
						
							2015-07-29 20:10:21 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								e6df4d81d2 
								
							 
						 
						
							
							
								
								Tag carbon messages in parser, adapt session logic  
							
							 
							
							... 
							
							
							
							Messages sent from another device of the own account are now explicitly
tagged as carboned message. The session detection logic now uses this
tag to find "session borders". 
							
						 
						
							2015-07-29 16:41:58 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								e10a6c5b87 
								
							 
						 
						
							
							
								
								Fix NPE: consider unknown keys UNDECIDED  
							
							 
							
							
							
						 
						
							2015-07-29 02:59:41 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								77920c7aa6 
								
							 
						 
						
							
							
								
								Color plaintext messages in encrypted sessions red  
							
							 
							
							... 
							
							
							
							Plaintext messages that were received while in an encrypted session are
now colored red. We define "in an encrypted session" if a) the last
message sent by our own device before the message under consideration
(or any message received between then and now) was encrypted AND b) the
next message will be sent encrypted or the next message sent after the
one under consideration was sent encrypted 
							
						 
						
							2015-07-29 02:59:41 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								a3991d59c9 
								
							 
						 
						
							
							
								
								Improve trust toggle responsiveness  
							
							 
							
							... 
							
							
							
							Removed unnecessary UI refreshes, explicitly update UI where needed. 
							
						 
						
							2015-07-29 02:59:41 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								efcefc2e63 
								
							 
						 
						
							
							
								
								Refactor out inner classes, cache trust store  
							
							 
							
							... 
							
							
							
							Moves SQLiteAxolotlStore and XmppAxolotlSession into proper classes.
IdentityKeys trust statuses are now cached in an LruCache to prevent
hammering the database when rendering the UI. 
							
						 
						
							2015-07-29 02:59:26 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d9bdce0104 
								
							 
						 
						
							
							
								
								add new received message bubble drawable  
							
							 
							
							
							
						 
						
							2015-07-29 02:01:28 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								17bc4fb6cd 
								
							 
						 
						
							
							
								
								show http downloaded images in notification  
							
							 
							
							
							
						 
						
							2015-07-29 01:57:08 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8f14d2bfbd 
								
							 
						 
						
							
							
								
								removed recursion in message.getMerged*()  
							
							 
							
							
							
						 
						
							2015-07-28 23:00:30 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8924c448d1 
								
							 
						 
						
							
							
								
								changed logging. (work around logcat null pointer  
							
							 
							
							
							
						 
						
							2015-07-28 22:26:29 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								6b8e1ecb95 
								
							 
						 
						
							
							
								
								log reason for message failure  
							
							 
							
							
							
						 
						
							2015-07-28 14:44:11 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ff0c114cd6 
								
							 
						 
						
							
							
								
								set time on resend to current time  
							
							 
							
							... 
							
							
							
							fixes  #1298 
fixes  #919  
							
						 
						
							2015-07-28 12:54:54 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								9c94c9ad8f 
								
							 
						 
						
							
							
								
								rewrote dns fallback  
							
							 
							
							
							
						 
						
							2015-07-24 19:06:47 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								e5fae429fa 
								
							 
						 
						
							
							
								
								call refreshUi directly  
							
							 
							
							
							
						 
						
							2015-07-24 14:43:13 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c32162c280 
								
							 
						 
						
							
							
								
								switch/case can't deal with null pointers  
							
							 
							
							
							
						 
						
							2015-07-23 14:02:25 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								cd204d5931 
								
							 
						 
						
							
							
								
								show warning when trying to highlight users that have left the conference  
							
							 
							
							
							
						 
						
							2015-07-22 15:57:17 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f7634a85be 
								
							 
						 
						
							
							
								
								treat private, non-anonymous mucs like 1:1 chats notification wise  
							
							 
							
							
							
						 
						
							2015-07-22 15:31:00 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								db05d26433 
								
							 
						 
						
							
							
								
								Always build own device session automatically  
							
							 
							
							
							
						 
						
							2015-07-22 15:03:52 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								9c1c86ed44 
								
							 
						 
						
							
							
								
								add no-store to chat states  
							
							 
							
							
							
						 
						
							2015-07-22 14:17:02 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								63206e6d4a 
								
							 
						 
						
							
							
								
								use type=chat more often to go along with new, simple carbon and mam rules  
							
							 
							
							... 
							
							
							
							* change chat states to type=chat and chat markers to type=chat
* use same type as requesting stanza for delivery receipts (which should make them type=chat most of the time) 
							
						 
						
							2015-07-22 14:15:00 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a1e63944a2 
								
							 
						 
						
							
							
								
								use 'interactive mode' when starting downloads from the context menu  
							
							 
							
							
							
						 
						
							2015-07-22 12:15:09 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								c2813cea29 
								
							 
						 
						
							
							
								
								Hide regenerate keys button  
							
							 
							
							... 
							
							
							
							Can re-enable it via Config.java setting 
							
						 
						
							2015-07-22 01:00:20 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								4c1c2892c7 
								
							 
						 
						
							
							
								
								Disable trust toggle completely for INACTIVE keys  
							
							 
							
							
							
						 
						
							2015-07-22 00:53:54 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								456d4c8b23 
								
							 
						 
						
							
							
								
								made image file format configurable by Config.java  
							
							 
							
							
							
						 
						
							2015-07-21 23:49:35 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d38228f482 
								
							 
						 
						
							
							
								
								fixed npe in error message handling  
							
							 
							
							
							
						 
						
							2015-07-21 19:45:41 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f6281a182d 
								
							 
						 
						
							
							
								
								fixed npe in error message handling  
							
							 
							
							
							
						 
						
							2015-07-21 19:44:25 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								0d679a7abb 
								
							 
						 
						
							
							
								
								decreased saturation of received message bubbles by 25 units  
							
							 
							
							
							
						 
						
							2015-07-21 18:29:24 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								92b5081b5e 
								
							 
						 
						
							
							
								
								Add INACTIVE state for removed keys  
							
							 
							
							... 
							
							
							
							We introduce a new trust state: INACTIVE. This state is intended for
old keys that have been removed.
When a TRUSTED device is removed from the PEP devicelist, it's status
will be set to INACTIVE. INACTIVE keys are shown in the UI as greyed
out, non-interactible key rows. Messages are not encrypted for INACTIVE
devices.
When an INACTIVE device reappears in PEP, or a message is received from
an INACTIVE device, it is set back to trusted. 
							
						 
						
							2015-07-21 14:24:59 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								3c5c0c7d3b 
								
							 
						 
						
							
							
								
								Fill own device sessions into SessionMap  
							
							 
							
							
							
						 
						
							2015-07-21 14:24:59 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								1aeb5874b0 
								
							 
						 
						
							
							
								
								allow for private messages being started from muc details in anonymous mucs  
							
							 
							
							
							
						 
						
							2015-07-21 13:15:59 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								32f90613a3 
								
							 
						 
						
							
							
								
								and now do that properly  
							
							 
							
							
							
						 
						
							2015-07-21 12:02:15 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ffa588ba3e 
								
							 
						 
						
							
							
								
								and now do that properly  
							
							 
							
							
							
						 
						
							2015-07-21 12:01:20 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								af76ad0144 
								
							 
						 
						
							
							
								
								end otr session when receiving failed otr message warnings  
							
							 
							
							
							
						 
						
							2015-07-21 12:00:01 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								394486b300 
								
							 
						 
						
							
							
								
								bugfix: also add no-permanent-storage to message hints  
							
							 
							
							
							
						 
						
							2015-07-21 11:59:52 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f1ee5cccf0 
								
							 
						 
						
							
							
								
								bugfix: changed condition of onOtrSessionEstablished being called  
							
							 
							
							... 
							
							
							
							fixed  #1263 
fixed  #1260 
fixed  #1293  
							
						 
						
							2015-07-21 11:59:30 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								96f38324f8 
								
							 
						 
						
							
							
								
								pulled new translations from transifex  
							
							 
							
							
							
						 
						
							2015-07-21 11:58:03 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5c2720efd0 
								
							 
						 
						
							
							
								
								bugfix: don't crash if aes key could not be set before jingle transfer  
							
							 
							
							
							
						 
						
							2015-07-21 11:55:48 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								37cbdb8b4e 
								
							 
						 
						
							
							
								
								bugfix: use sendIqPacket method in service instead of invoking XmppConnection directly  
							
							 
							
							
							
						 
						
							2015-07-21 11:55:33 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								086653b649 
								
							 
						 
						
							
							
								
								bugfix: accept status code 201 on http upload  
							
							 
							
							
							
						 
						
							2015-07-21 11:55:18 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								87bc9d3a31 
								
							 
						 
						
							
							
								
								end otr session when receiving failed otr message warnings  
							
							 
							
							
							
						 
						
							2015-07-21 11:52:49 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a5027104fd 
								
							 
						 
						
							
							
								
								bugfix: also add no-permanent-storage to message hints  
							
							 
							
							
							
						 
						
							2015-07-21 11:50:32 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f74ee765a2 
								
							 
						 
						
							
							
								
								bugfix: changed condition of onOtrSessionEstablished being called  
							
							 
							
							... 
							
							
							
							fixed  #1263 
fixed  #1260 
fixed  #1293  
							
						 
						
							2015-07-21 11:46:56 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								74e05023b4 
								
							 
						 
						
							
							
								
								very subtle  
							
							 
							
							
							
						 
						
							2015-07-21 02:21:34 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								b7ff2c3461 
								
							 
						 
						
							
							
								
								Use properly fixed numeral values in Trust enum  
							
							 
							
							... 
							
							
							
							Why, oh God, why?! #thanksjamesgosling 
							
						 
						
							2015-07-21 01:52:22 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								639ebd644b 
								
							 
						 
						
							
							
								
								Remove unused import  
							
							 
							
							
							
						 
						
							2015-07-21 01:17:29 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								122bc97ce2 
								
							 
						 
						
							
							
								
								Switch payload encryption to AES-GCM  
							
							 
							
							... 
							
							
							
							This also ensures that the IV is generated with proper randomness. 
							
						 
						
							2015-07-21 01:17:14 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								971aa3a11e 
								
							 
						 
						
							
							
								
								Also decrypt messages from UNTRUSTED sessions  
							
							 
							
							
							
						 
						
							2015-07-20 23:16:06 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								d2845e9ac1 
								
							 
						 
						
							
							
								
								Refactor axolotl send processing/caching flow  
							
							 
							
							
							
						 
						
							2015-07-20 23:13:28 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								8be0e8a27d 
								
							 
						 
						
							
							
								
								Start TrustKeysActivity if no keys are TRUSTED  
							
							 
							
							... 
							
							
							
							If there are no UNDECIDED keys, but none of the contact's keys are
trusted, redirect the user to the TrustKeysActivity 
							
						 
						
							2015-07-20 22:35:07 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								4ee3f330f5 
								
							 
						 
						
							
							
								
								Do not display clear devices button if not online  
							
							 
							
							
							
						 
						
							2015-07-20 22:19:04 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								ab2d114bbc 
								
							 
						 
						
							
							
								
								Add purge axolotl key option  
							
							 
							
							... 
							
							
							
							Can now long-press a key to permanently purge it. 
							
						 
						
							2015-07-20 22:18:24 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								0ee64124fe 
								
							 
						 
						
							
							
								
								Fix getNumTrustedKeys  
							
							 
							
							
							
						 
						
							2015-07-20 22:02:54 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5ab0d5d1c1 
								
							 
						 
						
							
							
								
								pulled new translations from transifex  
							
							 
							
							
							
						 
						
							2015-07-20 19:13:08 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								e79f82ca72 
								
							 
						 
						
							
							
								
								attempt to fix the delay problem  
							
							 
							
							
							
						 
						
							2015-07-20 18:11:33 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								dcf9117451 
								
							 
						 
						
							
							
								
								changed sizes of avatars and padding in new message bubbles  
							
							 
							
							
							
						 
						
							2015-07-20 16:02:18 +02:00  
						
					 
				
					
						
							
							
								 
								Raphael Pohl
							
						 
						
							 
							
							
							
							
								
							
							
								e6cb12dfe4 
								
							 
						 
						
							
							
								
								changed message bubble appearance  
							
							 
							
							
							
						 
						
							2015-07-20 16:02:17 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								504ef0b72e 
								
							 
						 
						
							
							
								
								rely on refreshUi/refreshUiReal and make sure it is being used everywhere  
							
							 
							
							
							
						 
						
							2015-07-20 15:48:58 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8559ca05ab 
								
							 
						 
						
							
							
								
								fixed monospace font and android L  
							
							 
							
							
							
						 
						
							2015-07-20 15:43:28 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								aaa8fe8978 
								
							 
						 
						
							
							
								
								Merge branch 'CryptoNextBeta' into development  
							
							 
							
							... 
							
							
							
							* CryptoNextBeta: (60 commits)
  Lock TrustKeys if no trusted keys are available
  Optimize imports
  Use MD style for key trust toggle switch
  Fix set/remove OnUpdateBlocklistListener
  Fix axolotl database migration
  Remove device list from EditAccount
  Add clear devices to overflow menu in EditAccount
  Ask for key trust when sending messages
  Encrypt files for HTTP upload in encrypted chats
  Refactor trust key ui and show in account details
  Send correct body for HTTP files
  Handle file transmission properly in axolotl
  Remove unneccessary code
  Fix trust status for outgoing messages
  Don't merge messages with different trust statuses
  Fix copying of axolotl keys to clipboard
  Add refresh icon to v21 theme
  Disable Axolotl option if not usable
  Show trust status of messages' originating session
  Add key trust toggle to ContactDetailsActivity
  ... 
							
						 
						
							2015-07-20 15:13:14 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								19a0ae42d6 
								
							 
						 
						
							
							
								
								Lock TrustKeys if no trusted keys are available  
							
							 
							
							
							
						 
						
							2015-07-20 14:56:41 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								012f036840 
								
							 
						 
						
							
							
								
								Optimize imports  
							
							 
							
							
							
						 
						
							2015-07-20 14:26:29 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								9c91b9036a 
								
							 
						 
						
							
							
								
								don't show 'show contact details' context menu item when contact isn not in roster  
							
							 
							
							
							
						 
						
							2015-07-20 14:24:59 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								576330f6a9 
								
							 
						 
						
							
							
								
								Use MD style for key trust toggle switch  
							
							 
							
							
							
						 
						
							2015-07-20 14:14:27 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								e9d7d7e12a 
								
							 
						 
						
							
							
								
								Fix set/remove OnUpdateBlocklistListener  
							
							 
							
							
							
						 
						
							2015-07-20 14:12:24 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								2d2da11bfa 
								
							 
						 
						
							
							
								
								Merge pull request  #1289  from kriztan/patch-2  
							
							 
							
							... 
							
							
							
							show contact details in conference details ... 
							
						 
						
							2015-07-20 13:16:19 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								dd964077b9 
								
							 
						 
						
							
							
								
								Fix axolotl database migration  
							
							 
							
							... 
							
							
							
							Can't call getWritableDatabase in recreateAxolotlDb() 
							
						 
						
							2015-07-20 13:15:49 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								2240066bbe 
								
							 
						 
						
							
							
								
								Remove device list from EditAccount  
							
							 
							
							
							
						 
						
							2015-07-19 23:38:09 +02:00  
						
					 
				
					
						
							
							
								 
								Sam Whited
							
						 
						
							 
							
							
							
							
								
							
							
								eea8c28612 
								
							 
						 
						
							
							
								
								Change CAB to accent color in v21  
							
							 
							
							
							
						 
						
							2015-07-19 16:36:24 -05:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								480b1cde81 
								
							 
						 
						
							
							
								
								Add clear devices to overflow menu in EditAccount  
							
							 
							
							
							
						 
						
							2015-07-19 23:35:03 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								14010bf5a6 
								
							 
						 
						
							
							
								
								Ask for key trust when sending messages  
							
							 
							
							... 
							
							
							
							If the contact (or the own account) has keys that have UNDECIDED trust,
we now drop the user into the new TrustKeysActivity, where they have to
decide for each new key whether it should be TRUSTED or UNTRUSTED. 
							
						 
						
							2015-07-19 22:27:26 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								ec0aff4ed7 
								
							 
						 
						
							
							
								
								Encrypt files for HTTP upload in encrypted chats  
							
							 
							
							
							
						 
						
							2015-07-19 22:24:05 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								6f67469bda 
								
							 
						 
						
							
							
								
								Refactor trust key ui and show in account details  
							
							 
							
							... 
							
							
							
							Refactored the trust key row UI element so it can be used in multiple
places. It now also uses a slider to toggle the trust state, and the
redundant trust state description was removed.
EditAccountActivity now shows the keys of other devices associated with
that account. 
							
						 
						
							2015-07-19 22:24:03 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								9c4d55f82c 
								
							 
						 
						
							
							
								
								Send correct body for HTTP files  
							
							 
							
							... 
							
							
							
							When using HTTP upload to send files, take care to transmit only the URL
rather than the entire body, which contains metadata. 
							
						 
						
							2015-07-19 22:23:28 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								2045a71262 
								
							 
						 
						
							
							
								
								Handle file transmission properly in axolotl  
							
							 
							
							
							
						 
						
							2015-07-19 22:23:28 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								43703870e8 
								
							 
						 
						
							
							
								
								Remove unneccessary code  
							
							 
							
							
							
						 
						
							2015-07-19 22:23:28 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								4038af2f47 
								
							 
						 
						
							
							
								
								Fix trust status for outgoing messages  
							
							 
							
							... 
							
							
							
							Tag sent messages with own fingerprint, set own fingerprint as always
trusted, include own fingerprint in database trust search, explicitly
reset trust colorfilter 
							
						 
						
							2015-07-19 22:23:28 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								e8ec2ee628 
								
							 
						 
						
							
							
								
								Don't merge messages with different trust statuses  
							
							 
							
							
							
						 
						
							2015-07-19 22:23:28 +02:00  
						
					 
				
					
						
							
							
								 
								Sam Whited
							
						 
						
							 
							
							
							
							
								
							
							
								fca0c36757 
								
							 
						 
						
							
							
								
								Fix copying of axolotl keys to clipboard  
							
							 
							
							
							
						 
						
							2015-07-19 22:23:28 +02:00  
						
					 
				
					
						
							
							
								 
								Sam Whited
							
						 
						
							 
							
							
							
							
								
							
							
								3ab59c93a6 
								
							 
						 
						
							
							
								
								Add refresh icon to v21 theme  
							
							 
							
							
							
						 
						
							2015-07-19 22:23:27 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								6c38e53128 
								
							 
						 
						
							
							
								
								Disable Axolotl option if not usable  
							
							 
							
							... 
							
							
							
							In MUCs or if contact is not axolotl capable, disable axolotl menu
option 
							
						 
						
							2015-07-19 22:23:27 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								9e8d9a6401 
								
							 
						 
						
							
							
								
								Show trust status of messages' originating session  
							
							 
							
							... 
							
							
							
							Shade lock icon red if message was received in a session that has not
been marked trusted by the user or fingerprint is unknown 
							
						 
						
							2015-07-19 22:23:27 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								3d33946088 
								
							 
						 
						
							
							
								
								Add key trust toggle to ContactDetailsActivity  
							
							 
							
							... 
							
							
							
							Can now toggle IdentityKey trust 
							
						 
						
							2015-07-19 22:23:27 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								35714d3d08 
								
							 
						 
						
							
							
								
								Ensure that available sessions are always used  
							
							 
							
							... 
							
							
							
							Any time a new session is established, call syncRosterToDisk() to ensure
that on subsequent restoreFromDatabase() calls, the roster is actually
available. This is important so that initAccountServices() can properly
initialize the SessionMap. This prevents a race condition where after
adding a new account and initiating sessions with it, if the app is
killed (e.g. by reinstall) before triggering a syncRosterToDisk(),
subsequent restores will not have the roster available, leading to
missing XmppAxolotlSessions in the SessionMap cache. As a result of
this, a new session was initiated when sending a new message, and
received messages could not be tagged with the originating session's
fingerprint.
As an added sanity check, go to the database to confirm no records are
present before creating fresh XmppAxolotlSession objects (both in the
sending and receiving case). 
							
						 
						
							2015-07-19 22:23:27 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								31d375c2c3 
								
							 
						 
						
							
							
								
								Fix setIdentityKeyTrust update statement  
							
							 
							
							
							
						 
						
							2015-07-19 22:23:27 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								160e4017df 
								
							 
						 
						
							
							
								
								Fix IdentityKey storage model  
							
							 
							
							... 
							
							
							
							Added proper UNIQUE statement 
							
						 
						
							2015-07-19 22:23:27 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								461d0446f7 
								
							 
						 
						
							
							
								
								Fix and expand key regeneration function  
							
							 
							
							... 
							
							
							
							Wipe session cache to prevent stale sessions being used. Wipe fetch
status cache to enable recreation of sessions. Regenerate deviceId, so
that foreign devices will talk to us again. 
							
						 
						
							2015-07-19 22:23:27 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								23a4e1e6fa 
								
							 
						 
						
							
							
								
								Display trust status in ContactDetailsActivity  
							
							 
							
							
							
						 
						
							2015-07-19 22:23:25 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								d173913eba 
								
							 
						 
						
							
							
								
								Overhauled Message tagging  
							
							 
							
							... 
							
							
							
							Messages are now tagged with the IdentityKey fingerprint of the
originating session. IdentityKeys have one of three trust states:
undecided (default), trusted, and untrusted/not yet trusted. 
							
						 
						
							2015-07-19 22:17:58 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								7f918542c8 
								
							 
						 
						
							
							
								
								Postpone initAccountService until roster loaded  
							
							 
							
							... 
							
							
							
							The AxolotlService depends on the roster being loaded when it is
initialized so that it can fill its in-memory SessionMap. 
							
						 
						
							2015-07-19 22:17:57 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								03614a0262 
								
							 
						 
						
							
							
								
								Fix getSubDeviceSessions SQL query  
							
							 
							
							
							
						 
						
							2015-07-19 22:17:57 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								2628662a7f 
								
							 
						 
						
							
							
								
								Display axolotl chat message hint  
							
							 
							
							
							
						 
						
							2015-07-19 22:17:57 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								f1d73b9d4e 
								
							 
						 
						
							
							
								
								Use full int range for device IDs  
							
							 
							
							
							
						 
						
							2015-07-19 22:17:57 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								540faeb54b 
								
							 
						 
						
							
							
								
								Clean up unused constant  
							
							 
							
							
							
						 
						
							2015-07-19 22:17:57 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								bd29653a20 
								
							 
						 
						
							
							
								
								Make some fields final  
							
							 
							
							
							
						 
						
							2015-07-19 22:17:57 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								3458f5bb91 
								
							 
						 
						
							
							
								
								Clean up logging  
							
							 
							
							... 
							
							
							
							Add a fixed prefix to axolotl-related log messages, set log levels
sensibly. 
							
						 
						
							2015-07-19 22:17:57 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								7049904c32 
								
							 
						 
						
							
							
								
								Add basic PEP managemend UI to EditAccountActivity  
							
							 
							
							... 
							
							
							
							EditAccountActivity now show own fingerprint, and gives an option to
regenerate local keying material (and wipe all sessions associated with
the old keys in the process).
It also now displays a list of other own devices, and gives an option to
remove all but the current device. 
							
						 
						
							2015-07-19 22:17:55 +02:00  
						
					 
				
					
						
							
							
								 
								Christian S
							
						 
						
							 
							
							
							
							
								
							
							
								37b214a8a8 
								
							 
						 
						
							
							
								
								show contact details in conference details ...  
							
							 
							
							
							
						 
						
							2015-07-19 22:11:51 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								968410ae33 
								
							 
						 
						
							
							
								
								Fix devicelist update handling  
							
							 
							
							... 
							
							
							
							No longer store own device ID (so that we don't encrypt messages for
ourselves), verify that own device ID is present in update list
(otherwise republish), reflect update in UI. 
							
						 
						
							2015-07-19 21:32:27 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								7a962e5180 
								
							 
						 
						
							
							
								
								Refactor axolotl database recreation  
							
							 
							
							
							
						 
						
							2015-07-19 21:32:27 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								8fd46d40d6 
								
							 
						 
						
							
							
								
								Adapt prettifyFingerprint() to axolotl FP sizes  
							
							 
							
							
							
						 
						
							2015-07-19 21:32:27 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								491f623708 
								
							 
						 
						
							
							
								
								Fix displaying Contact IdentityKeys  
							
							 
							
							... 
							
							
							
							Migrate ContactDetailsActivity to use new SQL IdentityKeys storage,
remove dead code from Contact class. 
							
						 
						
							2015-07-19 21:32:27 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								0cf64857cf 
								
							 
						 
						
							
							
								
								Only cache session if successfully established  
							
							 
							
							... 
							
							
							
							When receiving a message, only remember the XmppAxolotlSession wrapper
if the prospective session was actually established. This prevents us
from erroneously adding empty sessions that are never established using
received PreKeyWhisperMessages, which would lead to errors if we try to
use them for sending. 
							
						 
						
							2015-07-19 21:32:27 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								6867b5c3ab 
								
							 
						 
						
							
							
								
								Return empty set on invalid PEP devicelist  
							
							 
							
							
							
						 
						
							2015-07-19 21:32:27 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								25450bf6d3 
								
							 
						 
						
							
							
								
								Trust all IdentityKeys  
							
							 
							
							... 
							
							
							
							The trust-on-first-use policy leads to problems when receiving messages
from two different devices of a contact before sending a message to them
(as their IdentityKeys will not have been added yet). Since session
trust will be managed externally anyway, this change is not a security
problem, and will allow us to decrypt messages from yet-untrusted
sessions. 
							
						 
						
							2015-07-19 21:32:27 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								bf4185ac08 
								
							 
						 
						
							
							
								
								Refresh PEP on session establish  
							
							 
							
							... 
							
							
							
							We now track preKeys used to establish incoming sessions with us. On
each new established session, we remove the used prekey from PEP. We
have to do this because libaxolotl-java internally clears the used
preKey from its storage, so we will not be able to establish any future
sessions using that key. 
							
						 
						
							2015-07-19 21:32:27 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								69600502d2 
								
							 
						 
						
							
							
								
								Fix asynchronous axolotl message sending  
							
							 
							
							... 
							
							
							
							XmppConnectionService.sendMessage() now dispatches messages to the
AxolotlService, where they only are prepared for sending and cached.
AxolotlService now triggers a XmppConnectionService.resendMessage(),
which then handles sending the cached message packet.
This transparently fixes, e.g., handling of messages sent while we are
offline. 
							
						 
						
							2015-07-19 21:32:27 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								ec6870307e 
								
							 
						 
						
							
							
								
								Properly track message sender  
							
							 
							
							... 
							
							
							
							Previously, the sender was assumed to be the conversation counterpart.
This broke carboned own-device messages. We now track the sender
properly, and also set the status (sent by one of the own devices vs
received from the counterpart) accordingly. 
							
						 
						
							2015-07-19 21:32:27 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								18c1e15d00 
								
							 
						 
						
							
							
								
								Rework PEP content verification  
							
							 
							
							... 
							
							
							
							Now checks which part(s) are out of sync w/ local storage, and updates
only those, rather than assuming the entire node corrupt and
overwriting it all (especially relevant for preKey list) 
							
						 
						
							2015-07-19 21:32:27 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								9a0232f7e7 
								
							 
						 
						
							
							
								
								Formatting fixes  
							
							 
							
							
							
						 
						
							2015-07-19 21:32:27 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								992cf5652e 
								
							 
						 
						
							
							
								
								When receiving, add mock session if none exists  
							
							 
							
							... 
							
							
							
							We need a session object in order to build a session from a
PreKeyWhisperMessage, so add an empty one when none exists on receiving
a message.
Warning: this will break right now if the session can not be constructed
from the received message.There will be an invalid session which will
break if we try to send using it. 
							
						 
						
							2015-07-19 21:32:26 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								1b0596d574 
								
							 
						 
						
							
							
								
								Tag messages with originating session  
							
							 
							
							... 
							
							
							
							This can be used later in order to display trust status of messages, as
well as for potential resending of messages in case of preKey conflicts. 
							
						 
						
							2015-07-19 21:32:26 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								3815d4efa3 
								
							 
						 
						
							
							
								
								Fetch bundles on-demand, encrypt in background  
							
							 
							
							... 
							
							
							
							Bundles are now fetched on demand when a session needs to be
established. This should lessen the chance of changes to the bundles
occuring before they're used, as well as lessen the load of fetching
bundles.
Also, the message encryption is now done in a background thread, as this
can be somewhat costly if many sessions are present. This is probably
not going to be an issue in real use, but it's good practice anyway. 
							
						 
						
							2015-07-19 21:32:26 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								cb7980c65e 
								
							 
						 
						
							
							
								
								Use bareJid for own session retrieval  
							
							 
							
							
							
						 
						
							2015-07-19 21:32:26 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								c1d23b2395 
								
							 
						 
						
							
							
								
								Migrate to new PEP layout  
							
							 
							
							... 
							
							
							
							Merge prekeys into bundle node 
							
						 
						
							2015-07-19 21:32:26 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								6492801b89 
								
							 
						 
						
							
							
								
								Formatting fixes  
							
							 
							
							
							
						 
						
							2015-07-19 21:32:26 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								74026b742b 
								
							 
						 
						
							
							
								
								Save IdentityKeys in database  
							
							 
							
							
							
						 
						
							2015-07-19 21:32:26 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								9e07fc5651 
								
							 
						 
						
							
							
								
								DatabaseBackend bugfixes  
							
							 
							
							... 
							
							
							
							Don't leak cursors, initially create tables 
							
						 
						
							2015-07-19 21:32:26 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								299bbdf27f 
								
							 
						 
						
							
							
								
								Reformat code to use tabs  
							
							 
							
							... 
							
							
							
							This really sucks to do it like this. Sorry. :( 
							
						 
						
							2015-07-19 21:32:26 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								065519d3f3 
								
							 
						 
						
							
							
								
								Added axolotl activation code to UI  
							
							 
							
							
							
						 
						
							2015-07-19 21:32:26 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								77619b55e4 
								
							 
						 
						
							
							
								
								Added PEP and message protocol layers  
							
							 
							
							... 
							
							
							
							Can now fetch/retrieve from PEP, as well as encode/decode messages 
							
						 
						
							2015-07-19 21:32:26 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								f73aa1a200 
								
							 
						 
						
							
							
								
								Reworked axolotl protocol layer  
							
							 
							
							... 
							
							
							
							Numerous fixes 
							
						 
						
							2015-07-19 21:32:25 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								077932eb55 
								
							 
						 
						
							
							
								
								CryptoNext Menu entries added  
							
							 
							
							
							
						 
						
							2015-07-19 21:32:25 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								b8048a5538 
								
							 
						 
						
							
							
								
								CryptoNext persistance layer mockup  
							
							 
							
							... 
							
							
							
							Initial sketch of the peripheral storage infrastructure for the new
axolotl-based encryption scheme. 
							
						 
						
							2015-07-19 21:32:21 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								9b70c7e68c 
								
							 
						 
						
							
							
								
								bugfix: don't crash if aes key could not be set before jingle transfer  
							
							 
							
							
							
						 
						
							2015-07-19 14:51:04 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5c017e5186 
								
							 
						 
						
							
							
								
								bugfix: use sendIqPacket method in service instead of invoking XmppConnection directly  
							
							 
							
							
							
						 
						
							2015-07-19 14:25:30 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								0166ced46c 
								
							 
						 
						
							
							
								
								bugfix: accept status code 201 on http upload  
							
							 
							
							
							
						 
						
							2015-07-19 13:36:02 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f58b2afcaa 
								
							 
						 
						
							
							
								
								changed switch widget  
							
							 
							
							
							
						 
						
							2015-07-18 19:38:52 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								15b880f3a1 
								
							 
						 
						
							
							
								
								pulled translations  
							
							 
							
							
							
						 
						
							2015-07-18 00:02:13 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ce527c8b76 
								
							 
						 
						
							
							
								
								account for downloaded http files in dup checker  
							
							 
							
							
							
						 
						
							2015-07-18 00:01:34 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								aa1b9de20c 
								
							 
						 
						
							
							
								
								code cleanup  
							
							 
							
							
							
						 
						
							2015-07-17 23:58:53 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c3584a6db7 
								
							 
						 
						
							
							
								
								fixed inactive http download  
							
							 
							
							
							
						 
						
							2015-07-17 23:58:33 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								13cce172ab 
								
							 
						 
						
							
							
								
								show error message in account details when info has not been edited  
							
							 
							
							
							
						 
						
							2015-07-17 13:14:24 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								1f43115544 
								
							 
						 
						
							
							
								
								increased ibb block size  
							
							 
							
							
							
						 
						
							2015-07-17 13:06:51 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								4f62793a67 
								
							 
						 
						
							
							
								
								version bump to 1.5.0-beta.2  
							
							 
							
							
							
						 
						
							2015-07-16 14:27:36 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								425f0479a8 
								
							 
						 
						
							
							
								
								even less jumpy  
							
							 
							
							
							
						 
						
							2015-07-16 14:06:54 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								6a329c7465 
								
							 
						 
						
							
							
								
								fixed some ux glitches in editaccount  
							
							 
							
							
							
						 
						
							2015-07-16 13:42:52 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								babbd389f6 
								
							 
						 
						
							
							
								
								removed empty translation file  
							
							 
							
							
							
						 
						
							2015-07-16 13:29:59 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7bd66549d8 
								
							 
						 
						
							
							
								
								made 'check image on http host' message more generic.  fixed   #1281  
							
							 
							
							
							
						 
						
							2015-07-16 13:25:52 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b477b8f57b 
								
							 
						 
						
							
							
								
								fixed some npes  
							
							 
							
							
							
						 
						
							2015-07-16 13:14:51 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b525b42e59 
								
							 
						 
						
							
							
								
								fixed crash on invalid muc bookmarks  
							
							 
							
							
							
						 
						
							2015-07-15 17:42:08 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ffffca10f0 
								
							 
						 
						
							
							
								
								renamed colors  
							
							 
							
							
							
						 
						
							2015-07-13 12:55:13 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								84bfe8c721 
								
							 
						 
						
							
							
								
								catch exception on broken android phones  
							
							 
							
							
							
						 
						
							2015-07-12 20:17:12 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								558d065d48 
								
							 
						 
						
							
							
								
								made lock button reflect encryption status of the next messages instead of the last  
							
							 
							
							
							
						 
						
							2015-07-12 17:59:22 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								58bc4cba06 
								
							 
						 
						
							
							
								
								only try to change affilations for known jids  
							
							 
							
							
							
						 
						
							2015-07-11 21:24:51 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								4274fe90ac 
								
							 
						 
						
							
							
								
								try to catch weird npe in android sdk  
							
							 
							
							
							
						 
						
							2015-07-11 21:24:30 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5dd83a5fe6 
								
							 
						 
						
							
							
								
								null check otr fingerprint before display  
							
							 
							
							
							
						 
						
							2015-07-11 21:23:58 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								78aff1329f 
								
							 
						 
						
							
							
								
								renamed HttpConnection to HttpDownloadConnection  
							
							 
							
							
							
						 
						
							2015-07-10 15:14:13 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ce79f4bbe3 
								
							 
						 
						
							
							
								
								renamed downloadable to transferable  
							
							 
							
							
							
						 
						
							2015-07-10 15:11:03 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								925801c14e 
								
							 
						 
						
							
							
								
								get file upload ready to work with https  
							
							 
							
							
							
						 
						
							2015-07-10 14:14:45 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								0f5c87ca1f 
								
							 
						 
						
							
							
								
								display toast in ui on failed http download  
							
							 
							
							... 
							
							
							
							fixes  #954  
							
						 
						
							2015-07-10 13:28:50 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b02ef0c62f 
								
							 
						 
						
							
							
								
								show timestamp on images in mucs  
							
							 
							
							... 
							
							
							
							fixes  #1178  
							
						 
						
							2015-07-10 12:42:41 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								492e387482 
								
							 
						 
						
							
							
								
								added null check in sasl response verifier  
							
							 
							
							
							
						 
						
							2015-07-10 12:16:30 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7eac30d1f4 
								
							 
						 
						
							
							
								
								catch number format exception in server ack  
							
							 
							
							
							
						 
						
							2015-07-10 12:09:59 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								26044ca229 
								
							 
						 
						
							
							
								
								print stack trace instead of writing error message to log in case of unknown exception in dnsutil  
							
							 
							
							
							
						 
						
							2015-07-09 13:40:08 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ef1429c9a6 
								
							 
						 
						
							
							
								
								show contacts name in non anonymous mucs.  fixes   #1213  
							
							 
							
							
							
						 
						
							2015-07-05 18:10:18 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								bef731a3c8 
								
							 
						 
						
							
							
								
								refactored sendMessage and merged with resendMessage  
							
							 
							
							
							
						 
						
							2015-07-05 11:59:38 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								2fbeb0bbb2 
								
							 
						 
						
							
							
								
								make sure unread count is initialized as 0.  fixes   #1270  
							
							 
							
							
							
						 
						
							2015-07-03 22:08:23 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d30fb6f0a1 
								
							 
						 
						
							
							
								
								avoid very rare npe  
							
							 
							
							
							
						 
						
							2015-07-03 21:32:46 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								1c86098f3b 
								
							 
						 
						
							
							
								
								Merge branch 'master' into development  
							
							 
							
							
							
						 
						
							2015-07-03 13:09:05 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								fc47969741 
								
							 
						 
						
							
							
								
								added fallback for non-srv dns queries  
							
							 
							
							
							
						 
						
							2015-07-03 13:07:48 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c745fbb562 
								
							 
						 
						
							
							
								
								fixed share with activity to account for http file upload  
							
							 
							
							
							
						 
						
							2015-07-02 23:51:59 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								e4d1bd415d 
								
							 
						 
						
							
							
								
								also offer http download for some 'well known extensions'  
							
							 
							
							
							
						 
						
							2015-07-02 23:19:50 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f5ba9d4223 
								
							 
						 
						
							
							
								
								refactored message context menu  
							
							 
							
							
							
						 
						
							2015-07-02 23:13:00 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a2525346f4 
								
							 
						 
						
							
							
								
								moved null check for to and from in message parser  
							
							 
							
							
							
						 
						
							2015-07-02 18:02:32 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c20a088ea8 
								
							 
						 
						
							
							
								
								changed mime type handling  
							
							 
							
							
							
						 
						
							2015-07-01 16:01:18 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c36238141d 
								
							 
						 
						
							
							
								
								disable automatic aes encryption for the time being  
							
							 
							
							
							
						 
						
							2015-06-30 20:19:18 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								9190e03076 
								
							 
						 
						
							
							
								
								changed namespace of the http upload feature  
							
							 
							
							
							
						 
						
							2015-06-30 20:11:50 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								aca9d8036c 
								
							 
						 
						
							
							
								
								made httpconnection (download) ready all kind of files  
							
							 
							
							
							
						 
						
							2015-06-30 17:15:02 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								6af97c724c 
								
							 
						 
						
							
							
								
								made storage path decision entirely based upon file extension  
							
							 
							
							
							
						 
						
							2015-06-30 14:04:39 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d7de311379 
								
							 
						 
						
							
							
								
								refactored bodyContainsDownloadable to be more flexible  
							
							 
							
							
							
						 
						
							2015-06-30 13:52:53 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5b42b392a1 
								
							 
						 
						
							
							
								
								always show copy original url in context menu when url is available  
							
							 
							
							
							
						 
						
							2015-06-30 13:01:04 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								0030bbf472 
								
							 
						 
						
							
							
								
								untested pgp support for http upload  
							
							 
							
							
							
						 
						
							2015-06-29 15:38:16 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								fdd46f1c91 
								
							 
						 
						
							
							
								
								added trigger to Config.java to always enable aes encryption for uploaded files  
							
							 
							
							
							
						 
						
							2015-06-29 15:21:41 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								82714dedfe 
								
							 
						 
						
							
							
								
								make quick actions available in conferences when file attachment is available  
							
							 
							
							
							
						 
						
							2015-06-29 15:21:41 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7e11570f2c 
								
							 
						 
						
							
							
								
								show attach button in conferences when http upload is available  
							
							 
							
							
							
						 
						
							2015-06-29 15:21:41 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								9eb9a52205 
								
							 
						 
						
							
							
								
								initial http upload support  
							
							 
							
							... 
							
							
							
							be careful: little error handling and no encryption 
							
						 
						
							2015-06-29 15:21:41 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								0d01e51da5 
								
							 
						 
						
							
							
								
								don't parse body from muc status messages  
							
							 
							
							
							
						 
						
							2015-06-28 22:14:40 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								46595b6d43 
								
							 
						 
						
							
							
								
								fixed parsing of muc status messages in new message parser  
							
							 
							
							
							
						 
						
							2015-06-28 20:11:28 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								3578263686 
								
							 
						 
						
							
							
								
								pulled new translations from transifex  
							
							 
							
							
							
						 
						
							2015-06-23 12:19:33 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5a48afdd4d 
								
							 
						 
						
							
							
								
								don't perform dns lookups on domain parts that obviously look like ip addresses  
							
							 
							
							
							
						 
						
							2015-06-19 16:25:08 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								58201b4408 
								
							 
						 
						
							
							
								
								changed paragraph divider  
							
							 
							
							
							
						 
						
							2015-06-10 03:30:17 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								0ea83832cd 
								
							 
						 
						
							
							
								
								pulled new translations from transifex  
							
							 
							
							
							
						 
						
							2015-06-10 03:29:52 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								9d1e8205a2 
								
							 
						 
						
							
							
								
								made i/o and memory intensive operations execute in serial order  
							
							 
							
							
							
						 
						
							2015-06-05 08:46:06 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a4e9f0c9c0 
								
							 
						 
						
							
							
								
								fixed obvious bug in dns helper  
							
							 
							
							
							
						 
						
							2015-06-04 16:26:51 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8f07e4c441 
								
							 
						 
						
							
							
								
								streamlined dns helper by ignoring weight  
							
							 
							
							
							
						 
						
							2015-06-04 02:48:07 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								6b794eca2c 
								
							 
						 
						
							
							
								
								send_received muc messages will mark a conversation a read  
							
							 
							
							
							
						 
						
							2015-06-04 02:47:24 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								53e8964dc1 
								
							 
						 
						
							
							
								
								reworked handeling of system contacts  
							
							 
							
							
							
						 
						
							2015-06-03 14:05:54 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								3eab3291de 
								
							 
						 
						
							
							
								
								properly calculate remaining size. should  fix   #1243  
							
							 
							
							
							
						 
						
							2015-06-03 03:05:20 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b40922d747 
								
							 
						 
						
							
							
								
								upgrade build tools  
							
							 
							
							
							
						 
						
							2015-06-02 14:10:49 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								fe1cff016f 
								
							 
						 
						
							
							
								
								avoid unnessary muc mam queries when message count is 0 after subject  
							
							 
							
							
							
						 
						
							2015-06-02 13:33:20 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8ac933be9f 
								
							 
						 
						
							
							
								
								fixed more edge cases in muc message parser  
							
							 
							
							
							
						 
						
							2015-06-02 12:21:35 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								df86b0fc47 
								
							 
						 
						
							
							
								
								improved compatibility with muc components that change the message id  
							
							 
							
							
							
						 
						
							2015-06-02 06:23:32 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a577ec7c31 
								
							 
						 
						
							
							
								
								let dns library take care of no-srv style hosts as well  
							
							 
							
							
							
						 
						
							2015-05-28 17:31:46 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5373956e19 
								
							 
						 
						
							
							
								
								use dns library to resolve missing ipv6 or ipv4 addresses  
							
							 
							
							
							
						 
						
							2015-05-28 16:55:48 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								165965bb83 
								
							 
						 
						
							
							
								
								parse nick and avatar only from available presences to avoid potential error reflection  
							
							 
							
							
							
						 
						
							2015-05-27 11:44:44 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								0f6f6adca0 
								
							 
						 
						
							
							
								
								removed unnecessary / inacurate debug logging  
							
							 
							
							
							
						 
						
							2015-05-26 13:04:22 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								402e5363d1 
								
							 
						 
						
							
							
								
								deduplicate private muc messages  
							
							 
							
							
							
						 
						
							2015-05-26 12:00:55 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								6059ed4738 
								
							 
						 
						
							
							
								
								update unread count badge only when necessary  
							
							 
							
							
							
						 
						
							2015-05-26 12:00:38 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								9debf8037b 
								
							 
						 
						
							
							
								
								added default iq handler to print some iq error messages  
							
							 
							
							
							
						 
						
							2015-05-26 11:31:33 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a423fc04fa 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2015-05-26 11:09:17 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								997b11dbec 
								
							 
						 
						
							
							
								
								added choose picture as another quick action.  fixes   #1221  
							
							 
							
							
							
						 
						
							2015-05-26 05:34:58 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								dc91ff8f29 
								
							 
						 
						
							
							
								
								renamed OtrEngine to OtrService  
							
							 
							
							
							
						 
						
							2015-05-26 04:36:32 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f579602456 
								
							 
						 
						
							
							
								
								Merge branch 'master' into development  
							
							 
							
							
							
						 
						
							2015-05-25 11:15:14 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								36034815ee 
								
							 
						 
						
							
							
								
								use same sm check inside xmppconnection and out  
							
							 
							
							
							
						 
						
							2015-05-25 04:54:11 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a535d45ec3 
								
							 
						 
						
							
							
								
								log connection age and reshedule ping check  
							
							 
							
							
							
						 
						
							2015-05-25 04:49:36 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								9d1a8c607f 
								
							 
						 
						
							
							
								
								Merge branch 'development' of github.com:siacs/Conversations into development  
							
							 
							
							
							
						 
						
							2015-05-21 09:19:56 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								75977818ea 
								
							 
						 
						
							
							
								
								Merge branch 'master' into development  
							
							 
							
							
							
						 
						
							2015-05-21 09:19:26 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								3cdac228f9 
								
							 
						 
						
							
							
								
								fixed with attaching wrong files when returning to activity and background service is still alive  
							
							 
							
							
							
						 
						
							2015-05-21 05:21:22 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d908b70340 
								
							 
						 
						
							
							
								
								Merge pull request  #1212  from emdete/add_jid_to_show_location  
							
							 
							
							... 
							
							
							
							fix to detect the sender jid correctly 
							
						 
						
							2015-05-20 18:31:18 +02:00  
						
					 
				
					
						
							
							
								 
								M. Dietrich
							
						 
						
							 
							
							
							
							
								
							
							
								4759607a77 
								
							 
						 
						
							
							
								
								fix to detect the sender jid correctly  
							
							 
							
							
							
						 
						
							2015-05-20 15:45:08 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								bb065680e5 
								
							 
						 
						
							
							
								
								Merge pull request  #1211  from emdete/add_jid_to_show_location  
							
							 
							
							... 
							
							
							
							add extra jid to intend "show location" 
							
						 
						
							2015-05-20 12:48:03 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								2364710afb 
								
							 
						 
						
							
							
								
								added ShortcutBadger as a dependency to create unread counts on launcher icon  
							
							 
							
							
							
						 
						
							2015-05-20 12:47:04 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a4ec7a7df1 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2015-05-20 12:26:38 +02:00  
						
					 
				
					
						
							
							
								 
								M. Dietrich
							
						 
						
							 
							
							
							
							
								
							
							
								78847d0749 
								
							 
						 
						
							
							
								
								add extra jid to intend "show location"  
							
							 
							
							
							
						 
						
							2015-05-20 11:37:10 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								70ebe35ffe 
								
							 
						 
						
							
							
								
								Merge branch 'master' into development  
							
							 
							
							
							
						 
						
							2015-05-20 08:25:42 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8064832dca 
								
							 
						 
						
							
							
								
								don't allow user to accidentally send empty messages  
							
							 
							
							
							
						 
						
							2015-05-20 08:25:00 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								201bc158bd 
								
							 
						 
						
							
							
								
								proper error parsing. some clean up  
							
							 
							
							
							
						 
						
							2015-05-20 03:48:14 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								9658146575 
								
							 
						 
						
							
							
								
								fixed npe in new message parser  
							
							 
							
							
							
						 
						
							2015-05-20 03:48:14 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								1b5631c835 
								
							 
						 
						
							
							
								
								fixed muc mam. added a few security checks  
							
							 
							
							
							
						 
						
							2015-05-20 03:48:14 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								eeebebe32a 
								
							 
						 
						
							
							
								
								fixed read/unread markers  
							
							 
							
							
							
						 
						
							2015-05-20 03:48:14 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b731995a51 
								
							 
						 
						
							
							
								
								added mam stuff to new message parser  
							
							 
							
							
							
						 
						
							2015-05-20 03:48:14 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d261feda74 
								
							 
						 
						
							
							
								
								rewrote parser code. mam id and possible other stuff still missing. also massivly untested  
							
							 
							
							
							
						 
						
							2015-05-20 03:48:14 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								e32f380dae 
								
							 
						 
						
							
							
								
								provide helper function for getting the content of a child directly  
							
							 
							
							
							
						 
						
							2015-05-20 03:48:14 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								73a4ffefdf 
								
							 
						 
						
							
							
								
								added fall back package id for voice recorder plugin  
							
							 
							
							
							
						 
						
							2015-05-20 03:27:52 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								bb60364488 
								
							 
						 
						
							
							
								
								hide block contact from context menu when server feature is not available  fixed   #1207  
							
							 
							
							
							
						 
						
							2015-05-19 08:31:56 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a0575c81ab 
								
							 
						 
						
							
							
								
								use same socket time out for jingle and xmpp connections  
							
							 
							
							
							
						 
						
							2015-05-18 08:48:08 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								1446a59fa5 
								
							 
						 
						
							
							
								
								use a 20s timeout on socks5 connections  
							
							 
							
							
							
						 
						
							2015-05-18 08:46:04 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								fbc43a8d38 
								
							 
						 
						
							
							
								
								don't offer initiator his own candidates  
							
							 
							
							
							
						 
						
							2015-05-18 08:45:50 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d672d578c9 
								
							 
						 
						
							
							
								
								fixed crash on failed account registry  
							
							 
							
							
							
						 
						
							2015-05-17 12:32:04 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								fce30f22c9 
								
							 
						 
						
							
							
								
								made white space check in bodyContainsDownloadable less aggresive  
							
							 
							
							
							
						 
						
							2015-05-16 12:49:04 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b4a8984b18 
								
							 
						 
						
							
							
								
								pulled new translations from transifex  
							
							 
							
							
							
						 
						
							2015-05-16 10:19:05 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								4151b72a6e 
								
							 
						 
						
							
							
								
								let jingle connection and manager handle message status  
							
							 
							
							
							
						 
						
							2015-05-16 04:12:53 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b6a7e56bf6 
								
							 
						 
						
							
							
								
								call StartConversationActivity in init mode only after adding the first account  
							
							 
							
							
							
						 
						
							2015-05-15 13:58:11 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								b69ee7125d 
								
							 
						 
						
							
							
								
								Force Nameprepping of JID domain parts  
							
							 
							
							... 
							
							
							
							The IDN.toAscii()/IDN.toUnicode() family only namepreps the original
domain passed to it if it contained non-ASCII characters. This means
that for all-ASCII domains, no canonicalization is performed, which
leads to issues like case-sensitivity. This workaround explicitly
namepreps domain parts before calling IDN.toAscii() on them, in order to
get a canonicalized representation (most notably, case invariance). A
basic DB migration is also included. 
							
						 
						
							2015-05-14 15:52:55 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8dfa701043 
								
							 
						 
						
							
							
								
								added a few location questions  
							
							 
							
							
							
						 
						
							2015-05-14 12:08:43 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8d472157a4 
								
							 
						 
						
							
							
								
								always log reason for failed file transfer  
							
							 
							
							
							
						 
						
							2015-05-14 11:57:51 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								4414cf3b27 
								
							 
						 
						
							
							
								
								ignore question marks in location question  
							
							 
							
							
							
						 
						
							2015-05-13 17:10:11 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								82878cded1 
								
							 
						 
						
							
							
								
								show location quick action after receiving a question about the users location  
							
							 
							
							
							
						 
						
							2015-05-13 16:23:20 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								6489ddac6c 
								
							 
						 
						
							
							
								
								clear avatar cache when uploading new avatar  
							
							 
							
							
							
						 
						
							2015-05-13 14:33:52 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								51aeeb766c 
								
							 
						 
						
							
							
								
								use zero width white space as message seperator  
							
							 
							
							
							
						 
						
							2015-05-13 11:56:59 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								93e620d685 
								
							 
						 
						
							
							
								
								removed debug logging  
							
							 
							
							
							
						 
						
							2015-05-12 04:40:57 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d3a6aa9f7a 
								
							 
						 
						
							
							
								
								handle conference invites differently to deal with killed activities.  fixes   #1188  
							
							 
							
							
							
						 
						
							2015-05-12 04:33:04 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								93e444ac3a 
								
							 
						 
						
							
							
								
								don't set unknown error in muc  
							
							 
							
							
							
						 
						
							2015-05-12 03:57:05 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								fe5c4cab46 
								
							 
						 
						
							
							
								
								don't reinit conversation when coming back to activity. avoids unnecessary scrolling  
							
							 
							
							
							
						 
						
							2015-05-12 03:56:13 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ceadf2f6fb 
								
							 
						 
						
							
							
								
								pulled updated translations from transifex  
							
							 
							
							
							
						 
						
							2015-05-11 14:28:36 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b6f85ba0dd 
								
							 
						 
						
							
							
								
								avoid using paragraph style breaks by accident  
							
							 
							
							
							
						 
						
							2015-05-11 14:18:30 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								9156665add 
								
							 
						 
						
							
							
								
								increased space between merged messages a bit  
							
							 
							
							
							
						 
						
							2015-05-11 09:20:08 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								53e43daa0d 
								
							 
						 
						
							
							
								
								add a little bit of space between merged messages.  
							
							 
							
							
							
						 
						
							2015-05-11 09:08:56 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								21deda7b00 
								
							 
						 
						
							
							
								
								no font padding on red hearts  
							
							 
							
							
							
						 
						
							2015-05-11 08:45:38 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								22b12091a1 
								
							 
						 
						
							
							
								
								rewrote parts of message adapter to avoid using NULL views  
							
							 
							
							
							
						 
						
							2015-05-11 07:57:52 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								239e86a98a 
								
							 
						 
						
							
							
								
								optimized heart render code a bit  
							
							 
							
							
							
						 
						
							2015-05-10 12:04:11 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								33d1621e3b 
								
							 
						 
						
							
							
								
								added white heart to new rendering as well  
							
							 
							
							
							
						 
						
							2015-05-10 11:56:23 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								e6d336c293 
								
							 
						 
						
							
							
								
								Merge branch 'development' of github.com:siacs/Conversations into development  
							
							 
							
							
							
						 
						
							2015-05-10 11:45:01 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								1e28f60038 
								
							 
						 
						
							
							
								
								changed conversation red to material red  
							
							 
							
							
							
						 
						
							2015-05-10 03:14:13 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								4c486f5e58 
								
							 
						 
						
							
							
								
								paint single unicode hearts as red and slightly larger  
							
							 
							
							
							
						 
						
							2015-05-10 03:12:44 +02:00  
						
					 
				
					
						
							
							
								 
								Andreas Shimokawa
							
						 
						
							 
							
							
							
							
								
							
							
								9e78e3e09d 
								
							 
						 
						
							
							
								
								only forward incoming chat messages to Pebble App and Gadgetbridge  
							
							 
							
							
							
						 
						
							2015-05-08 21:36:20 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d9e5035c08 
								
							 
						 
						
							
							
								
								config option to reset attempt counts when changing network (default=true)  
							
							 
							
							
							
						 
						
							2015-05-08 06:50:28 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c4a4dd2392 
								
							 
						 
						
							
							
								
								throw proper exception before changing account into error state  
							
							 
							
							
							
						 
						
							2015-05-08 06:30:06 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								e0653c0371 
								
							 
						 
						
							
							
								
								fixed encrypted ibb file transfer which was broken with ART.  fixes   #1172  
							
							 
							
							
							
						 
						
							2015-05-07 14:19:51 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								05f0aa614f 
								
							 
						 
						
							
							
								
								fixed npe when binval value of vcard avatar is null  
							
							 
							
							
							
						 
						
							2015-05-07 11:07:15 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d74e8a8a0e 
								
							 
						 
						
							
							
								
								fixed npe when missing instructions on failed register  
							
							 
							
							
							
						 
						
							2015-05-06 04:33:21 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								db726a59b8 
								
							 
						 
						
							
							
								
								fwiw don't allow stanza count to go over MAX_INT  
							
							 
							
							
							
						 
						
							2015-05-06 04:29:45 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b7c672e10e 
								
							 
						 
						
							
							
								
								avoid fetching avatars multiple times in parallel  
							
							 
							
							
							
						 
						
							2015-05-05 10:29:41 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5136bf9832 
								
							 
						 
						
							
							
								
								r/o support for vcard avatars. pep avatars will be prefered  
							
							 
							
							
							
						 
						
							2015-05-05 06:17:34 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								e6aa604ade 
								
							 
						 
						
							
							
								
								enabled sm logging by default at least for development branch  
							
							 
							
							
							
						 
						
							2015-05-05 06:10:47 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								61fd5d6696 
								
							 
						 
						
							
							
								
								clean up in attachment chooser code.  fixed   #1168  
							
							 
							
							
							
						 
						
							2015-05-04 09:54:10 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								2582ece210 
								
							 
						 
						
							
							
								
								open market if share location plugin isn't installed  
							
							 
							
							
							
						 
						
							2015-05-04 04:38:12 +02:00  
						
					 
				
					
						
							
							
								 
								Alexander Groshev
							
						 
						
							 
							
							
							
							
								
							
							
								d15da64c5d 
								
							 
						 
						
							
							
								
								Fix typos in URL to the project  
							
							 
							
							
							
						 
						
							2015-05-03 20:53:27 +03:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								43db9cdf4b 
								
							 
						 
						
							
							
								
								turn send button in cancel button while in whisper mode  
							
							 
							
							
							
						 
						
							2015-05-03 09:30:30 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c4bfffe6a9 
								
							 
						 
						
							
							
								
								mark account with incompatible server when no sasl mechansim could be found  
							
							 
							
							
							
						 
						
							2015-05-02 12:10:56 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								53fea9e1fe 
								
							 
						 
						
							
							
								
								replace send button with quick action button as long as no text has been entered  
							
							 
							
							
							
						 
						
							2015-05-02 11:38:56 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								e1fab8a488 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2015-05-01 13:52:19 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								bcdfdb9ccf 
								
							 
						 
						
							
							
								
								added config option to be a bit more verbose about stanza counts  
							
							 
							
							
							
						 
						
							2015-04-29 16:15:07 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f0d51fcb77 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2015-04-29 10:19:03 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								6a15bc26b6 
								
							 
						 
						
							
							
								
								npe check after reading image uri  
							
							 
							
							
							
						 
						
							2015-04-28 22:23:45 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d94c231a74 
								
							 
						 
						
							
							
								
								adjust dimens slightly to work with v21+ (v21 doesn't count the navigation bar)  
							
							 
							
							
							
						 
						
							2015-04-28 16:25:32 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								92d14c4a00 
								
							 
						 
						
							
							
								
								increased padding on image buttons on v21 to match material guidelines  
							
							 
							
							
							
						 
						
							2015-04-28 14:46:52 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								93e942f96d 
								
							 
						 
						
							
							
								
								made material icons smaller (24dp)  
							
							 
							
							
							
						 
						
							2015-04-28 14:28:51 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f3805b8bab 
								
							 
						 
						
							
							
								
								stop conference details from crashing when rotating the screen  
							
							 
							
							
							
						 
						
							2015-04-28 13:56:08 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								51bf8ec98e 
								
							 
						 
						
							
							
								
								fixed npe when rotating screen in contact details activity  
							
							 
							
							
							
						 
						
							2015-04-28 13:31:33 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b1843fb61a 
								
							 
						 
						
							
							
								
								print stack trace on io error  
							
							 
							
							
							
						 
						
							2015-04-28 09:35:10 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b10b8e2c50 
								
							 
						 
						
							
							
								
								escape nick in highlight regex pattern  
							
							 
							
							
							
						 
						
							2015-04-28 09:32:58 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f8e06d8e9a 
								
							 
						 
						
							
							
								
								revert undo timeout to a more reasonable value  
							
							 
							
							
							
						 
						
							2015-04-28 09:25:58 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a4ff8e3633 
								
							 
						 
						
							
							
								
								increased padding around switches in manage accounts  
							
							 
							
							
							
						 
						
							2015-04-27 12:19:05 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								4caa92e8ff 
								
							 
						 
						
							
							
								
								handle returning from camera without picture  
							
							 
							
							
							
						 
						
							2015-04-27 12:18:27 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								e11d658f5e 
								
							 
						 
						
							
							
								
								use xmppserviceconnection to send iq packets in jingle connection  
							
							 
							
							
							
						 
						
							2015-04-26 20:27:30 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c283fec0d1 
								
							 
						 
						
							
							
								
								hard code bitmap configs  
							
							 
							
							
							
						 
						
							2015-04-26 20:26:59 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7f2a83a684 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2015-04-26 10:48:36 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								0fda254d48 
								
							 
						 
						
							
							
								
								Merge pull request  #1135  from BrianBlade/manage_certificates  
							
							 
							
							... 
							
							
							
							Add option to remove manually approved certificates 
							
						 
						
							2015-04-25 19:09:50 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5ea1c547d5 
								
							 
						 
						
							
							
								
								fixed service discovery by properly storing and checking identities  
							
							 
							
							
							
						 
						
							2015-04-25 18:24:10 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								82daf849aa 
								
							 
						 
						
							
							
								
								fixed   #1039  
							
							 
							
							
							
						 
						
							2015-04-25 14:42:32 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								77caf73103 
								
							 
						 
						
							
							
								
								Merge pull request  #1146  from BrianBlade/minor_otr_tweaks  
							
							 
							
							... 
							
							
							
							OTR: Fix onContactStatusChanged & dont archive OTR 
							
						 
						
							2015-04-25 14:09:38 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d07baccf97 
								
							 
						 
						
							
							
								
								cleaned up file handling  
							
							 
							
							
							
						 
						
							2015-04-25 14:08:24 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5e1492fbff 
								
							 
						 
						
							
							
								
								send invite to other instanzes after creating ad hoc conference.  fixes   #1136  
							
							 
							
							
							
						 
						
							2015-04-23 17:37:47 +02:00  
						
					 
				
					
						
							
							
								 
								BrianBlade
							
						 
						
							 
							
							
							
							
								
							
							
								d6443d9b2f 
								
							 
						 
						
							
							
								
								OTR: Fix onContactStatusChanged & dont archive OTR  
							
							 
							
							... 
							
							
							
							- Fix session handling on contact status change: Do not reset
  potentially active sessions; check peer's OTR-resource on disconnect
- use no-permanent-store hint instead of no-store to ensure
  finished messages are delivered to offline/disconnected clients
- add no-permanent-store to ask compliant servers not to archive
  OTR messages 
							
						 
						
							2015-04-21 22:35:35 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								3a627f72fb 
								
							 
						 
						
							
							
								
								fixed direct invites  
							
							 
							
							
							
						 
						
							2015-04-21 18:36:11 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								e9783b80d1 
								
							 
						 
						
							
							
								
								added missing translations from transifex  
							
							 
							
							
							
						 
						
							2015-04-21 10:13:28 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								e7972d3d11 
								
							 
						 
						
							
							
								
								pulled latest translations from transifex  
							
							 
							
							
							
						 
						
							2015-04-20 20:32:50 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5d7e1159f5 
								
							 
						 
						
							
							
								
								always hide pgp snackbar after decrypting a message.  fixes   #1075  
							
							 
							
							
							
						 
						
							2015-04-20 12:13:47 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								127b7866f0 
								
							 
						 
						
							
							
								
								removed some dead code  
							
							 
							
							
							
						 
						
							2015-04-20 11:49:44 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d2c9bf31cd 
								
							 
						 
						
							
							
								
								fixed weird touch on snackbar switched conversation bug  
							
							 
							
							... 
							
							
							
							when touching the border of the snackbar or more precisely the space between the input field and the snackbar Conversations would switch into a random conversation for yet unknown reasons. 
							
						 
						
							2015-04-20 11:39:38 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								9e20a4936e 
								
							 
						 
						
							
							
								
								some code clean up to fix some rare NPE’s  
							
							 
							
							
							
						 
						
							2015-04-19 19:11:32 +02:00  
						
					 
				
					
						
							
							
								 
								BrianBlade
							
						 
						
							 
							
							
							
							
								
							
							
								da367dd752 
								
							 
						 
						
							
							
								
								Add option to remove manually approved certificates  
							
							 
							
							... 
							
							
							
							- "Remove certificates" option brings up a dialog that allows
  to delete certificates from MemorizingTrustManager's keystore
- Reconnect active accounts when certificate-settings are changed
- new preference category "Certificate options" 
							
						 
						
							2015-04-19 18:08:13 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								570a22206d 
								
							 
						 
						
							
							
								
								increased undo delay  
							
							 
							
							
							
						 
						
							2015-04-17 20:01:09 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								c4daa08170 
								
							 
						 
						
							
							
								
								fixed a bug in DNS helper code.  fixes   #1130  
							
							 
							
							
							
						 
						
							2015-04-16 21:56:03 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								65e760aefd 
								
							 
						 
						
							
							
								
								some bug fixes concerning 0byte files.  fixes   #1126  
							
							 
							
							
							
						 
						
							2015-04-15 15:36:16 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								f99e234b88 
								
							 
						 
						
							
							
								
								maintain state when rotating settings activity  
							
							 
							
							
							
						 
						
							2015-04-14 15:53:50 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								defb127d6e 
								
							 
						 
						
							
							
								
								Merge branch 'dont_trust_cas_preference' of  https://github.com/BrianBlade/Conversations  into BrianBlade-dont_trust_cas_preference  
							
							 
							
							... 
							
							
							
							Conflicts:
	src/main/res/values-de/strings.xml
	src/main/res/values/strings.xml 
							
						 
						
							2015-04-14 15:17:06 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								261b505f06 
								
							 
						 
						
							
							
								
								always show save button when account info was modified.  fixes   #918  
							
							 
							
							
							
						 
						
							2015-04-14 15:00:49 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								2f24b09309 
								
							 
						 
						
							
							
								
								fixed disable account when sliding and not clicking the toggle  
							
							 
							
							
							
						 
						
							2015-04-13 18:19:40 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								62faa163f0 
								
							 
						 
						
							
							
								
								fixed typos  
							
							 
							
							
							
						 
						
							2015-04-13 18:18:25 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8486f47dd9 
								
							 
						 
						
							
							
								
								Merge pull request  #1123  from lookshe/development  
							
							 
							
							... 
							
							
							
							Bugfix for issue #1121  
							
						 
						
							2015-04-13 17:57:33 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								4bf09bc10b 
								
							 
						 
						
							
							
								
								shut up linter  
							
							 
							
							
							
						 
						
							2015-04-13 17:35:20 +02:00  
						
					 
				
					
						
							
							
								 
								lookshe
							
						 
						
							 
							
							
							
							
								
							
							
								6da77bdf3b 
								
							 
						 
						
							
							
								
								Bugfix for issue  #1121  
							
							 
							
							... 
							
							
							
							check with lowercase to also match JPEG, JPeg ...
changed image url in comment 
							
						 
						
							2015-04-13 16:21:00 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								85cb1e4a37 
								
							 
						 
						
							
							
								
								Maintain private chat on MUC.  fixes   #1097  
							
							 
							
							
							
						 
						
							2015-04-13 16:00:04 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								845b39cdcc 
								
							 
						 
						
							
							
								
								fixed regression where the selected conversation wasn't highlighted anymore on tabled layout  
							
							 
							
							
							
						 
						
							2015-04-13 15:59:18 +02:00  
						
					 
				
					
						
							
							
								 
								BrianBlade
							
						 
						
							 
							
							
							
							
								
							
							
								878066ca99 
								
							 
						 
						
							
							
								
								Add option to use MTM without default TrustManager  
							
							 
							
							... 
							
							
							
							Add a new "Don't trust system CAs" preference under advanced options
that will change the behaviour of the MemorizingTrustManager. All
formerly unknown certificates will raise a warning if checked. 
							
						 
						
							2015-04-11 15:13:42 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								37d08276a8 
								
							 
						 
						
							
							
								
								allow sharing multiple images at once.  fixes   #1090  
							
							 
							
							
							
						 
						
							2015-04-11 14:53:10 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								332fe0fd19 
								
							 
						 
						
							
							
								
								don't resume old session when changing resource  
							
							 
							
							
							
						 
						
							2015-04-09 12:46:54 +02:00  
						
					 
				
					
						
							
							
								 
								BrianBlade
							
						 
						
							 
							
							
							
							
								
							
							
								dace8ba3d3 
								
							 
						 
						
							
							
								
								Enable end-conversation by swipe gesture  
							
							 
							
							... 
							
							
							
							Add EnhancedListView library de.timroes.android:EnhancedListView:0.3.4
to enable swipe-out for ListViews
Re-enable selectableItemBackground
Dont end selectedConversation on swipe
Call mConversationFragment.reinit() instead.
Add separate undo string for swipe MUC.
Add blacklistedConversation for undo swipe
Update title_undo_swipe_* strings
Fix undo(), rename blacklistedConversation
Fix discardUndo(); re-init selectedConversation
maintain scroll position after undo
clear notification when dismissing a conversation
modified / simplified maintain scroll position code
simplify handling of selectedConversation
change undo_muc string, remove notifyDataSetChanged() 
							
						 
						
							2015-04-08 23:29:52 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								59ea143147 
								
							 
						 
						
							
							
								
								Merge pull request  #1099  from BrianBlade/fix_otr_error_msgs  
							
							 
							
							... 
							
							
							
							Fix OTR-Error messages (#1021 ) 
							
						 
						
							2015-04-02 11:11:22 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								b7b87e1a8d 
								
							 
						 
						
							
							
								
								do not overlap account title and switch  
							
							 
							
							
							
						 
						
							2015-04-01 23:45:46 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								cb29c5bb15 
								
							 
						 
						
							
							
								
								Merge branch 'account_state_switch' of  https://github.com/BrianBlade/Conversations  into BrianBlade-account_state_switch  
							
							 
							
							
							
						 
						
							2015-04-01 23:24:35 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								1a376cacac 
								
							 
						 
						
							
							
								
								Merge pull request  #1076  from rk4an/patch-1  
							
							 
							
							... 
							
							
							
							Update french translation 
							
						 
						
							2015-04-01 20:30:00 +02:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								64d6a2970e 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2015-04-01 20:26:28 +02:00  
						
					 
				
					
						
							
							
								 
								BrianBlade
							
						 
						
							 
							
							
							
							
								
							
							
								db74cb52c4 
								
							 
						 
						
							
							
								
								Fix OTR-Error messages  
							
							 
							
							... 
							
							
							
							Send out OTR-Errors on unreadableMessageReceived() as well, not only on
messageFromAnotherInstanceReceived 
							
						 
						
							2015-04-01 20:03:09 +02:00  
						
					 
				
					
						
							
							
								 
								BrianBlade
							
						 
						
							 
							
							
							
							
								
							
							
								e64049c4fc 
								
							 
						 
						
							
							
								
								Add toggle account-state switch  
							
							 
							
							... 
							
							
							
							Add a switch to AccountAdapter that allows self-contained enabling/disabling of
accounts without the need to bring up the context-menu 
							
						 
						
							2015-04-01 12:47:59 +02:00  
						
					 
				
					
						
							
							
								 
								Erkan
							
						 
						
							 
							
							
							
							
								
							
							
								2a73173176 
								
							 
						 
						
							
							
								
								Update french translation  
							
							 
							
							
							
						 
						
							2015-03-22 20:09:53 +01:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								ad8f1902d1 
								
							 
						 
						
							
							
								
								pulled translations  
							
							 
							
							
							
						 
						
							2015-03-22 18:56:28 +01:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								c47d1e83c1 
								
							 
						 
						
							
							
								
								properly set chat states when receiving otr status messages  
							
							 
							
							
							
						 
						
							2015-03-21 16:43:03 +01:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								99b2ef7e9d 
								
							 
						 
						
							
							
								
								respond to unreadable OTR messages with error message.  fixed   #1021  
							
							 
							
							
							
						 
						
							2015-03-21 16:07:17 +01:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								da099e5fa4 
								
							 
						 
						
							
							
								
								wait for session iq to return sucessfully before sending other stanzas.  fixed   #1017  
							
							 
							
							
							
						 
						
							2015-03-20 21:48:45 +01:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								442ae12ee5 
								
							 
						 
						
							
							
								
								don't update presence for muc messages  
							
							 
							
							
							
						 
						
							2015-03-19 19:40:24 +01:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								0d6475d0d9 
								
							 
						 
						
							
							
								
								pulled more translations  
							
							 
							
							
							
						 
						
							2015-03-19 19:32:24 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								382bcc4cb5 
								
							 
						 
						
							
							
								
								Merge pull request  #1042  from BrianBlade/FIXES_muc-dlrs_muc-lastseen  
							
							 
							
							... 
							
							
							
							add delivery receipts for private muc msgs & enable update last-seen for muc-msgs 
							
						 
						
							2015-03-19 18:47:33 +01:00  
						
					 
				
					
						
							
							
								 
								BrianBlade
							
						 
						
							 
							
							
							
							
								
							
							
								1c600fefcf 
								
							 
						 
						
							
							
								
								# add delivery receipts for private muc msgs  
							
							 
							
							... 
							
							
							
							# enable update last-seen for muc-msgs 
							
						 
						
							2015-03-18 21:49:41 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a13c59fa1b 
								
							 
						 
						
							
							
								
								Merge pull request  #1043  from strb/choose_contact_multiple_squashed  
							
							 
							
							... 
							
							
							
							Added multiple select to Choose Contact Activity (squashed) 
							
						 
						
							2015-03-18 17:36:23 +01:00  
						
					 
				
					
						
							
							
								 
								Andreas Straub
							
						 
						
							 
							
							
							
							
								
							
							
								f76baa5658 
								
							 
						 
						
							
							
								
								Added multiple select to Choose Contact Activity  
							
							 
							
							... 
							
							
							
							When passing the Choose Contact Activity a boolean called "multiple"
set to true, it now allows the user to select multiple contacts. Long
pressing a contact enters multiple selection mode and the selection is
confirmed using a button in the CAB. The Activity returns whether or not
multiple contacts were selected using the same boolean. If multiple
contacts were selected, an array of JID strings called "contacts" is
returned. The Choose Contact Activity now also honors "filter_contacts",
an array of strings containing JIDs that should not be displayed in
the picker.
The invite to conference dialog now uses this feature to enable inviting
multiple contacts at once. Additionally, Invite Contact uses
"filter_contacts" to only display contacts that are not yet
participating in the conversation 
							
						 
						
							2015-03-18 17:11:50 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7ae357f863 
								
							 
						 
						
							
							
								
								Merge pull request  #1036  from QuentinC/development  
							
							 
							
							... 
							
							
							
							Green led color is better with "full-green" 
							
						 
						
							2015-03-18 17:11:43 +01:00  
						
					 
				
					
						
							
							
								 
								Holger Weiß
							
						 
						
							 
							
							
							
							
								
							
							
								52af62d298 
								
							 
						 
						
							
							
								
								Set file size also for cached avatars  
							
							 
							
							
							
						 
						
							2015-03-17 17:36:17 +01:00  
						
					 
				
					
						
							
							
								 
								iNPUTmice
							
						 
						
							 
							
							
							
							
								
							
							
								4aab45533a 
								
							 
						 
						
							
							
								
								pulled new translations from transifex  
							
							 
							
							
							
						 
						
							2015-03-16 11:52:42 +01:00  
						
					 
				
					
						
							
							
								 
								Mateusz "maxmati" Nowoty?ski
							
						 
						
							 
							
							
							
							
								
							
							
								74e5317095 
								
							 
						 
						
							
							
								
								Do not Strigprep JIDs from database  
							
							 
							
							
							
						 
						
							2015-03-11 15:59:31 +01:00