David A. Velasco 
							
						 
					 
					
						
						
						
						
							
						
						
							39e3ddaa07 
							
						 
					 
					
						
						
							
							Merge pull request  #112  from owncloud/reliable_uploads_actions_uploads_view  
						
						... 
						
						
						
						Update to support changes for uploads view in OC app 
						
						
							
						
					 
					
						2016-03-30 13:45:23 +02:00 
						 
				 
			
				
					
						
							
							
								David A. Velasco 
							
						 
					 
					
						
						
						
						
							
						
						
							0bfc385707 
							
						 
					 
					
						
						
							
							Improved detection of exceptions in uplaods due to local errors  
						
						
						
						
							
						
					 
					
						2016-03-21 17:07:23 +01:00 
						 
				 
			
				
					
						
							
							
								David A. Velasco 
							
						 
					 
					
						
						
						
						
							
						
						
							78b9aa6247 
							
						 
					 
					
						
						
							
							Redirections to the Identity Provider (IdP) are translated into ResultCode.UNAUTHORIZED  
						
						
						
						
							
						
					 
					
						2016-03-21 16:48:12 +01:00 
						 
				 
			
				
					
						
							
							
								masensio 
							
						 
					 
					
						
						
						
						
							
						
						
							d36fa0b38b 
							
						 
					 
					
						
						
							
							Clean code  
						
						
						
						
							
						
					 
					
						2016-03-21 16:48:12 +01:00 
						 
				 
			
				
					
						
							
							
								Juan Carlos González Cabrero 
							
						 
					 
					
						
						
						
						
							
						
						
							023d8107ca 
							
						 
					 
					
						
						
							
							New Result code added to RemoteOperationResult  
						
						
						
						
							
						
					 
					
						2016-03-21 16:48:12 +01:00 
						 
				 
			
				
					
						
							
							
								David A. Velasco 
							
						 
					 
					
						
						
						
						
							
						
						
							e6eb4b6e53 
							
						 
					 
					
						
						
							
							Added DELAYED_FOR_WIFI to RemoteOperationResult  
						
						
						
						
							
						
					 
					
						2016-03-21 16:48:12 +01:00 
						 
				 
			
				
					
						
							
							
								David A. Velasco 
							
						 
					 
					
						
						
						
						
							
						
						
							e7891c4acb 
							
						 
					 
					
						
						
							
							Merge pull request  #113  from owncloud/edit_public_share_permission  
						
						... 
						
						
						
						Edit public share permission 
						
						
							
						
					 
					
						2016-03-21 09:35:05 +01:00 
						 
				 
			
				
					
						
							
							
								Juan Carlos González Cabrero 
							
						 
					 
					
						
						
						
						
							
						
						
							573afa1538 
							
						 
					 
					
						
						
							
							Update comment, error handling and indentation in the automatic test  
						
						
						
						
							
						
					 
					
						2016-03-21 09:05:47 +01:00 
						 
				 
			
				
					
						
							
							
								Juan Carlos González Cabrero 
							
						 
					 
					
						
						
						
						
							
						
						
							57aa370be0 
							
						 
					 
					
						
						
							
							Update public share tests and refactored publicUpload permission handling  
						
						
						
						
							
						
					 
					
						2016-03-21 09:05:47 +01:00 
						 
				 
			
				
					
						
							
							
								Juan Carlos González Cabrero 
							
						 
					 
					
						
						
						
						
							
						
						
							5c68c3f605 
							
						 
					 
					
						
						
							
							Added automated test for creation of the share operation with edit permission enabled  
						
						
						
						
							
						
					 
					
						2016-03-21 09:05:47 +01:00 
						 
				 
			
				
					
						
							
							
								Juan Carlos González Cabrero 
							
						 
					 
					
						
						
						
						
							
						
						
							46f930f6cf 
							
						 
					 
					
						
						
							
							Add new PUT argument for the public upload permission and include in the operation  
						
						
						
						
							
						
					 
					
						2016-03-21 09:05:47 +01:00 
						 
				 
			
				
					
						
							
							
								David A. Velasco 
							
						 
					 
					
						
						
						
						
							
						
						
							cf3baa6cd5 
							
						 
					 
					
						
						
							
							Merge pull request  #111  from owncloud/federated_sharing  
						
						... 
						
						
						
						Support for federated sharing 
						
						
							
						
					 
					
						2016-03-16 10:05:11 +01:00 
						 
				 
			
				
					
						
							
							
								Juan Carlos González Cabrero 
							
						 
					 
					
						
						
						
						
							
						
						
							996660b88c 
							
						 
					 
					
						
						
							
							Fix indentation errors  
						
						
						
						
							
						
					 
					
						2016-03-16 09:50:18 +01:00 
						 
				 
			
				
					
						
							
							
								Juan Carlos González Cabrero 
							
						 
					 
					
						
						
						
						
							
						
						
							547f7116ac 
							
						 
					 
					
						
						
							
							Merge branch 'federated_sharing' of  https://github.com/owncloud/android-library  into federated_sharing  
						
						
						
						
							
						
					 
					
						2016-03-16 09:48:21 +01:00 
						 
				 
			
				
					
						
							
							
								Juan Carlos González Cabrero 
							
						 
					 
					
						
						
						
						
							
						
						
							3fd4e3b898 
							
						 
					 
					
						
						
							
							Added new encrypted variable referencing the new QA server to travis config  
						
						
						
						
							
						
					 
					
						2016-03-16 09:16:52 +01:00 
						 
				 
			
				
					
						
							
							
								Juan Carlos González Cabrero 
							
						 
					 
					
						
						
						
						
							
						
						
							6c90e79c53 
							
						 
					 
					
						
						
							
							Added setup variable for a new QA server path  
						
						
						
						
							
						
					 
					
						2016-03-16 09:14:50 +01:00 
						 
				 
			
				
					
						
							
							
								Juan Carlos González Cabrero 
							
						 
					 
					
						
						
						
						
							
						
						
							add2aab31e 
							
						 
					 
					
						
						
							
							New tests for the federated sharing  
						
						
						
						
							
						
					 
					
						2016-03-16 09:13:20 +01:00 
						 
				 
			
				
					
						
							
							
								Juan Carlos González Cabrero 
							
						 
					 
					
						
						
						
						
							
						
						
							4d524100d5 
							
						 
					 
					
						
						
							
							Added new encrypted variable referencing the new QA server to travis config  
						
						
						
						
							
						
					 
					
						2016-03-09 14:01:41 +01:00 
						 
				 
			
				
					
						
							
							
								Juan Carlos González Cabrero 
							
						 
					 
					
						
						
						
						
							
						
						
							5dfd4cac5e 
							
						 
					 
					
						
						
							
							Added setup variable for a new QA server path  
						
						
						
						
							
						
					 
					
						2016-03-09 13:18:59 +01:00 
						 
				 
			
				
					
						
							
							
								Juan Carlos González Cabrero 
							
						 
					 
					
						
						
						
						
							
						
						
							0689213e72 
							
						 
					 
					
						
						
							
							New tests for the federated sharing  
						
						
						
						
							
						
					 
					
						2016-03-09 10:32:12 +01:00 
						 
				 
			
				
					
						
							
							
								Juan Carlos González Cabrero 
							
						 
					 
					
						
						
						
						
							
						
						
							1e1d424ffb 
							
						 
					 
					
						
						
							
							Fix comparison of share type in the GetShareesTest  
						
						
						
						
							
						
					 
					
						2016-03-07 13:55:18 +01:00 
						 
				 
			
				
					
						
							
							
								Juan Carlos González Cabrero 
							
						 
					 
					
						
						
						
						
							
						
						
							b13e584ac3 
							
						 
					 
					
						
						
							
							Remove the share type constants from GetRemoteShareesOperation  
						
						
						
						
							
						
					 
					
						2016-03-07 09:07:51 +01:00 
						 
				 
			
				
					
						
							
							
								Juan Carlos González Cabrero 
							
						 
					 
					
						
						
						
						
							
						
						
							36da2a2336 
							
						 
					 
					
						
						
							
							Parse the lists of remote users from the JSON response of the server  
						
						
						
						
							
						
					 
					
						2016-03-03 12:45:05 +01:00 
						 
				 
			
				
					
						
							
							
								Juan Carlos González Cabrero 
							
						 
					 
					
						
						
						
						
							
						
						
							23643ad28e 
							
						 
					 
					
						
						
							
							Added new share permissions for the federated shares  
						
						
						
						
							
						
					 
					
						2016-03-01 13:24:05 +01:00 
						 
				 
			
				
					
						
							
							
								Maria Asensio 
							
						 
					 
					
						
						
						
						
							
						
						
							1007a80534 
							
						 
					 
					
						
						
							
							Merge pull request  #109  from owncloud/target_marshmallow  
						
						... 
						
						
						
						Updated build target to Android APIv23 
						
						
							
						
					 
					
						2016-02-19 11:19:49 +01:00 
						 
				 
			
				
					
						
							
							
								David A. Velasco 
							
						 
					 
					
						
						
						
						
							
						
						
							27237576ef 
							
						 
					 
					
						
						
							
							Fixed wrong test case for shares, and warnings in test cases  
						
						
						
						
							
						
					 
					
						2016-02-16 13:31:55 +01:00 
						 
				 
			
				
					
						
							
							
								David A. Velasco 
							
						 
					 
					
						
						
						
						
							
						
						
							d17d8b9a52 
							
						 
					 
					
						
						
							
							Moved target folder for download test to private storage, to fix problems with runtime check of permissions in Android 6  
						
						
						
						
							
						
					 
					
						2016-02-16 12:45:26 +01:00 
						 
				 
			
				
					
						
							
							
								David A. Velasco 
							
						 
					 
					
						
						
						
						
							
						
						
							8b91c71d6f 
							
						 
					 
					
						
						
							
							Updated build target to Android APIv23  
						
						
						
						
							
						
					 
					
						2016-02-13 21:24:10 +01:00 
						 
				 
			
				
					
						
							
							
								David A. Velasco 
							
						 
					 
					
						
						
						
						
							
						
						
							4eb15976ea 
							
						 
					 
					
						
						
							
							Merge pull request  #108  from owncloud/stable  
						
						... 
						
						
						
						Update master with release 0.9.10 
						
						
							
						
					 
					
						2016-02-10 11:33:32 +01:00 
						 
				 
			
				
					
						
							
							
								David A. Velasco 
							
						 
					 
					
						
						
						
						
							
						
						
							a953a890d3 
							
						 
					 
					
						
						
							
							Added FEDERATED as an acceptable ShareType  
						
						
						
						
							
 
						
					 
					
						2016-02-05 14:23:41 +01:00 
						 
				 
			
				
					
						
							
							
								mendhak 
							
						 
					 
					
						
						
						
						
							
						
						
							59af0394ec 
							
						 
					 
					
						
						
							
							Allow asynchronous execution without handler  
						
						
						
						
							
						
					 
					
						2016-01-30 09:26:15 +00:00 
						 
				 
			
				
					
						
							
							
								mendhak 
							
						 
					 
					
						
						
						
						
							
						
						
							31836d3f4a 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
						
							
						
					 
					
						2016-01-30 08:34:24 +00:00 
						 
				 
			
				
					
						
							
							
								Maria Asensio 
							
						 
					 
					
						
						
						
						
							
						
						
							95919c9005 
							
						 
					 
					
						
						
							
							Merge pull request  #105  from owncloud/share__edit_privileges  
						
						... 
						
						
						
						Share  edit privileges 
						
						
							
						
					 
					
						2016-01-27 11:06:38 +01:00 
						 
				 
			
				
					
						
							
							
								David A. Velasco 
							
						 
					 
					
						
						
						
						
							
						
						
							ac9771ea3a 
							
						 
					 
					
						
						
							
							Migration to different test server  
						
						
						
						
							
						
					 
					
						2016-01-27 10:52:15 +01:00 
						 
				 
			
				
					
						
							
							
								David A. Velasco 
							
						 
					 
					
						
						
						
						
							
						
						
							b3535a3678 
							
						 
					 
					
						
						
							
							Updated automatic tests to cover share permissions updates  
						
						
						
						
							
						
					 
					
						2016-01-26 18:39:01 +01:00 
						 
				 
			
				
					
						
							
							
								David A. Velasco 
							
						 
					 
					
						
						
						
						
							
						
						
							275c042f78 
							
						 
					 
					
						
						
							
							Added constants for maximum Share permissions  
						
						
						
						
							
						
					 
					
						2016-01-18 13:55:35 +01:00 
						 
				 
			
				
					
						
							
							
								David A. Velasco 
							
						 
					 
					
						
						
						
						
							
						
						
							249cb901eb 
							
						 
					 
					
						
						
							
							Added support to update share permissions  
						
						
						
						
							
						
					 
					
						2016-01-11 12:13:19 +01:00 
						 
				 
			
				
					
						
							
							
								David A. Velasco 
							
						 
					 
					
						
						
						
						
							
						
						
							dad5cd115a 
							
						 
					 
					
						
						
							
							Added constants to analyze share permissions  
						
						
						
						
							
						
					 
					
						2016-01-11 12:13:17 +01:00 
						 
				 
			
				
					
						
							
							
								David A. Velasco 
							
						 
					 
					
						
						
						
						
							
						
						
							1b7a569040 
							
						 
					 
					
						
						
							
							Merge pull request  #68  from owncloud/close-resource  
						
						... 
						
						
						
						Close resource in finally block 
						
						
							
						
					 
					
						2015-12-16 18:19:42 +01:00 
						 
				 
			
				
					
						
							
							
								Lukas Reschke 
							
						 
					 
					
						
						
						
						
							
						
						
							d39d26f842 
							
						 
					 
					
						
						
							
							Close in finally block  
						
						
						
						
							
						
					 
					
						2015-12-16 18:08:36 +01:00 
						 
				 
			
				
					
						
							
							
								Lukas Reschke 
							
						 
					 
					
						
						
						
						
							
						
						
							5c87414390 
							
						 
					 
					
						
						
							
							Close resource in finally block  
						
						... 
						
						
						
						I don't quite get the reason for `mBuf` here as in `com.owncloud.android.lib.common.utils.Log_OC#appendLog` anyways a new `BufferedWriter` is started but it might make sense to close this here as this will otherwise cause warnings in static code scanners.
