Merge branch 'ubilabs--tracking_app--bugfix--flickering_dialogs' into ubilabs--tracking_app--develop

This commit is contained in:
Bennet Brunsen committed 2015-03-12 11:45:55 +01:00
commit e19b3e467f
1 file changed
+2 -8
@@ -55,7 +55,7 @@ public class CheckinManager {
return;
}
activity.showProgressDialog(R.string.please_wait, R.string.getting_leaderboard);
activity.showProgressDialog(R.string.please_wait, R.string.getting_event);
try {
HttpGetRequest getLeaderboardRequest = new HttpGetRequest(new URL(urlData.getLeaderboardUrl), activity);
@@ -110,7 +110,6 @@ public class CheckinManager {
public void performAction(JSONObject response) {
// TODO Auto-generated method stub
activity.dismissProgressDialog();
final String leaderboardName;
@@ -124,8 +123,6 @@ public class CheckinManager {
return;
}
activity.showProgressDialog(R.string.please_wait, R.string.getting_event);
HttpGetRequest getEventRequest;
try {
getEventRequest = new HttpGetRequest(new URL(urlData.getEventUrl), activity);
@@ -154,7 +151,6 @@ public class CheckinManager {
@Override
public void performAction(JSONObject response) {
activity.dismissProgressDialog();
try {
urlData.eventId = response.getString("id");
@@ -177,9 +173,6 @@ public class CheckinManager {
return;
}
activity.showProgressDialog(R.string.please_wait,
R.string.getting_competitor);
HttpGetRequest getCompetitorRequest;
try {
getCompetitorRequest = new HttpGetRequest(
@@ -267,6 +260,7 @@ public class CheckinManager {
data.uriString = urlData.uriStr;
try {
data.setCheckinDigestFromString(urlData.uriStr);
activity.dismissProgressDialog();
setCheckinData(data);
} catch (UnsupportedEncodingException e) {
ExLog.e(activity,