Fix next transition touch action

Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

2 files changed, 11 insertions, 26 deletions

diff --git a/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseRenderer.java b/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseRenderer.java
index 6432767..a101ce0 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseRenderer.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseRenderer.java
@@ -289,18 +289,13 @@ public class PhotoPhaseRenderer implements GLSurfaceView.Renderer {
                 // Apply the action
                 if (touchAction.compareTo(TouchAction.TRANSITION) == 0) {
                     try {
-                        // Check if the frame has pending transitions
-                        if (!mWorld.hasRunningTransition(frame)) {
-                            Log.w(TAG, "The frame has pending transitions " + frame.getTextureInfo().path);
-                            return;
-                        }
-
                         // Select the frame with a transition
                         // Run in GLES's thread
                         mDispatcher.dispatch(new Runnable() {
                             @Override
                             public void run() {
                                 // Select a new transition
+                                deselectCurrentTransition();
                                 mWorld.selectTransition(frame);
                                 mLastRunningTransition = System.currentTimeMillis();
 
@@ -344,7 +339,15 @@ public class PhotoPhaseRenderer implements GLSurfaceView.Renderer {
         }
     }
 
-    void scheduleOrCancelMediaScan() {
+    /**
+     * Method that deselect the current transition
+     */
+    /*package*/ synchronized void deselectCurrentTransition() {
+        mHandler.removeCallbacks(mTransitionThread);
+        mWorld.deselectTransition(mMVPMatrix);
+    }
+
+    /*package*/ void scheduleOrCancelMediaScan() {
         int interval = Preferences.Media.getRefreshFrecuency();
         if (interval != Preferences.Media.MEDIA_RELOAD_DISABLED) {
             scheduleMediaScan(interval);
@@ -539,8 +542,7 @@ public class PhotoPhaseRenderer implements GLSurfaceView.Renderer {
                             mDispatcher.setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
 
                             // Now start a delayed thread to generate the next effect
-                            mHandler.removeCallbacks(mTransitionThread);
-                            mWorld.deselectTransition(mMVPMatrix);
+                            deselectCurrentTransition();
                             mLastRunningTransition = 0;
                             mHandler.postDelayed(mTransitionThread,
                                     Preferences.General.Transitions.getTransitionInterval());
diff --git a/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseWallpaperWorld.java b/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseWallpaperWorld.java
index 815ddc6..9e4135b 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseWallpaperWorld.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseWallpaperWorld.java
@@ -18,7 +18,6 @@ package org.cyanogenmod.wallpapers.photophase;
 
 import android.content.Context;
 import android.content.res.Configuration;
-import android.content.res.Resources.NotFoundException;
 import android.graphics.PointF;
 import android.graphics.RectF;
 import android.util.Log;
@@ -273,22 +272,6 @@ public class PhotoPhaseWallpaperWorld {
     }
 
     /**
-     * Method that returns if there are any transition running in the world.
-     *
-     * @return boolean If there are any transition running in the world
-     * @throws NotFoundException If the frame was not found
-     */
-    public boolean hasRunningTransition(PhotoFrame frame) throws NotFoundException {
-        int pos = mPhotoFrames.indexOf(frame);
-        if (pos == -1) {
-            throw new NotFoundException();
-        }
-        synchronized (mUsedTransitionsQueue) {
-            return mUsedTransitionsQueue.indexOf(Integer.valueOf(pos)) != -1;
-        }
-    }
-
-    /**
      * Method that creates and fills the world with {@link PhotoFrame} objects.
      *
      * @param w The new width dimension