Didn't test this as I don't have a Java device and so it requires extensive testing. 
						
						
							
						
					 
					
						2015-12-16 18:08:35 +01:00 
						 
				 
			
				
					
						
							
							
								David A. Velasco 
							
						 
					 
					
						
						
						
						
							
						
						
							715a519523 
							
						 
					 
					
						
						
							
							Merge pull request  #100  from owncloud/stable  
						
						... 
						
						
						
						Fix bug related with sharee with special characters 
						
						
							
						
					 
					
						2015-12-09 16:19:45 +01:00 
						 
				 
			
				
					
						
							
							
								masensio 
							
						 
					 
					
						
						
						
						
							
						
						
							77c0d785c9 
							
						 
					 
					
						
						
							
							Fix bug related with sharee with special characters  
						
						
						
						
							
 
						
					 
					
						2015-11-26 13:26:24 +01:00 
						 
				 
			
				
					
						
							
							
								David A. Velasco 
							
						 
					 
					
						
						
						
						
							
						
						
							9e5c44ddb5 
							
						 
					 
					
						
						
							
							Merge pull request  #98  from owncloud/share_with_password_and_expiration_time  
						
						... 
						
						
						
						Changes to support update of password and expiration time in public shares 
						
						
							
						
					 
					
						2015-11-25 09:28:32 +01:00 
						 
				 
			
				
					
						
							
							
								David A. Velasco 
							
						 
					 
					
						
						
						
						
							
						
						
							9cf96a10ce 
							
						 
					 
					
						
						
							
							Fixed lost of share link when token exists  
						
						
						
						
							
						
					 
					
						2015-11-24 13:44:42 +01:00 
						 
				 
			
				
					
						
							
							
								masensio 
							
						 
					 
					
						
						
						
						
							
						
						
							1e3060633d 
							
						 
					 
					
						
						
							
							Add test for UpdateRemoteShareOperation  
						
						
						
						
							
						
					 
					
						2015-11-23 17:51:33 +01:00 
						 
				 
			
				
					
						
							
							
								David A. Velasco 
							
						 
					 
					
						
						
						
						
							
						
						
							f6bd45b2a7 
							
						 
					 
					
						
						
							
							Added support to update expiration date in an existing share  
						
						
						
						
							
						
					 
					
						2015-11-23 17:51:32 +01:00 
						 
				 
			
				
					
						
							
							
								David A. Velasco 
							
						 
					 
					
						
						
						
						
							
						
						
							206c7abf10 
							
						 
					 
					
						
						
							
							Fixed unit tests  
						
						
						
						
							
						
					 
					
						2015-11-23 17:51:31 +01:00 
						 
				 
			
				
					
						
							
							
								David A. Velasco 
							
						 
					 
					
						
						
						
						
							
						
						
							90615fc4ab 
							
						 
					 
					
						
						
							
							Added operation to update properties of exising share via link  
						
						
						
						
							
						
					 
					
						2015-11-23 17:51:30 +01:00 
						 
				 
			
				
					
						
							
							
								David A. Velasco 
							
						 
					 
					
						
						
						
						
							
						
						
							0238e51903 
							
						 
					 
					
						
						
							
							Prevent null values in OCShare members  
						
						
						
						
							
						
					 
					
						2015-11-23 17:51:29 +01:00