From 5a0dd4d5592ce506741ce84d9634d88a112382ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20P=C3=B3=C5=82grabia?= Date: Sun, 20 Nov 2016 21:35:20 +0100 Subject: [PATCH] Hot fixes serialization names (proguard). --- .../urbanexplorer/fragments/PlacesFragment.java | 12 ++++++------ .../wikibinding/dto/generator/WikiQuery2.java | 3 +++ .../wikibinding/dto/generator/WikiResponse2.java | 3 +++ .../wikibinding/dto/geosearch/WikiGeoResponse2.java | 4 ++++ .../wikibinding/dto/geosearch/WikiQuery.java | 3 +++ 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/PlacesFragment.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/PlacesFragment.java index fef5fc5..462933d 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/PlacesFragment.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/PlacesFragment.java @@ -220,12 +220,12 @@ public class PlacesFragment extends Fragment { return; } - Toast.makeText(getActivity(), - String.format(AppConstants.DEF_APP_LOCALE, - "Fetching nearby places %.3f,%.3f", - location.getLatitude(), - location.getLongitude()), - Toast.LENGTH_SHORT).show(); +// Toast.makeText(getActivity(),Comm +// String.format(AppConstants.DEF_APP_LOCALE, +// "Fetching nearby places %.3f,%.3f", +// location.getLatitude(), +// location.getLongitude()), +// Toast.LENGTH_SHORT).show(); GooglePlacesRequest request = new GooglePlacesRequest(); diff --git a/wikibinding/src/main/java/pl/tpolgrabia/wikibinding/dto/generator/WikiQuery2.java b/wikibinding/src/main/java/pl/tpolgrabia/wikibinding/dto/generator/WikiQuery2.java index f17340b..774fcfc 100644 --- a/wikibinding/src/main/java/pl/tpolgrabia/wikibinding/dto/generator/WikiQuery2.java +++ b/wikibinding/src/main/java/pl/tpolgrabia/wikibinding/dto/generator/WikiQuery2.java @@ -1,11 +1,14 @@ package pl.tpolgrabia.wikibinding.dto.generator; +import com.google.gson.annotations.SerializedName; + import java.util.Map; /** * Created by tpolgrabia on 01.11.16. */ public class WikiQuery2 { + @SerializedName("pages") private Map pages; public Map getPages() { diff --git a/wikibinding/src/main/java/pl/tpolgrabia/wikibinding/dto/generator/WikiResponse2.java b/wikibinding/src/main/java/pl/tpolgrabia/wikibinding/dto/generator/WikiResponse2.java index 76e5c2e..89c9337 100644 --- a/wikibinding/src/main/java/pl/tpolgrabia/wikibinding/dto/generator/WikiResponse2.java +++ b/wikibinding/src/main/java/pl/tpolgrabia/wikibinding/dto/generator/WikiResponse2.java @@ -1,5 +1,6 @@ package pl.tpolgrabia.wikibinding.dto.generator; +import com.google.gson.annotations.SerializedName; import pl.tpolgrabia.wikibinding.dto.geosearch.WikiQuery; import java.io.Serializable; @@ -11,7 +12,9 @@ import java.util.Map; */ public class WikiResponse2 implements Serializable { private static final long serialVersionUID = 2208673089408151268L; + @SerializedName("batch_complete") private Boolean batchComplete; + @SerializedName("query") private WikiQuery2 query; public Boolean getBatchComplete() { diff --git a/wikibinding/src/main/java/pl/tpolgrabia/wikibinding/dto/geosearch/WikiGeoResponse2.java b/wikibinding/src/main/java/pl/tpolgrabia/wikibinding/dto/geosearch/WikiGeoResponse2.java index 62b6bde..48a4377 100644 --- a/wikibinding/src/main/java/pl/tpolgrabia/wikibinding/dto/geosearch/WikiGeoResponse2.java +++ b/wikibinding/src/main/java/pl/tpolgrabia/wikibinding/dto/geosearch/WikiGeoResponse2.java @@ -1,10 +1,14 @@ package pl.tpolgrabia.wikibinding.dto.geosearch; +import com.google.gson.annotations.SerializedName; + /** * Created by tpolgrabia on 05.09.16. */ public class WikiGeoResponse2 { + @SerializedName("batch_complete") private Boolean batchComplete; + @SerializedName("query") private WikiQuery query; public Boolean getBatchComplete() { diff --git a/wikibinding/src/main/java/pl/tpolgrabia/wikibinding/dto/geosearch/WikiQuery.java b/wikibinding/src/main/java/pl/tpolgrabia/wikibinding/dto/geosearch/WikiQuery.java index cd8f308..e0b5fe2 100644 --- a/wikibinding/src/main/java/pl/tpolgrabia/wikibinding/dto/geosearch/WikiQuery.java +++ b/wikibinding/src/main/java/pl/tpolgrabia/wikibinding/dto/geosearch/WikiQuery.java @@ -1,11 +1,14 @@ package pl.tpolgrabia.wikibinding.dto.geosearch; +import com.google.gson.annotations.SerializedName; + import java.util.List; /** * Created by tpolgrabia on 01.11.16. */ public class WikiQuery { + @SerializedName("geosearch") private List geosearch; public List getGeosearch() {