Merge branch 'master' into ubilabs--rcapp--develop

This commit is contained in:
Axel Uhl committed 2016-04-01 00:57:58 +02:00
commit 1beee8dcc4
4 files changed
+8 -4

No files matched your search

@@ -202,18 +202,16 @@ public class CheckinManager {
private void getCompetitorFromServer(HttpGetRequest getCompetitorRequest, final URLData urlData, final String leaderboardName) {
NetworkHelper.getInstance(activity)
.executeHttpJsonRequestAsync(getCompetitorRequest, new NetworkHelper.NetworkHelperSuccessListener() {
@Override
public void performAction(JSONObject response) {
activity.dismissProgressDialog();
try {
// TODO review constants
urlData.competitorName = response.getString(CompetitorJsonConstants.FIELD_NAME);
urlData.competitorId = response.getString(CompetitorJsonConstants.FIELD_ID);
urlData.competitorSailId = response.getString(CompetitorJsonConstants.FIELD_SAIL_ID);
urlData.competitorNationality = response.getString(CompetitorJsonConstants.FIELD_NATIONALITY);
urlData.competitorCountryCode = response.getString(CompetitorJsonConstants.FIELD_COUNTRY_CODE);
// TODO Bug 3358: get optional team image from CompetitorJsonConstants.FIELD_TEAM_IMAGE_URI
} catch (JSONException e) {
ExLog.e(activity, TAG, "Error getting data from call on URL: " + urlData.competitorUrl + ", Error: " + e.getMessage());
handleApiError();