Improve acquisition of random numbers

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

4 files changed, 12 insertions, 8 deletions

diff --git a/src/org/cyanogenmod/wallpapers/photophase/transitions/FlipTransition.java b/src/org/cyanogenmod/wallpapers/photophase/transitions/FlipTransition.java
index 43dbee4..295add9 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/transitions/FlipTransition.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/transitions/FlipTransition.java
@@ -23,6 +23,7 @@ import android.opengl.Matrix;
 import android.os.SystemClock;
 
 import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil;
+import org.cyanogenmod.wallpapers.photophase.utils.Utils;
 import org.cyanogenmod.wallpapers.photophase.PhotoFrame;
 import org.cyanogenmod.wallpapers.photophase.R;
 import org.cyanogenmod.wallpapers.photophase.TextureManager;
@@ -106,8 +107,8 @@ public class FlipTransition extends Transition {
         // Random mode
         FLIP_MODES[] modes = FLIP_MODES.values();
         int low = 0;
-        int hight = modes.length - 1;
-        mMode = modes[(low + (int)(Math.random() * ((hight - low) + 1)))];
+        int high = modes.length - 1;
+        mMode = modes[Utils.getNextRandom(low, high)];
     }
 
     /**
diff --git a/src/org/cyanogenmod/wallpapers/photophase/transitions/Transitions.java b/src/org/cyanogenmod/wallpapers/photophase/transitions/Transitions.java
index 33debed..71ce34a 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/transitions/Transitions.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/transitions/Transitions.java
@@ -21,6 +21,7 @@ import android.content.Context;
 import org.cyanogenmod.wallpapers.photophase.PhotoFrame;
 import org.cyanogenmod.wallpapers.photophase.TextureManager;
 import org.cyanogenmod.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
+import org.cyanogenmod.wallpapers.photophase.utils.Utils;
 
 import java.util.Arrays;
 import java.util.List;
@@ -102,8 +103,8 @@ public class Transitions {
         TRANSITIONS nextTransition = null;
         if (transitions.size() > 0) {
             int low = 0;
-            int hight = transitions.size() - 1;
-            int pos = low + (int)(Math.random() * ((hight - low) + 1));
+            int high = transitions.size() - 1;
+            int pos = Utils.getNextRandom(low, high);
             nextTransition = transitions.get(pos);
         }
         if (nextTransition == null) {
diff --git a/src/org/cyanogenmod/wallpapers/photophase/transitions/TranslateTransition.java b/src/org/cyanogenmod/wallpapers/photophase/transitions/TranslateTransition.java
index b05dd71..eb1080b 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/transitions/TranslateTransition.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/transitions/TranslateTransition.java
@@ -23,6 +23,7 @@ import android.opengl.Matrix;
 import android.os.SystemClock;
 
 import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil;
+import org.cyanogenmod.wallpapers.photophase.utils.Utils;
 import org.cyanogenmod.wallpapers.photophase.PhotoFrame;
 import org.cyanogenmod.wallpapers.photophase.R;
 import org.cyanogenmod.wallpapers.photophase.TextureManager;
@@ -134,8 +135,8 @@ public class TranslateTransition extends Transition {
 
         // Random mode
         int low = 0;
-        int hight = modes.size() - 1;
-        mMode = modes.get(low + (int)(Math.random() * ((hight - low) + 1)));
+        int high = modes.size() - 1;
+        mMode = modes.get(Utils.getNextRandom(low, high));
     }
 
     /**
diff --git a/src/org/cyanogenmod/wallpapers/photophase/transitions/WindowTransition.java b/src/org/cyanogenmod/wallpapers/photophase/transitions/WindowTransition.java
index 84cb264..d580c8b 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/transitions/WindowTransition.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/transitions/WindowTransition.java
@@ -24,6 +24,7 @@ import android.os.SystemClock;
 import android.view.animation.AccelerateInterpolator;
 
 import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil;
+import org.cyanogenmod.wallpapers.photophase.utils.Utils;
 import org.cyanogenmod.wallpapers.photophase.PhotoFrame;
 import org.cyanogenmod.wallpapers.photophase.R;
 import org.cyanogenmod.wallpapers.photophase.TextureManager;
@@ -130,8 +131,8 @@ public class WindowTransition extends Transition {
 
         // Random mode
         int low = 0;
-        int hight = modes.size() - 1;
-        mMode = modes.get(low + (int)(Math.random() * ((hight - low) + 1)));
+        int high = modes.size() - 1;
+        mMode = modes.get(Utils.getNextRandom(low, high));
     }
 
     /**