Refactored location of passcode check: a callback to rule them all

[pub/Android/ownCloud.git] / src / com / owncloud / android / authentication / PinCheck.java

diff --git a/src/com/owncloud/android/authentication/PinCheck.java b/src/com/owncloud/android/authentication/PinCheck.java
index f8423eb..2f48eb0 100644 (file)
--- a/src/com/owncloud/android/authentication/PinCheck.java
+++ b/src/com/owncloud/android/authentication/PinCheck.java
@@ -9,15 +9,17 @@ import com.owncloud.android.MainApp;
 public class PinCheck extends Activity {
 
     private static Long timestamp = 0l;
 public class PinCheck extends Activity {
 
     private static Long timestamp = 0l;

-    private static Long lastStart = 0l;
+    private static Long lastStart = 0l; // this must be here because it's called twice - in onCreate and onResume
+    private static int PINCODE_TIMEOUT = 1000;

     
     public static void setUnlockTimestamp() {
         timestamp = System.currentTimeMillis();
     }
 
     public static boolean checkIfPinEntry(){
     
     public static void setUnlockTimestamp() {
         timestamp = System.currentTimeMillis();
     }
 
     public static boolean checkIfPinEntry(){

-        if ((System.currentTimeMillis() - timestamp) > 10000 &&
-            (System.currentTimeMillis() - lastStart) > 10000){
+        if ((System.currentTimeMillis() - timestamp) > PINCODE_TIMEOUT &&
+            (System.currentTimeMillis() - lastStart) > PINCODE_TIMEOUT
+            ){

             SharedPreferences appPrefs = PreferenceManager.getDefaultSharedPreferences(MainApp.getAppContext());
             if (appPrefs.getBoolean("set_pincode", false)) {
                 lastStart = System.currentTimeMillis();
             SharedPreferences appPrefs = PreferenceManager.getDefaultSharedPreferences(MainApp.getAppContext());
             if (appPrefs.getBoolean("set_pincode", false)) {
                 lastStart = System.currentTimeMillis();