diff options
Diffstat (limited to 'app/src/main/java/it/niedermann/nextcloud/deck/api')
6 files changed, 35 insertions, 11 deletions
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 76ce90fac..da015c7b5 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 @@ -44,8 +44,6 @@ public class ApiProvider { nextcloudAPI = new NextcloudAPI(context, ssoAccount, GsonConfig.GetGson(), new NextcloudAPI.ApiConnectedListener() { @Override public void onConnected() { - Log.e("deck", "################## Connected"); - mApi = new DeckAPI_SSO(nextcloudAPI); callback.onConnected(); } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/DeckAPI.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/DeckAPI.java index 44ac4fc2e..2d815d6bc 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/api/DeckAPI.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/DeckAPI.java @@ -4,7 +4,7 @@ package it.niedermann.nextcloud.deck.api; import java.util.List; import io.reactivex.Observable; -import it.niedermann.nextcloud.deck.model.Board; +import it.niedermann.nextcloud.deck.model.board.Board; import retrofit2.http.GET; public interface DeckAPI { 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 aa2ed0203..dbe494158 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 @@ -8,11 +8,11 @@ import java.lang.reflect.Type; import java.util.List; import io.reactivex.Observable; -import it.niedermann.nextcloud.deck.model.Board; +import it.niedermann.nextcloud.deck.model.board.Board; public class DeckAPI_SSO implements DeckAPI { - private static final String mApiEndpoint = "/index.php/apps/deck/"; + private static final String mApiEndpoint = "/index.php/apps/deck/api/v1.0/"; private NextcloudAPI nextcloudAPI; public DeckAPI_SSO(NextcloudAPI nextcloudAPI) { @@ -25,6 +25,7 @@ public class DeckAPI_SSO implements DeckAPI { NextcloudRequest request = new NextcloudRequest.Builder() .setMethod("GET") .setUrl(mApiEndpoint + "boards") + .setFollowRedirects(true) .build(); return nextcloudAPI.performRequestObservable(type, request); } 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 fcf46fe63..5918232ac 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 @@ -5,9 +5,8 @@ import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; import java.lang.reflect.Type; -import java.util.List; -import it.niedermann.nextcloud.deck.model.Board; +import it.niedermann.nextcloud.deck.model.board.Board; /** * Created by david on 27.06.17. @@ -16,7 +15,7 @@ import it.niedermann.nextcloud.deck.model.Board; public class GsonConfig { public static Gson GetGson() { - Type boardList = new TypeToken<List<Board>>() {}.getType(); + Type boardList = new TypeToken<Board>() {}.getType(); return new GsonBuilder() .setLenient() @@ -24,4 +23,4 @@ public class GsonConfig { .create(); } -}
\ No newline at end of file +} 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 599cef535..3d078953f 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 @@ -10,7 +10,8 @@ import com.google.gson.JsonParseException; import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; -import it.niedermann.nextcloud.deck.model.Board; + +import it.niedermann.nextcloud.deck.model.board.Board; /** * Created by david on 24.05.17. @@ -31,7 +32,7 @@ public class NextcloudDeserializer<T> implements JsonDeserializer<List<T>> { @Override public List<T> deserialize(final JsonElement json, final Type typeOfT, final JsonDeserializationContext context) throws JsonParseException { - JsonArray jArr = json.getAsJsonObject().getAsJsonArray(mKey); + JsonArray jArr = json.getAsJsonArray(); List<T> items = new ArrayList<>(); for(int i = 0; i < jArr.size(); i++) { diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/TellMeMore.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/TellMeMore.java new file mode 100644 index 000000000..9f441593b --- /dev/null +++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/TellMeMore.java @@ -0,0 +1,25 @@ +package it.niedermann.nextcloud.deck.api; + +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; + +public class TellMeMore { + public static String bitch(InputStream is){ + return motherFucker(new InputStreamReader(is)); + } + + public static String motherFucker(InputStreamReader is){ + BufferedReader br = new BufferedReader(is); + StringBuffer sb = new StringBuffer(); + try { + String s = null; + while ((s=br.readLine()) !=null){ + sb.append(s); + } + } catch (Exception e){ + e.printStackTrace(); + } + return sb.toString(); + } +} |