Abort and rollback correctly

MarcusWolschon · Dec 2, 2024 · 16f59f2 · 16f59f2
1 parent a543693
commit 16f59f2
Showing 1 changed file with 20 additions and 1 deletion.
diff --git a/src/main/java/de/blau/android/easyedit/WaySegmentModifyActionModeCallback.java b/src/main/java/de/blau/android/easyedit/WaySegmentModifyActionModeCallback.java
@@ -1,11 +1,14 @@
 package de.blau.android.easyedit;
 
+import static de.blau.android.contract.Constants.LOG_TAG_LEN;
+
 import java.util.HashMap;
 
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.view.ActionMode;
 import de.blau.android.R;
 import de.blau.android.osm.Tags;
@@ -14,7 +17,9 @@
 import de.blau.android.util.ThemeUtils;
 
 public class WaySegmentModifyActionModeCallback extends NonSimpleActionModeCallback {
-    private static final String DEBUG_TAG = WaySegmentModifyActionModeCallback.class.getSimpleName().substring(0, Math.min(23, WaySegmentModifyActionModeCallback.class.getSimpleName().length()));
+
+    private static final int    TAG_LEN   = Math.min(LOG_TAG_LEN, WaySegmentModifyActionModeCallback.class.getSimpleName().length());
+    private static final String DEBUG_TAG = WaySegmentModifyActionModeCallback.class.getSimpleName().substring(0, TAG_LEN);
 
     private static final int MENUITEM_BRIDGE  = 24;
     private static final int MENUITEM_TUNNEL  = 25;
@@ -112,6 +117,20 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
         return true;
     }
 
+    @Override
+    protected void onCloseClicked() {
+        onBackPressed();
+    }
+
+    @Override
+    public boolean onBackPressed() {
+        new AlertDialog.Builder(main).setTitle(R.string.abort_action_title).setPositiveButton(R.string.yes, (dialog, which) -> {
+            logic.rollback();
+            super.onBackPressed();
+        }).setNeutralButton(R.string.cancel, null).show();
+        return false;
+    }
+
     @Override
     public void saveState(SerializableState state) {
         state.putLong(WAY_ID_KEY, way.getOsmId());