Fix not being able to cancel on last target (#299)

Simplifies an early return + properly unsets currentView. Fixes #294
KeepSafe · Jul 5, 2018 · 8036db5 · 8036db5
1 parent be6d3ac
commit 8036db5
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/taptargetview/src/main/java/com/getkeepsafe/taptargetview/TapTargetSequence.java b/taptargetview/src/main/java/com/getkeepsafe/taptargetview/TapTargetSequence.java
@@ -174,10 +174,7 @@ public void startAt(int index) {
    */
   @UiThread
   public boolean cancel() {
-    if (targets.isEmpty() || !active) {
-      return false;
-    }
-    if (currentView == null || !currentView.cancelable) {
+    if (!active || currentView == null || !currentView.cancelable) {
       return false;
     }
     currentView.dismiss(false);
@@ -198,6 +195,7 @@ void showNext() {
         currentView = TapTargetView.showFor(dialog, tapTarget, tapTargetListener);
       }
     } catch (NoSuchElementException e) {
+      currentView = null;
       // No more targets
       if (listener != null) {
         listener.onSequenceFinish();