mirror of
				https://github.com/owncloud/android-library.git
				synced 2025-10-31 02:17:41 +00:00 
			
		
		
		
	Merge pull request #270 from owncloud/min_number_of_characters_to_search
Add min number of character to search capability
This commit is contained in:
		
						commit
						c67fa8b7b1
					
				| @ -60,7 +60,7 @@ class GetRemoteCapabilitiesOperation : RemoteOperation<RemoteCapability>() { | |||||||
| 
 | 
 | ||||||
|             val getMethod = GetMethod(URL(uriBuilder.build().toString())) |             val getMethod = GetMethod(URL(uriBuilder.build().toString())) | ||||||
| 
 | 
 | ||||||
|             getMethod.addRequestHeader(RemoteOperation.OCS_API_HEADER, RemoteOperation.OCS_API_HEADER_VALUE) |             getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE) | ||||||
| 
 | 
 | ||||||
|             val status = client.executeHttpMethod(getMethod) |             val status = client.executeHttpMethod(getMethod) | ||||||
| 
 | 
 | ||||||
| @ -123,6 +123,10 @@ class GetRemoteCapabilitiesOperation : RemoteOperation<RemoteCapability>() { | |||||||
|                                 respFilesSharing.getBoolean(PROPERTY_API_ENABLED) |                                 respFilesSharing.getBoolean(PROPERTY_API_ENABLED) | ||||||
|                             ) |                             ) | ||||||
|                         } |                         } | ||||||
|  |                         if (respFilesSharing.has(PROPERTY_SEARCH_MIN_LENGTH)){ | ||||||
|  |                             capability.filesSharingMinLength = respFilesSharing.getInt( | ||||||
|  |                                 PROPERTY_SEARCH_MIN_LENGTH) | ||||||
|  |                         } | ||||||
| 
 | 
 | ||||||
