eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-27 06:17:27 +00:00
Code Activity

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

Browse Source
This commit is contained in:
Bennet Brunsen committed 2015-03-12 11:45:55 +01:00
2 parents e8f2ee9bae 33a5571168
commit e19b3e467f
1 file changed
+2 -8
Download Patch File Download Diff File Expand all files Collapse all files
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/CheckinManager.java
+2 -8
View File
@@ -55,7 +55,7 @@ public class CheckinManager {
return; return;
} }
activity.showProgressDialog(R.string.please_wait, R.string.getting_leaderboard); activity.showProgressDialog(R.string.please_wait, R.string.getting_event);
try { try {
HttpGetRequest getLeaderboardRequest = new HttpGetRequest(new URL(urlData.getLeaderboardUrl), activity); HttpGetRequest getLeaderboardRequest = new HttpGetRequest(new URL(urlData.getLeaderboardUrl), activity);
@@ -110,7 +110,6 @@ public class CheckinManager {
public void performAction(JSONObject response) { public void performAction(JSONObject response) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
activity.dismissProgressDialog();
final String leaderboardName; final String leaderboardName;
@@ -124,8 +123,6 @@ public class CheckinManager {
return; return;
} }
activity.showProgressDialog(R.string.please_wait, R.string.getting_event);
HttpGetRequest getEventRequest; HttpGetRequest getEventRequest;
try { try {
getEventRequest = new HttpGetRequest(new URL(urlData.getEventUrl), activity); getEventRequest = new HttpGetRequest(new URL(urlData.getEventUrl), activity);
@@ -154,7 +151,6 @@ public class CheckinManager {
@Override @Override
public void performAction(JSONObject response) { public void performAction(JSONObject response) {
activity.dismissProgressDialog();
try { try {
urlData.eventId = response.getString("id"); urlData.eventId = response.getString("id");
@@ -177,9 +173,6 @@ public class CheckinManager {
return; return;
} }
activity.showProgressDialog(R.string.please_wait,
R.string.getting_competitor);
HttpGetRequest getCompetitorRequest; HttpGetRequest getCompetitorRequest;
try { try {
getCompetitorRequest = new HttpGetRequest( getCompetitorRequest = new HttpGetRequest(
@@ -267,6 +260,7 @@ public class CheckinManager {
data.uriString = urlData.uriStr; data.uriString = urlData.uriStr;
try { try {
data.setCheckinDigestFromString(urlData.uriStr); data.setCheckinDigestFromString(urlData.uriStr);
activity.dismissProgressDialog();
setCheckinData(data); setCheckinData(data);
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
ExLog.e(activity, ExLog.e(activity,