From 3d8c5acd25c350f45a0dddc08017dba9d9b438c3 Mon Sep 17 00:00:00 2001
From: desperateCoder <echotodevnull@gmail.com>
Date: Tue, 14 May 2019 19:49:32 +0200
Subject: started integration of NC API (for eg. capabilities, activities)

---
 .../niedermann/nextcloud/deck/api/ApiProvider.java | 20 +++++++----
 .../nextcloud/deck/api/NextcloudServerAPI.java     | 18 ++++++++++
 .../nextcloud/deck/api/RequestHelper.java          |  2 +-
 .../persistence/sync/adapters/ServerAdapter.java   | 40 +++++++++++-----------
 4 files changed, 52 insertions(+), 28 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudServerAPI.java

(limited to 'app')

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/ApiProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/ApiProvider.java
index 3ea636d62..9d2b19ea4 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/api/ApiProvider.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/ApiProvider.java
@@ -18,9 +18,11 @@ import retrofit2.NextcloudRetrofitApiBuilder;
 
 public class ApiProvider {
 
-    private static final String API_ENDPOINT = "/index.php/apps/deck/api/v1.0/";
+    private static final String DECK_API_ENDPOINT = "/index.php/apps/deck/api/v1.0/";
+    private static final String NC_API_ENDPOINT = "/ocs/v2.php/";
 
-    private DeckAPI mApi;
+    private DeckAPI deckAPI;
+    private NextcloudServerAPI nextcloudAPI;
     private Context context;
     private SingleSignOnAccount ssoAccount;
 
@@ -32,8 +34,8 @@ public class ApiProvider {
         try {
             setAccount();
             NextcloudAPI nextcloudAPI = new NextcloudAPI(context, ssoAccount, GsonConfig.getGson(), callback);
-            //mApi = new DeckAPI_SSO(nextcloudAPI);
-            mApi = new NextcloudRetrofitApiBuilder(nextcloudAPI, API_ENDPOINT).create(DeckAPI.class);
+            deckAPI = new NextcloudRetrofitApiBuilder(nextcloudAPI, DECK_API_ENDPOINT).create(DeckAPI.class);
+            this.nextcloudAPI = new NextcloudRetrofitApiBuilder(nextcloudAPI, NC_API_ENDPOINT).create(NextcloudServerAPI.class);
         } catch (SSOException e) {
             DeckLog.logError(e);
             callback.onError(e);
@@ -44,8 +46,12 @@ public class ApiProvider {
         ssoAccount = SingleAccountHelper.getCurrentSingleSignOnAccount(context);
     }
 
-    public DeckAPI getAPI() {
-        return mApi;
+    public DeckAPI getDeckAPI() {
+        return deckAPI;
+    }
+
+    public NextcloudServerAPI getNextcloudAPI() {
+        return nextcloudAPI;
     }
 
     public String getServerUrl() throws NextcloudFilesAppAccountNotFoundException, NoCurrentAccountSelectedException {
@@ -56,7 +62,7 @@ public class ApiProvider {
     }
 
     public String getApiPath(){
-        return API_ENDPOINT;
+        return DECK_API_ENDPOINT;
     }
 
     public String getApiUrl() throws NextcloudFilesAppAccountNotFoundException, NoCurrentAccountSelectedException {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudServerAPI.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudServerAPI.java
new file mode 100644
index 000000000..348d9cd7d
--- /dev/null
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudServerAPI.java
@@ -0,0 +1,18 @@
+package it.niedermann.nextcloud.deck.api;
+
+
+import io.reactivex.Observable;
+import it.niedermann.nextcloud.deck.model.Board;
+import it.niedermann.nextcloud.deck.model.full.FullBoard;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Query;
+
+public interface NextcloudServerAPI {
+
+    public static final String FORMAT_JSON = "format";
+
+    @GET("cloud/capabilities")
+    Observable<FullBoard> createBoard(@Body Board board, @Query("format") String format);
+
+}
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/RequestHelper.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/RequestHelper.java
index 3d91d2900..fcbe31acb 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/api/RequestHelper.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/RequestHelper.java
@@ -12,7 +12,7 @@ public class RequestHelper {
 
     public static <T> void request(final Activity sourceActivity, final ApiProvider provider, final ObservableProvider<T> call, final IResponseCallback<T> callback){
 
-        if (provider.getAPI() == null){
+        if (provider.getDeckAPI() == null){
             provider.initSsoApi(new NextcloudAPI.ApiConnectedListener() {
                 @Override public void onConnected() { /* great, nothing to do. */}
                 @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/ServerAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/ServerAdapter.java
index a8e8775e8..441983f5a 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/ServerAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/ServerAdapter.java
@@ -97,104 +97,104 @@ public class ServerAdapter {
 
     public void getBoards(IResponseCallback<List<FullBoard>> responseCallback) {
         RequestHelper.request(sourceActivity, provider, () ->
-                provider.getAPI().getBoards(true, getLastSyncDateFormatted(responseCallback.getAccount().getId())),
+                provider.getDeckAPI().getBoards(true, getLastSyncDateFormatted(responseCallback.getAccount().getId())),
                 responseCallback);
     }
 
     public void createBoard(Board board, IResponseCallback<FullBoard> responseCallback) {
         ensureInternetConnection();
-        RequestHelper.request(sourceActivity, provider, () -> provider.getAPI().createBoard(board), responseCallback);
+        RequestHelper.request(sourceActivity, provider, () -> provider.getDeckAPI().createBoard(board), responseCallback);
     }
 
     public void deleteBoard(Board board, IResponseCallback<Void> responseCallback) {
         ensureInternetConnection();
-        RequestHelper.request(sourceActivity, provider, () -> provider.getAPI().deleteBoard(board.getId()), responseCallback);
+        RequestHelper.request(sourceActivity, provider, () -> provider.getDeckAPI().deleteBoard(board.getId()), responseCallback);
     }
 
     public void updateBoard(Board board, IResponseCallback<FullBoard> responseCallback) {
         ensureInternetConnection();
-        RequestHelper.request(sourceActivity, provider, () -> provider.getAPI().updateBoard(board.getId(), board), responseCallback);
+        RequestHelper.request(sourceActivity, provider, () -> provider.getDeckAPI().updateBoard(board.getId(), board), responseCallback);
 
     }
 
     public void getStacks(long boardId, IResponseCallback<List<FullStack>> responseCallback) {
         ensureInternetConnection();
-        RequestHelper.request(sourceActivity, provider, () -> provider.getAPI().getStacks(boardId, getLastSyncDateFormatted(responseCallback.getAccount().getId())), responseCallback);
+        RequestHelper.request(sourceActivity, provider, () -> provider.getDeckAPI().getStacks(boardId, getLastSyncDateFormatted(responseCallback.getAccount().getId())), responseCallback);
     }
 
     public void getStack(long boardId, long stackId, IResponseCallback<FullStack> responseCallback) {
-        RequestHelper.request(sourceActivity, provider, () -> provider.getAPI().getStack(boardId, stackId, getLastSyncDateFormatted(responseCallback.getAccount().getId())), responseCallback);
+        RequestHelper.request(sourceActivity, provider, () -> provider.getDeckAPI().getStack(boardId, stackId, getLastSyncDateFormatted(responseCallback.getAccount().getId())), responseCallback);
     }
 
     public void createStack(Stack stack, IResponseCallback<FullStack> responseCallback) {
         ensureInternetConnection();
-        RequestHelper.request(sourceActivity, provider, () -> provider.getAPI().createStack(stack.getBoardId(), stack), responseCallback);
+        RequestHelper.request(sourceActivity, provider, () -> provider.getDeckAPI().createStack(stack.getBoardId(), stack), responseCallback);
     }
 
     public void deleteStack(Stack stack, IResponseCallback<Void> responseCallback) {
         ensureInternetConnection();
-        RequestHelper.request(sourceActivity, provider, () -> provider.getAPI().deleteStack(stack.getBoardId(), stack.getId()), responseCallback);
+        RequestHelper.request(sourceActivity, provider, () -> provider.getDeckAPI().deleteStack(stack.getBoardId(), stack.getId()), responseCallback);
 
     }
 
     public void updateStack(Stack stack, IResponseCallback<FullStack> responseCallback) {
         ensureInternetConnection();
-        RequestHelper.request(sourceActivity, provider, () -> provider.getAPI().updateStack(stack.getBoardId(), stack.getId(), stack), responseCallback);
+        RequestHelper.request(sourceActivity, provider, () -> provider.getDeckAPI().updateStack(stack.getBoardId(), stack.getId(), stack), responseCallback);
 
     }
 
     public void getCard(long boardId, long stackId, long cardId, IResponseCallback<FullCard> responseCallback) {
         ensureInternetConnection();
-        RequestHelper.request(sourceActivity, provider, () -> provider.getAPI().getCard(boardId, stackId, cardId, getLastSyncDateFormatted(responseCallback.getAccount().getId())), responseCallback);
+        RequestHelper.request(sourceActivity, provider, () -> provider.getDeckAPI().getCard(boardId, stackId, cardId, getLastSyncDateFormatted(responseCallback.getAccount().getId())), responseCallback);
     }
 
     public void createCard(long boardId, long stackId, Card card, IResponseCallback<FullCard> responseCallback) {
         ensureInternetConnection();
-        RequestHelper.request(sourceActivity, provider, () -> provider.getAPI().createCard(boardId, stackId, card), responseCallback);
+        RequestHelper.request(sourceActivity, provider, () -> provider.getDeckAPI().createCard(boardId, stackId, card), responseCallback);
     }
 
     public void deleteCard(long boardId, long stackId, Card card, IResponseCallback<Void> responseCallback) {
         ensureInternetConnection();
-        RequestHelper.request(sourceActivity, provider, () -> provider.getAPI().deleteCard(boardId, stackId, card.getId()), responseCallback);
+        RequestHelper.request(sourceActivity, provider, () -> provider.getDeckAPI().deleteCard(boardId, stackId, card.getId()), responseCallback);
     }
 
     public void updateCard(long boardId, long stackId, Card card, IResponseCallback<FullCard> responseCallback) {
         ensureInternetConnection();
-        RequestHelper.request(sourceActivity, provider, () -> provider.getAPI().updateCard(boardId, stackId, card.getId(), card), responseCallback);
+        RequestHelper.request(sourceActivity, provider, () -> provider.getDeckAPI().updateCard(boardId, stackId, card.getId(), card), responseCallback);
     }
 
     public void assignUserToCard(long boardId, long stackId, long cardId, String userUID, IResponseCallback<Void> responseCallback){
         ensureInternetConnection();
-        RequestHelper.request(sourceActivity, provider, () -> provider.getAPI().assignUserToCard(boardId, stackId, cardId, userUID), responseCallback);
+        RequestHelper.request(sourceActivity, provider, () -> provider.getDeckAPI().assignUserToCard(boardId, stackId, cardId, userUID), responseCallback);
     }
 
     public void unassignUserFromCard(long boardId, long stackId, long cardId, String userUID, IResponseCallback<Void> responseCallback){
         ensureInternetConnection();
-        RequestHelper.request(sourceActivity, provider, () -> provider.getAPI().unassignUserFromCard(boardId, stackId, cardId, userUID), responseCallback);
+        RequestHelper.request(sourceActivity, provider, () -> provider.getDeckAPI().unassignUserFromCard(boardId, stackId, cardId, userUID), responseCallback);
     }
 
     public void assignLabelToCard(long boardId, long stackId, long cardId, long labelId, IResponseCallback<Void> responseCallback){
         ensureInternetConnection();
-        RequestHelper.request(sourceActivity, provider, () -> provider.getAPI().assignLabelToCard(boardId, stackId, cardId, labelId), responseCallback);
+        RequestHelper.request(sourceActivity, provider, () -> provider.getDeckAPI().assignLabelToCard(boardId, stackId, cardId, labelId), responseCallback);
     }
 
     public void unassignLabelFromCard(long boardId, long stackId, long cardId, long labelId, IResponseCallback<Void> responseCallback){
         ensureInternetConnection();
-        RequestHelper.request(sourceActivity, provider, () -> provider.getAPI().unassignLabelFromCard(boardId, stackId, cardId, labelId), responseCallback);
+        RequestHelper.request(sourceActivity, provider, () -> provider.getDeckAPI().unassignLabelFromCard(boardId, stackId, cardId, labelId), responseCallback);
     }
 
 
     // ## LABELS
     public void createLabel(long boardId, Label label, IResponseCallback<Label> responseCallback){
         ensureInternetConnection();
-        RequestHelper.request(sourceActivity, provider, () -> provider.getAPI().createLabel(boardId, label), responseCallback);
+        RequestHelper.request(sourceActivity, provider, () -> provider.getDeckAPI().createLabel(boardId, label), responseCallback);
     }
     public void deleteLabel(long boardId, Label label, IResponseCallback<Void> responseCallback){
         ensureInternetConnection();
-        RequestHelper.request(sourceActivity, provider, () -> provider.getAPI().deleteLabel(boardId, label.getId()), responseCallback);
+        RequestHelper.request(sourceActivity, provider, () -> provider.getDeckAPI().deleteLabel(boardId, label.getId()), responseCallback);
     }
     public void updateLabel(long boardId, Label label, IResponseCallback<Label> responseCallback){
         ensureInternetConnection();
-        RequestHelper.request(sourceActivity, provider, () -> provider.getAPI().updateLabel(boardId, label.getId(), label), responseCallback);
+        RequestHelper.request(sourceActivity, provider, () -> provider.getDeckAPI().updateLabel(boardId, label.getId(), label), responseCallback);
     }
 }
-- 
cgit v1.2.3


From d4b1918f771e0eca7beffd67baf2c8bc9a4cb7bd Mon Sep 17 00:00:00 2001
From: desperateCoder <echotodevnull@gmail.com>
Date: Sat, 18 May 2019 17:16:06 +0200
Subject: capabilities WIP

---
 .../java/it/niedermann/nextcloud/deck/api/GsonConfig.java |  5 +++++
 .../niedermann/nextcloud/deck/api/JsonToEntityParser.java |  8 ++++++++
 .../nextcloud/deck/api/NextcloudDeserializer.java         |  3 +++
 .../niedermann/nextcloud/deck/api/NextcloudServerAPI.java | 15 +++++++--------
 .../niedermann/nextcloud/deck/model/ocs/Capabilities.java |  4 ++++
 .../nextcloud/deck/persistence/sync/SyncManager.java      |  8 ++++++++
 .../deck/persistence/sync/adapters/ServerAdapter.java     |  4 ++++
 7 files changed, 39 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Capabilities.java

(limited to 'app')

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonConfig.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonConfig.java
index c9fe83a13..129cf4e41 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonConfig.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonConfig.java
@@ -11,6 +11,7 @@ import it.niedermann.nextcloud.deck.model.Label;
 import it.niedermann.nextcloud.deck.model.full.FullBoard;
 import it.niedermann.nextcloud.deck.model.full.FullCard;
 import it.niedermann.nextcloud.deck.model.full.FullStack;
+import it.niedermann.nextcloud.deck.model.ocs.Capabilities;
 
 /**
  * Created by david on 27.06.17.
@@ -27,6 +28,8 @@ public class GsonConfig {
         Type label = new TypeToken<Label>() {}.getType();
         Type stackList = new TypeToken<List<FullStack>>() {}.getType();
         Type stack = new TypeToken<FullStack>() {}.getType();
+        Type capabilities = new TypeToken<Capabilities>() {}.getType();
+        Type capabilitiesList = new TypeToken<List<Capabilities>>() {}.getType();
 
         return new GsonBuilder()
                 .setLenient()
@@ -38,6 +41,8 @@ public class GsonConfig {
                 .registerTypeAdapter(label,         new NextcloudDeserializer<>("label", Label.class))
                 .registerTypeAdapter(stackList,     new NextcloudArrayDeserializer<>("stacks", FullStack.class))
                 .registerTypeAdapter(stack,         new NextcloudDeserializer<>("stack", FullStack.class))
+                .registerTypeAdapter(capabilitiesList,     new NextcloudArrayDeserializer<>("capabilities", Capabilities.class))
+                .registerTypeAdapter(capabilities,         new NextcloudDeserializer<>("capability", Capabilities.class))
                 .create();
     }
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java
index 61aab8ec5..765bf55c0 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java
@@ -27,6 +27,7 @@ import it.niedermann.nextcloud.deck.model.User;
 import it.niedermann.nextcloud.deck.model.full.FullBoard;
 import it.niedermann.nextcloud.deck.model.full.FullCard;
 import it.niedermann.nextcloud.deck.model.full.FullStack;
+import it.niedermann.nextcloud.deck.model.ocs.Capabilities;
 
 public class JsonToEntityParser {
     private static SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ssZ");
@@ -227,6 +228,13 @@ public class JsonToEntityParser {
         return user;
     }
 
+    protected static Capabilities parseCapabilities(JsonObject e) {
+        DeckLog.log(e.toString());
+        Capabilities capabilities = new Capabilities();
+
+        return capabilities;
+    }
+
     protected static FullStack parseStack(JsonObject e) {
         DeckLog.log(e.toString());
         FullStack fullStack = new FullStack();
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudDeserializer.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudDeserializer.java
index 4a5c6029c..3e18ae930 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudDeserializer.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudDeserializer.java
@@ -7,6 +7,8 @@ import com.google.gson.JsonParseException;
 
 import java.lang.reflect.Type;
 
+import it.niedermann.nextcloud.deck.DeckLog;
+
 /**
  * Created by david on 24.05.17.
  */
@@ -24,6 +26,7 @@ public class NextcloudDeserializer<T> implements JsonDeserializer<T> {
 
     @Override
     public T deserialize(final JsonElement json, final Type typeOfT, final JsonDeserializationContext context) throws JsonParseException {
+        DeckLog.log(json.toString());
         return JsonToEntityParser.parseJsonObject(json.getAsJsonObject(), mType);
 
     }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudServerAPI.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudServerAPI.java
index 348d9cd7d..d56a72e02 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudServerAPI.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudServerAPI.java
@@ -2,17 +2,16 @@ package it.niedermann.nextcloud.deck.api;
 
 
 import io.reactivex.Observable;
-import it.niedermann.nextcloud.deck.model.Board;
-import it.niedermann.nextcloud.deck.model.full.FullBoard;
-import retrofit2.http.Body;
+import it.niedermann.nextcloud.deck.model.ocs.Capabilities;
 import retrofit2.http.GET;
-import retrofit2.http.Query;
+import retrofit2.http.Headers;
 
 public interface NextcloudServerAPI {
 
-    public static final String FORMAT_JSON = "format";
-
-    @GET("cloud/capabilities")
-    Observable<FullBoard> createBoard(@Body Board board, @Query("format") String format);
+    @Headers({
+            "OCS-APIRequest: true"
+    })
+    @GET("cloud/capabilities?format=json")
+    Observable<Capabilities> getCapabilities();
 
 }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Capabilities.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Capabilities.java
new file mode 100644
index 000000000..70fd0064f
--- /dev/null
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Capabilities.java
@@ -0,0 +1,4 @@
+package it.niedermann.nextcloud.deck.model.ocs;
+
+public class Capabilities {
+}
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java
index d0b78ea98..9addbb060 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java
@@ -12,6 +12,7 @@ import com.nextcloud.android.sso.exceptions.NoCurrentAccountSelectedException;
 import java.util.Date;
 import java.util.List;
 
+import it.niedermann.nextcloud.deck.DeckLog;
 import it.niedermann.nextcloud.deck.api.IResponseCallback;
 import it.niedermann.nextcloud.deck.api.LastSyncUtil;
 import it.niedermann.nextcloud.deck.model.AccessControl;
@@ -25,6 +26,7 @@ import it.niedermann.nextcloud.deck.model.enums.DBStatus;
 import it.niedermann.nextcloud.deck.model.full.FullBoard;
 import it.niedermann.nextcloud.deck.model.full.FullCard;
 import it.niedermann.nextcloud.deck.model.full.FullStack;
+import it.niedermann.nextcloud.deck.model.ocs.Capabilities;
 import it.niedermann.nextcloud.deck.persistence.sync.adapters.ServerAdapter;
 import it.niedermann.nextcloud.deck.persistence.sync.adapters.db.DataBaseAdapter;
 import it.niedermann.nextcloud.deck.persistence.sync.adapters.db.util.WrappedLiveData;
@@ -158,6 +160,12 @@ public class SyncManager {
     }
 
     public LiveData<List<Board>> getBoards(long accountId) {
+        serverAdapter.getCapabilities(new IResponseCallback<Capabilities>(null) {
+            @Override
+            public void onResponse(Capabilities response) {
+                DeckLog.log(response.toString());
+            }
+        });
         return dataBaseAdapter.getBoards(accountId);
     }
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/ServerAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/ServerAdapter.java
index 441983f5a..13d2fe81a 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/ServerAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/ServerAdapter.java
@@ -29,6 +29,7 @@ import it.niedermann.nextcloud.deck.model.Stack;
 import it.niedermann.nextcloud.deck.model.full.FullBoard;
 import it.niedermann.nextcloud.deck.model.full.FullCard;
 import it.niedermann.nextcloud.deck.model.full.FullStack;
+import it.niedermann.nextcloud.deck.model.ocs.Capabilities;
 import it.niedermann.nextcloud.deck.util.DateUtil;
 
 public class ServerAdapter {
@@ -100,6 +101,9 @@ public class ServerAdapter {
                 provider.getDeckAPI().getBoards(true, getLastSyncDateFormatted(responseCallback.getAccount().getId())),
                 responseCallback);
     }
+    public void getCapabilities(IResponseCallback<Capabilities> responseCallback) {
+        RequestHelper.request(sourceActivity, provider, () -> provider.getNextcloudAPI().getCapabilities(), responseCallback);
+    }
 
     public void createBoard(Board board, IResponseCallback<FullBoard> responseCallback) {
         ensureInternetConnection();
-- 
cgit v1.2.3


From 81388ea9e6770e959500732d6ab767853c809fbe Mon Sep 17 00:00:00 2001
From: desperateCoder <echotodevnull@gmail.com>
Date: Mon, 20 May 2019 18:24:34 +0200
Subject: added missing type conversion

---
 .../main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java  | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app')

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java
index 765bf55c0..d412ea8c7 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java
@@ -45,6 +45,8 @@ public class JsonToEntityParser {
             return (T) parseStack(obj);
         } else if (mType == Label.class) {
             return (T) parseLabel(obj);
+        }  else if (mType == Capabilities.class) {
+            return (T) parseCapabilities(obj);
         }
         throw new IllegalArgumentException("unregistered type: " + mType.getCanonicalName());
     }
-- 
cgit v1.2.3


From 2092cb204c73dee344ee6669aa7043e026f5bcaf Mon Sep 17 00:00:00 2001
From: desperateCoder <echotodevnull@gmail.com>
Date: Fri, 31 May 2019 19:43:48 +0200
Subject: Show full stacktrace as in console

---
 .../nextcloud/deck/ui/exception/ExceptionActivity.java     | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'app')

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java
index 17ade2f45..709dff62b 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java
@@ -9,6 +9,8 @@ import android.widget.Toast;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.Objects;
 
 import butterknife.BindView;
@@ -36,11 +38,13 @@ public class ExceptionActivity extends AppCompatActivity {
         throwable.printStackTrace();
         Objects.requireNonNull(getSupportActionBar()).setTitle(getString(R.string.error));
         this.message.setText(throwable.getMessage());
-        StringBuilder concatenatedStacktrace = new StringBuilder();
-        for (StackTraceElement stackTraceElement : throwable.getStackTrace()) {
-            concatenatedStacktrace.append(stackTraceElement.toString()).append("\n");
-        }
-        this.stacktrace.setText(concatenatedStacktrace);
+        this.stacktrace.setText(getStacktraceOf(throwable));
+    }
+
+    private String getStacktraceOf(Throwable e) {
+        StringWriter sw = new StringWriter();
+        e.printStackTrace(new PrintWriter(sw));
+        return sw.toString();
     }
 
 
-- 
cgit v1.2.3


From 48c9f42e251ac696eaef24c93e7ff85ffbdd03f1 Mon Sep 17 00:00:00 2001
From: desperateCoder <echotodevnull@gmail.com>
Date: Sat, 13 Jul 2019 19:34:10 +0200
Subject: fixed card-constructor

---
 app/src/main/java/it/niedermann/nextcloud/deck/model/Card.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/Card.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Card.java
index dfe981a95..f7a26459a 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/Card.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Card.java
@@ -3,6 +3,7 @@ package it.niedermann.nextcloud.deck.model;
 import androidx.annotation.NonNull;
 import androidx.room.Entity;
 import androidx.room.ForeignKey;
+import androidx.room.Ignore;
 import androidx.room.Index;
 
 import java.util.Date;
@@ -45,8 +46,11 @@ public class Card extends AbstractRemoteEntity {
 
     public Card() {}
 
+    @Ignore
     public Card(String title, String description, long stackId) {
-
+        this.title = title;
+        this.description = description;
+        this.stackId = stackId;
     }
 
     public boolean isNotified() {
-- 
cgit v1.2.3


From ec9491dd8d5284ad527b97700de9d34860bca318 Mon Sep 17 00:00:00 2001
From: desperateCoder <echotodevnull@gmail.com>
Date: Sun, 21 Jul 2019 14:01:41 +0200
Subject: getting capabilities works.

---
 .../java/it/niedermann/nextcloud/deck/api/NextcloudServerAPI.java    | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'app')

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudServerAPI.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudServerAPI.java
index d56a72e02..2d5da416d 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudServerAPI.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudServerAPI.java
@@ -4,14 +4,9 @@ package it.niedermann.nextcloud.deck.api;
 import io.reactivex.Observable;
 import it.niedermann.nextcloud.deck.model.ocs.Capabilities;
 import retrofit2.http.GET;
-import retrofit2.http.Headers;
 
 public interface NextcloudServerAPI {
 
-    @Headers({
-            "OCS-APIRequest: true"
-    })
     @GET("cloud/capabilities?format=json")
     Observable<Capabilities> getCapabilities();
-
 }
-- 
cgit v1.2.3


From 69981bf9b47ce42af33fcde977eea2d953ece039 Mon Sep 17 00:00:00 2001
From: desperateCoder <echotodevnull@gmail.com>
Date: Sun, 21 Jul 2019 14:56:17 +0200
Subject: parsing capabilities

---
 .../nextcloud/deck/api/JsonToEntityParser.java     | 40 ++++++++++++++++++++++
 .../nextcloud/deck/model/ocs/Capabilities.java     | 21 ++++++++++++
 .../nextcloud/deck/model/ocs/Version.java          | 37 ++++++++++++++++++++
 3 files changed, 98 insertions(+)
 create mode 100644 app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Version.java

(limited to 'app')

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java
index 4a02df9a2..1f28993ab 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java
@@ -28,6 +28,7 @@ import it.niedermann.nextcloud.deck.model.full.FullBoard;
 import it.niedermann.nextcloud.deck.model.full.FullCard;
 import it.niedermann.nextcloud.deck.model.full.FullStack;
 import it.niedermann.nextcloud.deck.model.ocs.Capabilities;
+import it.niedermann.nextcloud.deck.model.ocs.Version;
 
 public class JsonToEntityParser {
     private static SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ssZ");
@@ -237,6 +238,45 @@ public class JsonToEntityParser {
         DeckLog.log(e.toString());
         Capabilities capabilities = new Capabilities();
 
+        if (e.has("ocs")){
+            JsonObject ocs = e.getAsJsonObject("ocs");
+            if (ocs.has("data")) {
+                JsonObject data = ocs.getAsJsonObject("data");
+                if (data.has("version")) {
+                    JsonObject version = data.getAsJsonObject("version");
+                    int major = version.get("major").getAsInt();
+                    int minor = version.get("minor").getAsInt();
+                    int micro = version.get("micro").getAsInt();
+                    Version v = new Version(major, minor, micro);
+                    capabilities.setNextcloudVersion(v);
+                }
+
+                int major = 0, minor = 0, micro = 0;
+                if (data.has("capabilities")) {
+                    JsonObject caps = data.getAsJsonObject("capabilities");
+                    if (caps.has("deck")) {
+                        JsonObject deck = caps.getAsJsonObject("deck");
+                        if (deck.has("version")) {
+                            String version = deck.get("version").getAsString();
+                            if (version != null && !version.trim().isEmpty()){
+                                String[] split = version.split("\\.");
+                                if (split.length > 0){
+                                    major = Integer.parseInt(split[0]);
+                                    if (split.length > 1) {
+                                        minor = Integer.parseInt(split[1]);
+                                        if (split.length > 2) {
+                                            micro = Integer.parseInt(split[2]);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                capabilities.setDeckVersion(new Version(major, minor, micro));
+            }
+        }
+
         return capabilities;
     }
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Capabilities.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Capabilities.java
index 70fd0064f..c4ad653a7 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Capabilities.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Capabilities.java
@@ -1,4 +1,25 @@
 package it.niedermann.nextcloud.deck.model.ocs;
 
 public class Capabilities {
+    Version deckVersion;
+    Version nextcloudVersion;
+
+    public Capabilities() {
+    }
+
+    public Version getDeckVersion() {
+        return deckVersion;
+    }
+
+    public void setDeckVersion(Version deckVersion) {
+        this.deckVersion = deckVersion;
+    }
+
+    public Version getNextcloudVersion() {
+        return nextcloudVersion;
+    }
+
+    public void setNextcloudVersion(Version nextcloudVersion) {
+        this.nextcloudVersion = nextcloudVersion;
+    }
 }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Version.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Version.java
new file mode 100644
index 000000000..3749fd6ca
--- /dev/null
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Version.java
@@ -0,0 +1,37 @@
+package it.niedermann.nextcloud.deck.model.ocs;
+
+public class Version {
+    private int major;
+    private int minor;
+    private int micro;
+
+    public Version(int major, int minor, int micro) {
+        this.major = major;
+        this.minor = minor;
+        this.micro = micro;
+    }
+
+    public int getMajor() {
+        return major;
+    }
+
+    public void setMajor(int major) {
+        this.major = major;
+    }
+
+    public int getMinor() {
+        return minor;
+    }
+
+    public void setMinor(int minor) {
+        this.minor = minor;
+    }
+
+    public int getMicro() {
+        return micro;
+    }
+
+    public void setMicro(int micro) {
+        this.micro = micro;
+    }
+}
-- 
cgit v1.2.3


From 730256a0884ab8cce157797592a90d626f4c86f4 Mon Sep 17 00:00:00 2001
From: desperateCoder <echotodevnull@gmail.com>
Date: Tue, 30 Jul 2019 19:20:45 +0200
Subject: finalize server fetching from server

---
 .../nextcloud/deck/model/ocs/Version.java          | 24 +++++++++++++++++++++-
 .../deck/persistence/sync/SyncManager.java         | 11 ++++------
 .../persistence/sync/adapters/ServerAdapter.java   |  1 +
 3 files changed, 28 insertions(+), 8 deletions(-)

(limited to 'app')

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Version.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Version.java
index 3749fd6ca..c44d72b99 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Version.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Version.java
@@ -1,6 +1,6 @@
 package it.niedermann.nextcloud.deck.model.ocs;
 
-public class Version {
+public class Version implements Comparable<Version>{
     private int major;
     private int minor;
     private int micro;
@@ -34,4 +34,26 @@ public class Version {
     public void setMicro(int micro) {
         this.micro = micro;
     }
+
+    public boolean isGreaterOrEqualTo(Version v){
+        return compareTo(v) >= 0;
+    }
+
+    @Override
+    public int compareTo(Version o) {
+        if (o.getMajor() > getMajor()) {
+            return -1;
+        } else if (o.getMajor() < getMajor()) {
+            return 1;
+        } else if (o.getMinor() > getMinor()) {
+            return -1;
+        } else if (o.getMinor() < getMinor()) {
+            return 1;
+        } else if (o.getMicro() > getMicro()) {
+            return -1;
+        } else if (o.getMicro() < getMicro()) {
+            return 1;
+        }
+        return 0;
+    }
 }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java
index 34443e6f7..d1aa8190e 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java
@@ -12,7 +12,6 @@ import com.nextcloud.android.sso.exceptions.NoCurrentAccountSelectedException;
 import java.util.Date;
 import java.util.List;
 
-import it.niedermann.nextcloud.deck.DeckLog;
 import it.niedermann.nextcloud.deck.api.IResponseCallback;
 import it.niedermann.nextcloud.deck.api.LastSyncUtil;
 import it.niedermann.nextcloud.deck.model.AccessControl;
@@ -160,13 +159,11 @@ public class SyncManager {
         return dataBaseAdapter.readAccounts();
     }
 
+    public void getServerVersion(IResponseCallback<Capabilities> callback){
+        serverAdapter.getCapabilities(callback);
+    }
+
     public LiveData<List<Board>> getBoards(long accountId) {
-        serverAdapter.getCapabilities(new IResponseCallback<Capabilities>(null) {
-            @Override
-            public void onResponse(Capabilities response) {
-                DeckLog.log(response.toString());
-            }
-        });
         return dataBaseAdapter.getBoards(accountId);
     }
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/ServerAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/ServerAdapter.java
index 3da81906e..53c9aed37 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/ServerAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/ServerAdapter.java
@@ -103,6 +103,7 @@ public class ServerAdapter {
                 responseCallback);
     }
     public void getCapabilities(IResponseCallback<Capabilities> responseCallback) {
+        ensureInternetConnection();
         RequestHelper.request(sourceActivity, provider, () -> provider.getNextcloudAPI().getCapabilities(), responseCallback);
     }
 
-- 
cgit v1.2.3