@@ -56,30 +56,32 @@ class LockFileRemoteOperation(
5656 * Returns the final status code and the method used.
5757 */
5858 private fun executeWithFallback (client : OwnCloudClient ): Pair <Int , Utf8PostMethod > {
59- val v2Method = buildPostMethod(client, LOCK_FILE_URL_V2 ).apply {
60- addRequestHeader(" Accept" , " application/json, text/plain, */*" )
61- addRequestHeader(CONTENT_TYPE , " application/json" )
62- addRequestHeader(E2EE_SUPPORTED_HEADER , " true" )
63- addRequestHeader(REQUESTED_WITH_HEADER , " XMLHttpRequest" )
64- setRequestEntity(StringRequestEntity (" {}" , " application/json" , " UTF-8" ))
65- val counter =
66- if (counter > 0 ) {
67- counter
68- } else {
69- DEFAULT_COUNTER
70- }
71- addRequestHeader(COUNTER_HEADER , counter.toString())
72- }
59+ val v2Method =
60+ buildPostMethod(client, LOCK_FILE_URL_V2 ).apply {
61+ addRequestHeader(" Accept" , " application/json, text/plain, */*" )
62+ addRequestHeader(CONTENT_TYPE , " application/json" )
63+ addRequestHeader(E2EE_SUPPORTED_HEADER , " true" )
64+ addRequestHeader(REQUESTED_WITH_HEADER , " XMLHttpRequest" )
65+ setRequestEntity(StringRequestEntity (" {}" , " application/json" , " UTF-8" ))
66+ val counter =
67+ if (counter > 0 ) {
68+ counter
69+ } else {
70+ DEFAULT_COUNTER
71+ }
72+ addRequestHeader(COUNTER_HEADER , counter.toString())
73+ }
7374
7475 val v2Status = client.executeMethod(v2Method, sessionTimeOut.readTimeOut, sessionTimeOut.connectionTimeOut)
7576
7677 val needsFallback = (v2Status == HttpStatus .SC_NOT_FOUND || v2Status == HttpStatus .SC_INTERNAL_SERVER_ERROR )
7778 if (! needsFallback) return v2Status to v2Method
7879
7980 v2Method.releaseConnection()
80- val v1Method = buildPostMethod(client, LOCK_FILE_URL_V1 ).apply {
81- addRequestHeader(CONTENT_TYPE , FORM_URLENCODED )
82- }
81+ val v1Method =
82+ buildPostMethod(client, LOCK_FILE_URL_V1 ).apply {
83+ addRequestHeader(CONTENT_TYPE , FORM_URLENCODED )
84+ }
8385 val v1Status = client.executeMethod(v1Method, sessionTimeOut.readTimeOut, sessionTimeOut.connectionTimeOut)
8486 return v1Status to v1Method
8587 }
0 commit comments