diff options
author | Daniel Schaal <daniel@schaal.email> | 2015-09-25 15:33:05 +0300 |
---|---|---|
committer | Daniel Schaal <daniel@schaal.email> | 2015-09-25 16:25:29 +0300 |
commit | df51a110c8f7d2e84e580c7f4a6c0ce5ec129648 (patch) | |
tree | 29e914089c3fc87b4a46c55899ed759d394044be /News-Android-App | |
parent | 9092f1afce261d724aee3e78135296aaef92908d (diff) |
Add query parameters using HttpUrl.Builder
Diffstat (limited to 'News-Android-App')
3 files changed, 25 insertions, 51 deletions
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/FeedItemTags.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/FeedItemTags.java index 2db06ffd..9eafa476 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/FeedItemTags.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/FeedItemTags.java @@ -26,23 +26,17 @@ public enum FeedItemTags { MARK_ITEM_AS_UNREAD("unread"), MARK_ITEM_AS_STARRED("star"), MARK_ITEM_AS_UNSTARRED("unstar"), - ALL_STARRED, - ALL; + ALL_STARRED("2"), + ALL("3"); private String segment; - FeedItemTags() { - - } - FeedItemTags(String segment) { this.segment = segment; } @Override public String toString() { - if(this.segment != null) - return this.segment; - return super.toString(); + return this.segment; } } diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/HttpJsonRequest.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/HttpJsonRequest.java index 2bb93967..9b3d309d 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/HttpJsonRequest.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/HttpJsonRequest.java @@ -145,17 +145,10 @@ public class HttpJsonRequest { return imageClient; } - public InputStream PerformJsonRequest(HttpUrl url, HashMap<String,String> nameValuePairs) throws Exception + public InputStream PerformJsonRequest(HttpUrl url) throws Exception { - HttpUrl.Builder urlBuilder = url.newBuilder(); - - if(nameValuePairs != null) { - for(String key: nameValuePairs.keySet()) - urlBuilder.addQueryParameter(key,nameValuePairs.get(key)); - } - Request request = new Request.Builder() - .url(urlBuilder.build()) + .url(url) .get() .build(); diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/OwnCloudReaderMethods.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/OwnCloudReaderMethods.java index 5516d5a3..9c69b7e8 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/OwnCloudReaderMethods.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/OwnCloudReaderMethods.java @@ -53,22 +53,16 @@ public class OwnCloudReaderMethods { public static int[] GetUpdatedItems(FeedItemTags tag, Context cont, long lastSync, API api) throws Exception { - HashMap<String,String> nVPairs = new HashMap<>(); - //nVPairs.put("batchSize", maxSizePerSync)); - if(tag.equals(FeedItemTags.ALL_STARRED)) + HttpUrl.Builder getItemUpdatedUrlBuilder = api.getItemUpdatedUrl().newBuilder(); + if(tag.equals(FeedItemTags.ALL_STARRED) || tag.equals(FeedItemTags.ALL)) { - nVPairs.put("type", "2"); - nVPairs.put("id", "0"); + getItemUpdatedUrlBuilder.addQueryParameter("type", tag.toString()) + .addQueryParameter("id", "0"); } - else if(tag.equals(FeedItemTags.ALL)) - { - nVPairs.put("type", "3"); - nVPairs.put("id", "0"); - } - nVPairs.put("lastModified", String.valueOf(lastSync)); + getItemUpdatedUrlBuilder.addQueryParameter("lastModified", String.valueOf(lastSync)); - InputStream is = HttpJsonRequest.getInstance().PerformJsonRequest(api.getItemUpdatedUrl(), nVPairs); + InputStream is = HttpJsonRequest.getInstance().PerformJsonRequest(getItemUpdatedUrlBuilder.build()); DatabaseConnectionOrm dbConn = new DatabaseConnectionOrm(cont); try @@ -86,26 +80,19 @@ public class OwnCloudReaderMethods { //"type": 1, // the type of the query (Feed: 0, Folder: 1, Starred: 2, All: 3) public static int GetItems(FeedItemTags tag, Context cont, String offset, boolean getRead, String id, String type, API api) throws Exception { - HashMap<String,String> nVPairs = new HashMap<>(); - nVPairs.put("batchSize", maxSizePerSync); - if(tag.equals(FeedItemTags.ALL_STARRED)) - { - nVPairs.put("type", type); - nVPairs.put("id", id); - } - else if(tag.equals(FeedItemTags.ALL)) + HttpUrl.Builder getItemsUrlBuilder = api.getItemUrl().newBuilder(); + + getItemsUrlBuilder.addQueryParameter("batchSize", maxSizePerSync) + .addQueryParameter("offset", offset) + .addQueryParameter("getRead", String.valueOf(getRead)); + + if(tag.equals(FeedItemTags.ALL_STARRED) ||tag.equals(FeedItemTags.ALL)) { - nVPairs.put("type", type); - nVPairs.put("id", id); + getItemsUrlBuilder.addQueryParameter("type",type) + .addQueryParameter("id", id); } - nVPairs.put("offset", offset); - if(getRead) - nVPairs.put("getRead", "true"); - else - nVPairs.put("getRead", "false"); - - InputStream is = HttpJsonRequest.getInstance().PerformJsonRequest(api.getItemUrl(), nVPairs); + InputStream is = HttpJsonRequest.getInstance().PerformJsonRequest(getItemsUrlBuilder.build()); DatabaseConnectionOrm dbConn = new DatabaseConnectionOrm(cont); try @@ -123,7 +110,7 @@ public class OwnCloudReaderMethods { public static int GetFolderTags(Context cont, API api) throws Exception { - InputStream is = HttpJsonRequest.getInstance().PerformJsonRequest(api.getFolderUrl(), null); + InputStream is = HttpJsonRequest.getInstance().PerformJsonRequest(api.getFolderUrl()); DatabaseConnectionOrm dbConn = new DatabaseConnectionOrm(cont); int[] result = new int[2]; try @@ -145,7 +132,7 @@ public class OwnCloudReaderMethods { public static int[] GetFeeds(Context cont, API api) throws Exception { - InputStream inputStream = HttpJsonRequest.getInstance().PerformJsonRequest(api.getFeedUrl(), null); + InputStream inputStream = HttpJsonRequest.getInstance().PerformJsonRequest(api.getFeedUrl()); DatabaseConnectionOrm dbConn = new DatabaseConnectionOrm(cont); int result[] = new int[2]; @@ -436,7 +423,7 @@ public class OwnCloudReaderMethods { .addPathSegment(OwnCloudConstants.VERSION_PATH) .build(); - InputStream is = HttpJsonRequest.getInstance().PerformJsonRequest(requestUrl, null); + InputStream is = HttpJsonRequest.getInstance().PerformJsonRequest(requestUrl); try { GetVersion_v2 gv = new GetVersion_v2(); @@ -451,7 +438,7 @@ public class OwnCloudReaderMethods { .addQueryParameter("format", "json") .build(); - InputStream is = HttpJsonRequest.getInstance().PerformJsonRequest(requestUrl, null); + InputStream is = HttpJsonRequest.getInstance().PerformJsonRequest(requestUrl); try { GetVersion_v1 gv = new GetVersion_v1(); |