From 7bc355c6e39b328fa548487fd4554af9f42d8122 Mon Sep 17 00:00:00 2001
From: Scott Graham <scottmg@chromium.org>
Date: Wed, 9 Sep 2015 14:26:58 -0700
Subject: [PATCH] mine_digger: Fix not being able to de-flag on Android

---
 examples/mine_digger/lib/main.dart | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/examples/mine_digger/lib/main.dart b/examples/mine_digger/lib/main.dart
index 367f8775b27..ab44479e080 100644
--- a/examples/mine_digger/lib/main.dart
+++ b/examples/mine_digger/lib/main.dart
@@ -106,9 +106,12 @@ class MineDiggerApp extends App {
           if (state != CellState.exploded)
             state = cells[iy][ix] ? CellState.shown : state;
         }
-        if (state == CellState.covered) {
+        if (state == CellState.covered || state == CellState.flagged) {
           row.add(new GestureDetector(
-            onTap: () => probe(ix, iy),
+            onTap: () {
+              if (state == CellState.covered)
+                probe(ix, iy);
+            },
             onLongPress: () {
               activity.userFeedback.performHapticFeedback(activity.HapticFeedbackType_LONG_PRESS);
               flag(ix, iy);
@@ -116,21 +119,17 @@ class MineDiggerApp extends App {
             child: new Listener(
               onPointerDown: _pointerDownHandlerFor(ix, iy),
               child: new CoveredMineNode(
-                flagged: false,
+                flagged: state == CellState.flagged,
                 posX: ix,
                 posY: iy
               )
             )
           ));
-          // Mutating |hasCoveredCell| here is hacky, but convenient, same
-          // goes for mutating |hasWon| below.
-          hasCoveredCell = true;
-        } else if (state == CellState.flagged) {
-          row.add(new CoveredMineNode(
-            flagged: true,
-            posX: ix,
-            posY: iy
-          ));
+          if (state == CellState.covered) {
+            // Mutating |hasCoveredCell| here is hacky, but convenient, same
+            // goes for mutating |hasWon| below.
+            hasCoveredCell = true;
+          }
         } else {
           row.add(new ExposedMineNode(
             state: state,