Browse Source

Merge pull request #11122 from nextcloud/fixTemplateId

Template id must be long, as it is fileID, which can be very big
Tobias Kaminsky 2 years ago
parent
commit
b40f7f6e0b

+ 1 - 1
app/src/main/java/com/owncloud/android/datamodel/Template.kt

@@ -28,7 +28,7 @@ import kotlinx.parcelize.Parcelize
  */
 @Parcelize
 data class Template(
-    val id: Int,
+    val id: Long,
     val name: String,
     val thumbnailLink: String,
     val type: Type,

+ 2 - 2
app/src/main/java/com/owncloud/android/files/CreateFileFromTemplateOperation.java

@@ -38,14 +38,14 @@ public class CreateFileFromTemplateOperation extends RemoteOperation {
     private static final String NEW_FROM_TEMPLATE_URL = "/ocs/v2.php/apps/richdocuments/api/v1/templates/new";
 
     private String path;
-    private int templateId;
+    private long templateId;
 
     // JSON node names
     private static final String NODE_OCS = "ocs";
     private static final String NODE_DATA = "data";
     private static final String JSON_FORMAT = "?format=json";
 
-    public CreateFileFromTemplateOperation(String path, int templateId) {
+    public CreateFileFromTemplateOperation(String path, long templateId) {
         this.path = path;
         this.templateId = templateId;
     }

+ 2 - 2
app/src/main/java/com/owncloud/android/files/FetchTemplateOperation.java

@@ -78,11 +78,11 @@ public class FetchTemplateOperation extends RemoteOperation {
                 for (int i = 0; i < templates.length(); i++) {
                     JSONObject templateObject = templates.getJSONObject(i);
 
-                    templateArray.add(new Template(templateObject.getInt("id"),
+                    templateArray.add(new Template(templateObject.getLong("id"),
                                                    templateObject.getString("name"),
                                                    templateObject.optString("preview"),
                                                    Template.Type.parse(templateObject.getString("type")
-                                                                            .toUpperCase(Locale.ROOT)),
+                                                                           .toUpperCase(Locale.ROOT)),
                                                    templateObject.getString("extension")));
                 }