diff options
Diffstat (limited to 'app/src/main/java/it/niedermann/nextcloud/deck/api/DeckAPI_SSO.java')
-rw-r--r-- | app/src/main/java/it/niedermann/nextcloud/deck/api/DeckAPI_SSO.java | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/DeckAPI_SSO.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/DeckAPI_SSO.java index 8e897d1cd..c5e7f6508 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/api/DeckAPI_SSO.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/DeckAPI_SSO.java @@ -41,11 +41,11 @@ public class DeckAPI_SSO implements DeckAPI { .setMethod(method) .setUrl(API_ENDPOINT + path) .setFollowRedirects(true); - if (lastSync!=null) { + if (lastSync != null) { String lastSyncHeader = API_FORMAT.format(lastSync); // omit Offset of timezone (e.g.: +01:00) if (lastSyncHeader.matches("^.*\\+[0-9]{2}:[0-9]{2}$")) { - lastSyncHeader = lastSyncHeader.substring(0, lastSyncHeader.length()-6); + lastSyncHeader = lastSyncHeader.substring(0, lastSyncHeader.length() - 6); } Log.d("deck lastSync", lastSyncHeader); @@ -57,19 +57,22 @@ public class DeckAPI_SSO implements DeckAPI { } return builder; } + private String buildEndpointPath(String path, Object... params) { String[] pathFragments = path.split("\\{[a-zA-Z0-9]*\\}"); StringBuffer sb = new StringBuffer(); int i = 0; - for (; i<pathFragments.length; i++) { + for (; i < pathFragments.length; i++) { sb.append(pathFragments[i]); sb.append(params.length > i ? params[i] : ""); } return sb.toString(); } + private NextcloudRequest.Builder buildRequest(String method, String path, Date lastSync, Object... params) { return buildRequest(method, buildEndpointPath(path, params), lastSync); } + private NextcloudRequest.Builder buildRequest(String method, String path, Object... params) { return buildRequest(method, path, null, params); } @@ -141,33 +144,33 @@ public class DeckAPI_SSO implements DeckAPI { @Override public Observable<Card> getCard(long boardId, long stackId, long cardId, Date lastSync) { - NextcloudRequest request = buildRequest(GET, "boards/{boardId}/stacks/{stackId}/cards/{cardId}",lastSync, boardId, stackId, cardId).build(); + NextcloudRequest request = buildRequest(GET, "boards/{boardId}/stacks/{stackId}/cards/{cardId}", lastSync, boardId, stackId, cardId).build(); return nextcloudAPI.performRequestObservable(Card.class, request); } @Override public Observable<Label> getLabel(long boardId, long labelId, Date lastSync) { - NextcloudRequest request = buildRequest(GET, "boards/"+boardId+"labels/"+labelId, lastSync).build(); + NextcloudRequest request = buildRequest(GET, "boards/" + boardId + "labels/" + labelId, lastSync).build(); return nextcloudAPI.performRequestObservable(Label.class, request); } @Override public Observable<Label> updateLabel(long boardId, long labelId, Label label) { - NextcloudRequest request = buildRequest(PUT, "boards/"+boardId+"/labels/"+labelId) + NextcloudRequest request = buildRequest(PUT, "boards/" + boardId + "/labels/" + labelId) .setRequestBody(GsonConfig.GetGson().toJson(label)).build(); return nextcloudAPI.performRequestObservable(Label.class, request); } @Override public Observable<Label> createLabel(long boardId, Label label) { - NextcloudRequest request = buildRequest(POST, "boards/"+boardId+"/labels") + NextcloudRequest request = buildRequest(POST, "boards/" + boardId + "/labels") .setRequestBody(GsonConfig.GetGson().toJson(label)).build(); return nextcloudAPI.performRequestObservable(Label.class, request); } @Override public Observable<Label> deleteLabel(long boardId, long labelId) { - NextcloudRequest request = buildRequest(DELETE, "boards/"+boardId+"/labels/"+labelId).build(); + NextcloudRequest request = buildRequest(DELETE, "boards/" + boardId + "/labels/" + labelId).build(); return nextcloudAPI.performRequestObservable(Board.class, request); } |