Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 9ae97485 authored by Andy Scherzinger's avatar Andy Scherzinger Committed by GitHub
Browse files

Merge pull request #158 from nextcloud/returnNeweTag 

Return new eTag
parents da41f323 7e34c28d

src/com/owncloud/android/lib/resources/files/CheckEtagOperation.java

+15 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ import org.apache.jackrabbit.webdav.client.methods.PropFindMethod; 
import org.apache.jackrabbit.webdav.property.DavPropertyName;

import org.apache.jackrabbit.webdav.property.DavPropertyNameSet;



import java.util.ArrayList;



/**

 * Check if file is up to date, by checking only eTag

 */
@@ -69,8 +71,21 @@ public class CheckEtagOperation extends RemoteOperation { 


                if (etag.equals(expectedEtag)) {

                    return new RemoteOperationResult(RemoteOperationResult.ResultCode.ETAG_UNCHANGED);

                } else {

                    RemoteOperationResult result = new RemoteOperationResult(

                            RemoteOperationResult.ResultCode.ETAG_CHANGED);



                    ArrayList<Object> list = new ArrayList<>();

                    list.add(etag);

                    result.setData(list);



                    return result;

                }

            }

            

            if (status == HttpStatus.SC_NOT_FOUND) {

                return new RemoteOperationResult(RemoteOperationResult.ResultCode.FILE_NOT_FOUND);

            }

        } catch (Exception e) {

            Log_OC.e(TAG, "Error while retrieving eTag");

        }