Skip to content

fix(template): fetch #17306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alperozturk96 wants to merge 2 commits into
base: master
Choose a base branch
from
+15 −6
Open

fix(template): fetch #17306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60c85fd
use uri
alperozturk96 Jul 8, 2026
5de9a6e
wip
alperozturk96 Jul 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions app/src/main/java/com/owncloud/android/files/FetchTemplateOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
*/
package com.owncloud.android.files;

import android.net.Uri;

import com.owncloud.android.datamodel.Template;
import com.owncloud.android.lib.common.OwnCloudClient;
import com.owncloud.android.lib.common.operations.RemoteOperation;
Expand All @@ -26,14 +28,15 @@ public class FetchTemplateOperation extends RemoteOperation {
private static final String TAG = FetchTemplateOperation.class.getSimpleName();
private static final int SYNC_READ_TIMEOUT = 40000;
private static final int SYNC_CONNECTION_TIMEOUT = 5000;
private static final String TEMPLATE_URL = "/ocs/v2.php/apps/richdocuments/api/v1/templates/";
private static final String TEMPLATE_ROUTE = "ocs/v2.php/apps/richdocuments/api/v1/templates";
private static final String PARAM_FORMAT = "format";
private static final String VALUE_FORMAT_JSON = "json";

private ChooseRichDocumentsTemplateDialogFragment.Type type;

// 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 FetchTemplateOperation(ChooseRichDocumentsTemplateDialogFragment.Type type) {
this.type = type;
Expand All @@ -44,9 +47,14 @@ protected RemoteOperationResult run(OwnCloudClient client) {
GetMethod getMethod = null;

try {
Uri uri = client.getBaseUri()
.buildUpon()
.appendEncodedPath(TEMPLATE_ROUTE)
.appendEncodedPath(type.toString().toLowerCase(Locale.ENGLISH))
.appendQueryParameter(PARAM_FORMAT, VALUE_FORMAT_JSON)
.build();

getMethod = new GetMethod(client.getBaseUri() + TEMPLATE_URL + type.toString().toLowerCase(Locale.ENGLISH) +
JSON_FORMAT);
getMethod = new GetMethod(uri.toString());

// remote request
getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
Expand Down Expand Up @@ -76,8 +84,9 @@ protected RemoteOperationResult run(OwnCloudClient client) {
result = new RemoteOperationResult(true, getMethod);
result.setData(templateArray);
} else {
String errorBody = getMethod.getResponseBodyAsString();
result = new RemoteOperationResult(false, getMethod);
client.exhaustResponse(getMethod.getResponseBodyAsStream());
Log_OC.e(TAG, "Get templates for type " + type + " failed with status " + status + ": " + errorBody);
}
} catch (Exception e) {
result = new RemoteOperationResult(e);
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ class ChooseRichDocumentsTemplateDialogFragment :
name,
fileDataStorageManager.getCapability(currentAccount.user),
requireContext(),
fileNames ?: setOf()
fileNames
)

return when {
Expand Down
Loading