Skip to content

Issue/3779 store plan name with blog #3780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 25, 2016
Merged

Issue/3779 store plan name with blog #3780

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5f37c62
First pass at storing plan short product name with blog
nbradbury Feb 23, 2016
08afe30
Use plan short name from the blog object in MySiteFragment
nbradbury Feb 23, 2016
7db1fc0
Merge branch 'feature/plans-master' of https://github.com/wordpress-m…
nbradbury Feb 23, 2016
e9c59a8
Add locale param to `me/sites`
nbradbury Feb 24, 2016
e573eb7
Merge branch 'feature/plans-master' of https://github.com/wordpress-m…
nbradbury Feb 24, 2016
3164acf
Resolved conflicts in PlanUtils
nbradbury Feb 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Resolved conflicts in PlanUtils
  • Loading branch information
@nbradbury
nbradbury committed Feb 24, 2016
commit 3164acfcccb58da9fc135d2a55baba83eb4e7379
27 changes: 3 additions & 24 deletions WordPress/src/main/java/org/wordpress/android/ui/plans/PlansUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import java.util.Hashtable;
import java.util.List;
import java.util.Locale;
import java.util.Map;

public class PlansUtils {

Expand Down Expand Up @@ -75,8 +74,7 @@ public static boolean downloadAvailablePlansForSite(int localTableBlogID, final
return false;
}

Map<String, String> params = getDefaultRestCallParameters();
WordPress.getRestClientUtils().get("sites/" + blog.getDotComBlogId() + "/plans", params, null, new RestRequest.Listener() {
WordPress.getRestClientUtils().get("sites/" + blog.getDotComBlogId() + "/plans", WordPress.getRestLocaleParams(), null, new RestRequest.Listener() {
@Override
public void onResponse(JSONObject response) {
if (response == null) {
Expand Down Expand Up @@ -202,8 +200,7 @@ public static HashMap<String, Feature> getFeatures() {
}

public static void downloadGlobalPlans() {
Map<String, String> params = getDefaultRestCallParameters();
WordPress.getRestClientUtilsV1_3().get("plans/", params, null, new RestRequest.Listener() {
WordPress.getRestClientUtilsV1_3().get("plans/", WordPress.getRestLocaleParams(), null, new RestRequest.Listener() {
@Override
public void onResponse(JSONObject response) {
if (response != null) {
Expand All @@ -228,8 +225,7 @@ public void onErrorResponse(VolleyError volleyError) {
* Return true if the request is enqueued. False otherwise.
*/
public static void downloadFeatures() {
Map<String, String> params = getDefaultRestCallParameters();
WordPress.getRestClientUtilsV1_2().get("plans/features/", params, null, new RestRequest.Listener() {
WordPress.getRestClientUtilsV1_2().get("plans/features/", WordPress.getRestLocaleParams(), null, new RestRequest.Listener() {
@Override
public void onResponse(JSONObject response) {
if (response != null) {
Expand All @@ -248,23 +244,6 @@ public void onErrorResponse(VolleyError volleyError) {
});
}

/**
* This function returns default parameters used in all REST Calls in Plans.
*
* The "locale" parameter fox example is one of those we need to add to the request. It must be set to retrieve
* the localized version of plans descriptions and avoid hardcode them in code.
*
* @return The map with default parameters.
*/
private static Map<String, String> getDefaultRestCallParameters() {
String deviceLanguageCode = Locale.getDefault().getLanguage();
Map<String, String> params = new HashMap<>();
if (!TextUtils.isEmpty(deviceLanguageCode)) {
params.put("locale", deviceLanguageCode);
}
return params;
}

/**
* This function return true if Plans are available for a blog.
* Basically this means that Plans data were downloaded from the server,
Expand Down