Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Removed interrupt current stage dialog

Browse source
This commit is contained in:
Denis 2014-09-02 13:07:49 +03:00
parent f4d7b6b503
commit bb191de7d0
1 changed files with 2 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java
View file

@ -406,17 +406,6 @@ public class TourViewActivity extends SherlockFragmentActivity {
public void startStage(final StageInformation stage) { public void startStage(final StageInformation stage) {
if(customization.isStageVisited(stage.getOrder()) /*&& stage.getTour() == customization.getSelectedTour()*/) { if(customization.isStageVisited(stage.getOrder()) /*&& stage.getTour() == customization.getSelectedTour()*/) {
customization.showCompleteStageFragment(this, stage, true); customization.showCompleteStageFragment(this, stage, true);
} else if (stage != customization.getSelectedStage() && customization.getSelectedStage() != null) {
Builder bld = new AlertDialog.Builder(this);
bld.setMessage(R.string.start_new_stage);
bld.setPositiveButton(R.string.default_buttons_yes, new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
customization.runStage(TourViewActivity.this, stage.getTour(), stage, customization.getSelectedStage() != stage);
}
});
bld.setNegativeButton(R.string.default_buttons_no, null);
bld.show();
} else { } else {
customization.runStage(TourViewActivity.this, stage.getTour(), stage, customization.getSelectedStage() != stage); customization.runStage(TourViewActivity.this, stage.getTour(), stage, customization.getSelectedStage() != stage);
} }
@ -424,20 +413,8 @@ public class TourViewActivity extends SherlockFragmentActivity {
public void startTour(final TourInformation tour) { public void startTour(final TourInformation tour) {
if (tour != customization.getSelectedTour() && customization.getSelectedTour() != null) { startTourImpl(tour);
Builder bld = new AlertDialog.Builder(this);
bld.setMessage(R.string.start_new_stage);
bld.setPositiveButton(R.string.default_buttons_yes, new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
startTourImpl(tour);
}
});
bld.setNegativeButton(R.string.default_buttons_no, null);
bld.show();
} else {
startTourImpl(tour);
}
} }
private void startTourImpl(TourInformation tour) { private void startTourImpl(TourInformation tour) {