If menu open, close it on back pressed.

This commit is contained in:
chteufleur 2018-10-17 16:25:26 +02:00
parent 75eb8b2c52
commit e29e6fd609
1 changed files with 13 additions and 9 deletions

View File

@ -304,17 +304,21 @@ public class MainActivity extends AppCompatActivity implements IOrientationConsu
@Override @Override
public void onBackPressed() { public void onBackPressed() {
if (serviceTrackingDog.isDogActivated() || serviceTrackingDog.isTraceurActivated()) { if (mDrawerLayout.isDrawerOpen(GravityCompat.START)) {
Toast.makeText(ctx, "Une trace est en cours d'enregistrement.", Toast.LENGTH_LONG).show(); mDrawerLayout.closeDrawer(GravityCompat.START);
return ; } else {
} if (serviceTrackingDog.isDogActivated() || serviceTrackingDog.isTraceurActivated()) {
Toast.makeText(ctx, "Une trace est en cours d'enregistrement.", Toast.LENGTH_LONG).show();
return;
}
super.onBackPressed(); super.onBackPressed();
pause(); pause();
if (serviceTrackingDog != null) { if (serviceTrackingDog != null) {
serviceTrackingDog.close(); serviceTrackingDog.close();
}
zoomed = false;
} }
zoomed = false;
} }
//</editor-fold> //</editor-fold>