Merge pull request #651 from nextcloud/localId

tobiasKaminsky · web-flow · commit c4bf73dc4cb1 · 2023-01-19T09:10:19.000+01:00
Retrieve localId via webdav
diff --git a/library/src/androidTest/java/com/nextcloud/android/lib/resources/search/UnifiedSearchRemoteOperationIT.kt b/library/src/androidTest/java/com/nextcloud/android/lib/resources/search/UnifiedSearchRemoteOperationIT.kt
@@ -75,7 +75,7 @@ class UnifiedSearchRemoteOperationIT : AbstractIT() {
 
         assertNotNull(firstResult)
         assertEquals(remotePath, firstResult?.remotePath())
-        assertEquals(fileId, firstResult?.fileId())
+        assertEquals(fileId.toString(), firstResult?.fileId())
     }
 
     @Test
diff --git a/library/src/androidTest/java/com/owncloud/android/FileIT.java b/library/src/androidTest/java/com/owncloud/android/FileIT.java
@@ -328,4 +328,21 @@ public void testTwoSharees() {
             assertTrue(sharees.contains(user));
         }
     }
+
+    @Test
+    public void testLocalID() {
+        // create & verify folder
+        String path = "/testFolder/";
+        assertTrue(new CreateFolderRemoteOperation(path, true).execute(client).isSuccess());
+
+        RemoteOperationResult result = new ReadFolderRemoteOperation(path).execute(client);
+        assertTrue(result.isSuccess());
+
+        RemoteFile folder = (RemoteFile) result.getData().get(0);
+
+        // we do this only here for testing, this might not work on large installations
+        int localId = Integer.parseInt(folder.getRemoteId().substring(0, 8).replaceAll("^0*", ""));
+
+        assertEquals(folder.getLocalId(), localId);
+    }
 }
diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/SearchRemoteOperationIT.java b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/SearchRemoteOperationIT.java
@@ -81,7 +81,7 @@ public void testSearchByFileIdSuccess() {
         assertTrue(readFile.isSuccess());
 
         RemoteFile remoteFile = ((RemoteFile) readFile.getSingleData());
-        SearchRemoteOperation sut = new SearchRemoteOperation(remoteFile.getLocalId(),
+        SearchRemoteOperation sut = new SearchRemoteOperation(String.valueOf(remoteFile.getLocalId()),
                 SearchRemoteOperation.SearchType.FILE_ID_SEARCH,
                 false,
                 capability);
diff --git a/library/src/main/java/com/nextcloud/common/NextcloudUriDelegate.kt b/library/src/main/java/com/nextcloud/common/NextcloudUriDelegate.kt
@@ -65,7 +65,7 @@ class NextcloudUriDelegate(baseUri: Uri, var userId: String?) : NextcloudUriProv
         return "$filesDavUri${WebdavUtils.encodePath(path)}"
     }
 
-    override fun getCommentsUri(fileId: String): String {
+    override fun getCommentsUri(fileId: Long): String {
         return "$davUri/comments/files/$fileId"
     }
 }
diff --git a/library/src/main/java/com/nextcloud/common/NextcloudUriProvider.kt b/library/src/main/java/com/nextcloud/common/NextcloudUriProvider.kt
@@ -39,5 +39,5 @@ interface NextcloudUriProvider {
     val davUri: Uri
 
     fun getFilesDavUri(path: String): String
-    fun getCommentsUri(fileId: String): String
+    fun getCommentsUri(fileId: Long): String
 }
diff --git a/library/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java b/library/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -328,7 +328,7 @@ public Uri getDavUri() {
         return nextcloudUriDelegate.getDavUri();
     }
 
-    public String getCommentsUri(String fileId) {
+    public String getCommentsUri(long fileId) {
         return nextcloudUriDelegate.getCommentsUri(fileId);
     }
 
diff --git a/library/src/main/java/com/owncloud/android/lib/common/network/WebdavEntry.java b/library/src/main/java/com/owncloud/android/lib/common/network/WebdavEntry.java
@@ -54,10 +54,11 @@ public class WebdavEntry {
 
     private static final String TAG = WebdavEntry.class.getSimpleName();
 
-	public static final String NAMESPACE_OC = "http://owncloud.org/ns";
-	public static final String NAMESPACE_NC = "http://nextcloud.org/ns";
-	public static final String EXTENDED_PROPERTY_NAME_PERMISSIONS = "permissions";
-	public static final String EXTENDED_PROPERTY_NAME_REMOTE_ID = "id";
+    public static final String NAMESPACE_OC = "http://owncloud.org/ns";
+    public static final String NAMESPACE_NC = "http://nextcloud.org/ns";
+    public static final String EXTENDED_PROPERTY_NAME_PERMISSIONS = "permissions";
+    public static final String EXTENDED_PROPERTY_NAME_LOCAL_ID = "fileid";
+    public static final String EXTENDED_PROPERTY_NAME_REMOTE_ID = "id";
     public static final String EXTENDED_PROPERTY_NAME_SIZE = "size";
     public static final String EXTENDED_PROPERTY_FAVORITE = "favorite";
     public static final String EXTENDED_PROPERTY_IS_ENCRYPTED = "is-encrypted";
@@ -100,8 +101,12 @@ public class WebdavEntry {
     @Getter private String contentType;
     @Getter private String eTag;
     @Getter private String permissions;
-    @Getter private String remoteId;
-    @Getter private String trashbinOriginalLocation;
+    @Getter
+    private String remoteId;
+    @Getter
+    private long localId;
+    @Getter
+    private String trashbinOriginalLocation;
     @Getter private String trashbinFilename;
     @Getter private long trashbinDeletionTimestamp;
     @Getter @Setter private boolean favorite;
@@ -282,6 +287,12 @@ public WebdavEntry(MultiStatusResponse ms, String splitElement) {
                 remoteId = prop.getValue().toString();
             }
 
+            // OC remote id property <oc:fileid>
+            prop = propSet.get(EXTENDED_PROPERTY_NAME_LOCAL_ID, ocNamespace);
+            if (prop != null) {
+                localId = Long.parseLong((String) prop.getValue());
+            }
+
             // OC size property <oc:size>
             prop = propSet.get(EXTENDED_PROPERTY_NAME_SIZE, ocNamespace);
             if (prop != null) {
@@ -531,6 +542,7 @@ public boolean isDirectory() {
     private void resetData() {
         name = uri = contentType = permissions = null;
         remoteId = null;
+        localId = -1;
         contentLength = createTimestamp = modifiedTimestamp = 0;
         size = 0;
         quotaUsedBytes = null;
diff --git a/library/src/main/java/com/owncloud/android/lib/common/network/WebdavUtils.java b/library/src/main/java/com/owncloud/android/lib/common/network/WebdavUtils.java
@@ -102,6 +102,7 @@ public static DavPropertyNameSet getAllPropSet() {
         propSet.add(DavPropertyName.CREATIONDATE);
         propSet.add(DavPropertyName.GETETAG);
         propSet.add(WebdavEntry.EXTENDED_PROPERTY_NAME_PERMISSIONS, ocNamespace);
+        propSet.add(WebdavEntry.EXTENDED_PROPERTY_NAME_LOCAL_ID, ocNamespace);
         propSet.add(WebdavEntry.EXTENDED_PROPERTY_NAME_REMOTE_ID, ocNamespace);
         propSet.add(WebdavEntry.EXTENDED_PROPERTY_NAME_SIZE, ocNamespace);
         propSet.add(WebdavEntry.EXTENDED_PROPERTY_FAVORITE, ocNamespace);
@@ -145,6 +146,7 @@ public static DavPropertyNameSet getFilePropSet() {
         propSet.add(DavPropertyName.CREATIONDATE);
         propSet.add(DavPropertyName.GETETAG);
         propSet.add(WebdavEntry.EXTENDED_PROPERTY_NAME_PERMISSIONS, ocNamespace);
+        propSet.add(WebdavEntry.EXTENDED_PROPERTY_NAME_LOCAL_ID, ocNamespace);
         propSet.add(WebdavEntry.EXTENDED_PROPERTY_NAME_REMOTE_ID, ocNamespace);
         propSet.add(WebdavEntry.EXTENDED_PROPERTY_NAME_SIZE, ocNamespace);
         propSet.add(WebdavEntry.EXTENDED_PROPERTY_FAVORITE, ocNamespace);
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/activities/GetActivitiesRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/activities/GetActivitiesRemoteOperation.java
@@ -75,16 +75,16 @@ public class GetActivitiesRemoteOperation extends RemoteOperation {
 
     private int lastGiven = -1;
     
-    private String fileId = "";
+    private long fileId = -1;
 
     public GetActivitiesRemoteOperation() {
     }
 
-    public GetActivitiesRemoteOperation(String fileId) {
+    public GetActivitiesRemoteOperation(long fileId) {
         this.fileId = fileId;
     }
-    
-    public GetActivitiesRemoteOperation(String fileId, int lastGiven) {
+
+    public GetActivitiesRemoteOperation(long fileId, int lastGiven) {
         this.fileId = fileId;
         this.lastGiven = lastGiven;
     }
@@ -102,7 +102,7 @@ public RemoteOperationResult run(NextcloudClient client) {
         String url = client.getBaseUri() + OCS_ROUTE_V12_AND_UP;
 
         // add filter for fileId, if available
-        if (!fileId.isEmpty()) {
+        if (fileId > 0) {
             url = url + "/filter";
         }
 
@@ -119,10 +119,10 @@ public RemoteOperationResult run(NextcloudClient client) {
                 parameters.put("since", String.valueOf(lastGiven));
             }
 
-            if (!fileId.isEmpty()) {
+            if (fileId > 0) {
                 parameters.put("sort", "desc");
                 parameters.put("object_type", "files");
-                parameters.put("object_id", fileId);
+                parameters.put("object_id", String.valueOf(fileId));
             }
 
             get.setQueryString(parameters);
@@ -173,7 +173,7 @@ protected RemoteOperationResult run(OwnCloudClient client) {
         String url = client.getBaseUri() + OCS_ROUTE_V12_AND_UP;
         
         // add filter for fileId, if available
-        if (!fileId.isEmpty()) {
+        if (fileId > 0) {
             url = url + "/filter";
         }
         
@@ -191,10 +191,10 @@ protected RemoteOperationResult run(OwnCloudClient client) {
                 parameters.add(new NameValuePair("since", String.valueOf(lastGiven)));
             }
 
-            if (!fileId.isEmpty()) {
+            if (fileId > 0) {
                 parameters.add(new NameValuePair("sort", "desc"));
                 parameters.add(new NameValuePair("object_type", "files"));
-                parameters.add(new NameValuePair("object_id", fileId));
+                parameters.add(new NameValuePair("object_id", String.valueOf(fileId)));
             }
 
             get.setQueryString(parameters.toArray(new NameValuePair[]{}));
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/comments/CommentFileRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/comments/CommentFileRemoteOperation.java
@@ -58,15 +58,15 @@ public class CommentFileRemoteOperation extends RemoteOperation {
     private static final String VERB_VALUE = "comment";
     private static final String MESSAGE = "message";
 
-    private String message;
-    private String fileId;
+    private final String message;
+    private final long fileId;
 
     /**
      * Constructor
      *
      * @param message Comment to store
      */
-    public CommentFileRemoteOperation(String message, String fileId) {
+    public CommentFileRemoteOperation(String message, long fileId) {
         this.message = message;
         this.fileId = fileId;
     }
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/comments/MarkCommentsAsReadRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/comments/MarkCommentsAsReadRemoteOperation.java
@@ -47,9 +47,9 @@
 public class MarkCommentsAsReadRemoteOperation extends RemoteOperation {
     private static final String COMMENTS_URL = "/comments/files/";
 
-    private String fileId;
+    private final long fileId;
 
-    public MarkCommentsAsReadRemoteOperation(String fileId) {
+    public MarkCommentsAsReadRemoteOperation(long fileId) {
         this.fileId = fileId;
     }
 
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/GetMetadataRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/GetMetadataRemoteOperation.java
@@ -55,12 +55,12 @@ public class GetMetadataRemoteOperation extends RemoteOperation {
     private static final String NODE_DATA = "data";
     private static final String NODE_META_DATA = "meta-data";
 
-    private String fileId;
+    private final long fileId;
 
     /**
      * Constructor
      */
-    public GetMetadataRemoteOperation(String fileId) {
+    public GetMetadataRemoteOperation(long fileId) {
         this.fileId = fileId;
     }
 
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/LockFileRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/LockFileRemoteOperation.java
@@ -49,8 +49,8 @@ public class LockFileRemoteOperation extends RemoteOperation {
     private static final int SYNC_CONNECTION_TIMEOUT = 5000;
     private static final String LOCK_FILE_URL = "/ocs/v2.php/apps/end_to_end_encryption/api/v1/lock/";
 
-    private String localId;
-    private String token;
+    private final long localId;
+    private final String token;
 
     // JSON node names
     private static final String NODE_OCS = "ocs";
@@ -59,12 +59,12 @@ public class LockFileRemoteOperation extends RemoteOperation {
     /**
      * Constructor
      */
-    public LockFileRemoteOperation(String localId, String token) {
+    public LockFileRemoteOperation(long localId, String token) {
         this.localId = localId;
         this.token = token;
     }
 
-    public LockFileRemoteOperation(String localId) {
+    public LockFileRemoteOperation(long localId) {
         this.localId = localId;
         this.token = "";
     }
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/StoreMetadataRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/StoreMetadataRemoteOperation.java
@@ -56,13 +56,13 @@ public class StoreMetadataRemoteOperation extends RemoteOperation {
     private static final String NODE_DATA = "data";
     private static final String NODE_META_DATA = "meta-data";
 
-    private String fileId;
-    private String encryptedMetadataJson;
+    private final long fileId;
+    private final String encryptedMetadataJson;
 
     /**
      * Constructor
      */
-    public StoreMetadataRemoteOperation(String fileId, String encryptedMetadataJson) {
+    public StoreMetadataRemoteOperation(long fileId, String encryptedMetadataJson) {
         this.fileId = fileId;
         this.encryptedMetadataJson = encryptedMetadataJson;
     }
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/ToggleEncryptionRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/ToggleEncryptionRemoteOperation.java
@@ -49,14 +49,14 @@ public class ToggleEncryptionRemoteOperation extends RemoteOperation {
     private static final int SYNC_CONNECTION_TIMEOUT = 5000;
     private static final String ENCRYPTED_URL = "/ocs/v2.php/apps/end_to_end_encryption/api/v1/encrypted/";
 
-    private String localId;
-    private String remotePath;
-    private boolean encryption;
+    private final long localId;
+    private final String remotePath;
+    private final boolean encryption;
 
     /**
      * Constructor
      */
-    public ToggleEncryptionRemoteOperation(String localId, String remotePath, boolean encryption) {
+    public ToggleEncryptionRemoteOperation(long localId, String remotePath, boolean encryption) {
         this.localId = localId;
         this.remotePath = remotePath;
         this.encryption = encryption;
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/UnlockFileRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/UnlockFileRemoteOperation.java
@@ -45,13 +45,13 @@ public class UnlockFileRemoteOperation extends RemoteOperation {
     private static final int SYNC_CONNECTION_TIMEOUT = 5000;
     private static final String LOCK_FILE_URL = "/ocs/v2.php/apps/end_to_end_encryption/api/v1/lock/";
 
-    private String localId;
-    private String token;
+    private final long localId;
+    private final String token;
 
     /**
      * Constructor
      */
-    public UnlockFileRemoteOperation(String localId, String token) {
+    public UnlockFileRemoteOperation(long localId, String token) {
         this.localId = localId;
         this.token = token;
     }
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/UpdateMetadataRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/UpdateMetadataRemoteOperation.java
@@ -59,14 +59,14 @@ public class UpdateMetadataRemoteOperation extends RemoteOperation {
     private static final String NODE_DATA = "data";
     private static final String NODE_META_DATA = "meta-data";
 
-    private String fileId;
-    private String encryptedMetadataJson;
-    private String token;
+    private final long fileId;
+    private final String encryptedMetadataJson;
+    private final String token;
 
     /**
      * Constructor
      */
-    public UpdateMetadataRemoteOperation(String fileId, String encryptedMetadataJson, String token) {
+    public UpdateMetadataRemoteOperation(long fileId, String encryptedMetadataJson, String token) {
         this.fileId = fileId;
         this.encryptedMetadataJson = URLEncoder.encode(encryptedMetadataJson);
         this.token = token;
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/ReadFileVersionsRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/ReadFileVersionsRemoteOperation.java
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/RestoreFileVersionRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/RestoreFileVersionRemoteOperation.java
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/model/FileVersion.java b/library/src/main/java/com/owncloud/android/lib/resources/files/model/FileVersion.java
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/model/RemoteFile.java b/library/src/main/java/com/owncloud/android/lib/resources/files/model/RemoteFile.java
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/model/ServerFileInterface.java b/library/src/main/java/com/owncloud/android/lib/resources/files/model/ServerFileInterface.java
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/trashbin/model/TrashbinFile.java b/library/src/main/java/com/owncloud/android/lib/resources/trashbin/model/TrashbinFile.java

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ class UnifiedSearchRemoteOperationIT : AbstractIT() {`
`75`	`75`
`76`	`76`	`assertNotNull(firstResult)`
`77`	`77`	`assertEquals(remotePath, firstResult?.remotePath())`
`78`		`- assertEquals(fileId, firstResult?.fileId())`
	`78`	`+ assertEquals(fileId.toString(), firstResult?.fileId())`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ class NextcloudUriDelegate(baseUri: Uri, var userId: String?) : NextcloudUriProv`
`65`	`65`	`return "$filesDavUri${WebdavUtils.encodePath(path)}"`
`66`	`66`	`}`
`67`	`67`
`68`		`- override fun getCommentsUri(fileId: String): String {`
	`68`	`+ override fun getCommentsUri(fileId: Long): String {`
`69`	`69`	`return "$davUri/comments/files/$fileId"`
`70`	`70`	`}`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,5 @@ interface NextcloudUriProvider {`
`39`	`39`	`val davUri: Uri`
`40`	`40`
`41`	`41`	`fun getFilesDavUri(path: String): String`
`42`		`- fun getCommentsUri(fileId: String): String`
	`42`	`+ fun getCommentsUri(fileId: Long): String`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ public Uri getDavUri() {`
`328`	`328`	`return nextcloudUriDelegate.getDavUri();`
`329`	`329`	`}`
`330`	`330`
`331`		`- public String getCommentsUri(String fileId) {`
	`331`	`+ public String getCommentsUri(long fileId) {`
`332`	`332`	`return nextcloudUriDelegate.getCommentsUri(fileId);`
`333`	`333`	`}`
`334`	`334`
Original file line number	Diff line number	Diff line change
`@@ -75,16 +75,16 @@ public class GetActivitiesRemoteOperation extends RemoteOperation {`
`75`	`75`
`76`	`76`	`private int lastGiven = -1;`
`77`	`77`
`78`		`- private String fileId = "";`
	`78`	`+ private long fileId = -1;`
`79`	`79`
`80`	`80`	`public GetActivitiesRemoteOperation() {`
`81`	`81`	`}`
`82`	`82`
`83`		`- public GetActivitiesRemoteOperation(String fileId) {`
	`83`	`+ public GetActivitiesRemoteOperation(long fileId) {`
`84`	`84`	`this.fileId = fileId;`
`85`	`85`	`}`
`86`		`-`
`87`		`- public GetActivitiesRemoteOperation(String fileId, int lastGiven) {`
	`86`	`+`
	`87`	`+ public GetActivitiesRemoteOperation(long fileId, int lastGiven) {`
`88`	`88`	`this.fileId = fileId;`
`89`	`89`	`this.lastGiven = lastGiven;`
`90`	`90`	`}`
`@@ -102,7 +102,7 @@ public RemoteOperationResult run(NextcloudClient client) {`
`102`	`102`	`String url = client.getBaseUri() + OCS_ROUTE_V12_AND_UP;`
`103`	`103`
`104`	`104`	`// add filter for fileId, if available`
`105`		`- if (!fileId.isEmpty()) {`
	`105`	`+ if (fileId > 0) {`
`106`	`106`	`url = url + "/filter";`
`107`	`107`	`}`
`108`	`108`
`@@ -119,10 +119,10 @@ public RemoteOperationResult run(NextcloudClient client) {`
`119`	`119`	`parameters.put("since", String.valueOf(lastGiven));`
`120`	`120`	`}`
`121`	`121`
`122`		`- if (!fileId.isEmpty()) {`
	`122`	`+ if (fileId > 0) {`
`123`	`123`	`parameters.put("sort", "desc");`
`124`	`124`	`parameters.put("object_type", "files");`
`125`		`- parameters.put("object_id", fileId);`
	`125`	`+ parameters.put("object_id", String.valueOf(fileId));`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`get.setQueryString(parameters);`
`@@ -173,7 +173,7 @@ protected RemoteOperationResult run(OwnCloudClient client) {`
`173`	`173`	`String url = client.getBaseUri() + OCS_ROUTE_V12_AND_UP;`
`174`	`174`
`175`	`175`	`// add filter for fileId, if available`
`176`		`- if (!fileId.isEmpty()) {`
	`176`	`+ if (fileId > 0) {`
`177`	`177`	`url = url + "/filter";`
`178`	`178`	`}`
`179`	`179`
`@@ -191,10 +191,10 @@ protected RemoteOperationResult run(OwnCloudClient client) {`
`191`	`191`	`parameters.add(new NameValuePair("since", String.valueOf(lastGiven)));`
`192`	`192`	`}`
`193`	`193`
`194`		`- if (!fileId.isEmpty()) {`
	`194`	`+ if (fileId > 0) {`
`195`	`195`	`parameters.add(new NameValuePair("sort", "desc"));`
`196`	`196`	`parameters.add(new NameValuePair("object_type", "files"));`
`197`		`- parameters.add(new NameValuePair("object_id", fileId));`
	`197`	`+ parameters.add(new NameValuePair("object_id", String.valueOf(fileId)));`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`get.setQueryString(parameters.toArray(new NameValuePair[]{}));`