|                         if (respFilesSharing.has(NODE_PUBLIC)) { |                         if (respFilesSharing.has(NODE_PUBLIC)) { | ||||||
|                             val respPublic = respFilesSharing.getJSONObject(NODE_PUBLIC) |                             val respPublic = respFilesSharing.getJSONObject(NODE_PUBLIC) | ||||||
| @ -263,64 +267,65 @@ class GetRemoteCapabilitiesOperation : RemoteOperation<RemoteCapability>() { | |||||||
|         private val TAG = GetRemoteCapabilitiesOperation::class.java.simpleName |         private val TAG = GetRemoteCapabilitiesOperation::class.java.simpleName | ||||||
| 
 | 
 | ||||||
|         // OCS Routes |         // OCS Routes | ||||||
|         private val OCS_ROUTE = "ocs/v2.php/cloud/capabilities" |         private const val OCS_ROUTE = "ocs/v2.php/cloud/capabilities" | ||||||
| 
 | 
 | ||||||
|         // Arguments - names |         // Arguments - names | ||||||
|         private val PARAM_FORMAT = "format" |         private const val PARAM_FORMAT = "format" | ||||||
| 
 | 
 | ||||||
|         // Arguments - constant values |         // Arguments - constant values | ||||||
|         private val VALUE_FORMAT = "json" |         private const val VALUE_FORMAT = "json" | ||||||
| 
 | 
 | ||||||
|         // JSON Node names |         // JSON Node names | ||||||
|         private val NODE_OCS = "ocs" |         private const val NODE_OCS = "ocs" | ||||||
| 
 | 
 | ||||||
|         private val NODE_META = "meta" |         private const val NODE_META = "meta" | ||||||
| 
 | 
 | ||||||
|         private val NODE_DATA = "data" |         private const val NODE_DATA = "data" | ||||||
|         private val NODE_VERSION = "version" |         private const val NODE_VERSION = "version" | ||||||
| 
 | 
 | ||||||
|         private val NODE_CAPABILITIES = "capabilities" |         private const val NODE_CAPABILITIES = "capabilities" | ||||||
|         private val NODE_CORE = "core" |         private const val NODE_CORE = "core" | ||||||
| 
 | 
 | ||||||
|         private val NODE_FILES_SHARING = "files_sharing" |         private const val NODE_FILES_SHARING = "files_sharing" | ||||||
|         private val NODE_PUBLIC = "public" |         private const val NODE_PUBLIC = "public" | ||||||
|         private val NODE_PASSWORD = "password" |         private const val NODE_PASSWORD = "password" | ||||||
|         private val NODE_ENFORCED_FOR = "enforced_for" |         private const val NODE_ENFORCED_FOR = "enforced_for" | ||||||
|         private val NODE_EXPIRE_DATE = "expire_date" |         private const val NODE_EXPIRE_DATE = "expire_date" | ||||||
|         private val NODE_USER = "user" |         private const val NODE_USER = "user" | ||||||
|         private val NODE_FEDERATION = "federation" |         private const val NODE_FEDERATION = "federation" | ||||||
|         private val NODE_FILES = "files" |         private const val NODE_FILES = "files" | ||||||
| 
 | 
 | ||||||
|         private val PROPERTY_STATUS = "status" |         private const val PROPERTY_STATUS = "status" | ||||||
|         private val PROPERTY_STATUS_OK = "ok" |         private const val PROPERTY_STATUS_OK = "ok" | ||||||
|         private val PROPERTY_STATUSCODE = "statuscode" |         private const val PROPERTY_STATUSCODE = "statuscode" | ||||||
|         private val PROPERTY_MESSAGE = "message" |         private const val PROPERTY_MESSAGE = "message" | ||||||
| 
 | 
 | ||||||
|         private val PROPERTY_POLLINTERVAL = "pollinterval" |         private const val PROPERTY_POLLINTERVAL = "pollinterval" | ||||||
| 
 | 
 | ||||||
|         private val PROPERTY_MAJOR = "major" |         private const val PROPERTY_MAJOR = "major" | ||||||
|         private val PROPERTY_MINOR = "minor" |         private const val PROPERTY_MINOR = "minor" | ||||||
|         private val PROPERTY_MICRO = "micro" |         private const val PROPERTY_MICRO = "micro" | ||||||
|         private val PROPERTY_STRING = "string" |         private const val PROPERTY_STRING = "string" | ||||||
|         private val PROPERTY_EDITION = "edition" |         private const val PROPERTY_EDITION = "edition" | ||||||
| 
 | 
 | ||||||
|         private val PROPERTY_API_ENABLED = "api_enabled" |         private const val PROPERTY_API_ENABLED = "api_enabled" | ||||||
|         private val PROPERTY_ENABLED = "enabled" |         private const val PROPERTY_ENABLED = "enabled" | ||||||
|         private val PROPERTY_ENFORCED = "enforced" |         private const val PROPERTY_ENFORCED = "enforced" | ||||||
|         private val PROPERTY_ENFORCED_READ_ONLY = "read_only" |         private const val PROPERTY_ENFORCED_READ_ONLY = "read_only" | ||||||
|         private val PROPERTY_ENFORCED_READ_WRITE = "read_write" |         private const val PROPERTY_ENFORCED_READ_WRITE = "read_write" | ||||||
|         private val PROPERTY_ENFORCED_UPLOAD_ONLY = "upload_only" |         private const val PROPERTY_ENFORCED_UPLOAD_ONLY = "upload_only" | ||||||
|         private val PROPERTY_DAYS = "days" |         private const val PROPERTY_DAYS = "days" | ||||||
|         private val PROPERTY_SEND_MAIL = "send_mail" |         private const val PROPERTY_SEARCH_MIN_LENGTH = "search_min_length" | ||||||
|         private val PROPERTY_UPLOAD = "upload" |         private const val PROPERTY_SEND_MAIL = "send_mail" | ||||||
|         private val PROPERTY_UPLOAD_ONLY = "supports_upload_only" |         private const val PROPERTY_UPLOAD = "upload" | ||||||
|         private val PROPERTY_MULTIPLE = "multiple" |         private const val PROPERTY_UPLOAD_ONLY = "supports_upload_only" | ||||||
|         private val PROPERTY_RESHARING = "resharing" |         private const val PROPERTY_MULTIPLE = "multiple" | ||||||
|         private val PROPERTY_OUTGOING = "outgoing" |         private const val PROPERTY_RESHARING = "resharing" | ||||||
|         private val PROPERTY_INCOMING = "incoming" |         private const val PROPERTY_OUTGOING = "outgoing" | ||||||
|  |         private const val PROPERTY_INCOMING = "incoming" | ||||||
| 
 | 
 | ||||||
|         private val PROPERTY_BIGFILECHUNKING = "bigfilechunking" |         private const val PROPERTY_BIGFILECHUNKING = "bigfilechunking" | ||||||
|         private val PROPERTY_UNDELETE = "undelete" |         private const val PROPERTY_UNDELETE = "undelete" | ||||||
|         private val PROPERTY_VERSIONING = "versioning" |         private const val PROPERTY_VERSIONING = "versioning" | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,6 +1,7 @@ | |||||||
| /* ownCloud Android Library is available under MIT license | /* ownCloud Android Library is available under MIT license | ||||||
|  *   @author masensio |  *   @author masensio | ||||||
|  *   @author David González Verdugo |  *   @author David González Verdugo | ||||||
|  |  *   @author Abel García de Prada | ||||||
|  *   Copyright (C) 2019 ownCloud GmbH. |  *   Copyright (C) 2019 ownCloud GmbH. | ||||||
|  * |  * | ||||||
|  *   Permission is hereby granted, free of charge, to any person obtaining a copy |  *   Permission is hereby granted, free of charge, to any person obtaining a copy | ||||||
| @ -43,6 +44,7 @@ class RemoteCapability { | |||||||
| 
 | 
 | ||||||
|     // Files Sharing |     // Files Sharing | ||||||
|     var filesSharingApiEnabled: CapabilityBooleanType |     var filesSharingApiEnabled: CapabilityBooleanType | ||||||
|  |     var filesSharingMinLength: Int | ||||||
|     var filesSharingPublicEnabled: CapabilityBooleanType |     var filesSharingPublicEnabled: CapabilityBooleanType | ||||||
|     var filesSharingPublicPasswordEnforced: CapabilityBooleanType |     var filesSharingPublicPasswordEnforced: CapabilityBooleanType | ||||||
|     var filesSharingPublicPasswordEnforcedReadOnly: CapabilityBooleanType |     var filesSharingPublicPasswordEnforcedReadOnly: CapabilityBooleanType | ||||||
| @ -77,6 +79,7 @@ class RemoteCapability { | |||||||
|         corePollinterval = 0 |         corePollinterval = 0 | ||||||
| 
 | 
 | ||||||
|         filesSharingApiEnabled = CapabilityBooleanType.UNKNOWN |         filesSharingApiEnabled = CapabilityBooleanType.UNKNOWN | ||||||
|  |         filesSharingMinLength = 4 | ||||||
|         filesSharingPublicEnabled = CapabilityBooleanType.UNKNOWN |         filesSharingPublicEnabled = CapabilityBooleanType.UNKNOWN | ||||||
|         filesSharingPublicPasswordEnforced = CapabilityBooleanType.UNKNOWN |         filesSharingPublicPasswordEnforced = CapabilityBooleanType.UNKNOWN | ||||||
|         filesSharingPublicPasswordEnforcedReadOnly = CapabilityBooleanType.UNKNOWN |         filesSharingPublicPasswordEnforcedReadOnly = CapabilityBooleanType.UNKNOWN | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user