- fix #667

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / PinCodeActivity.java

diff --git a/src/com/owncloud/android/ui/activity/PinCodeActivity.java b/src/com/owncloud/android/ui/activity/PinCodeActivity.java
index e6c8334..1e08589 100644 (file)
--- a/src/com/owncloud/android/ui/activity/PinCodeActivity.java
+++ b/src/com/owncloud/android/ui/activity/PinCodeActivity.java
@@ -18,13 +18,6 @@ package com.owncloud.android.ui.activity;
 
 import java.util.Arrays;
 
 
 import java.util.Arrays;
 

-import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.app.SherlockFragmentActivity;
-import com.owncloud.android.R;
-import com.owncloud.android.utils.DisplayUtils;
-
-import android.app.AlertDialog;
-import android.content.DialogInterface;

 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;


@@ -41,12 +34,17 @@ import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import android.widget.TextView;
 import android.widget.Toast;
 

+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.owncloud.android.R;
+import com.owncloud.android.authentication.PinCheck;
+import com.owncloud.android.utils.DisplayUtils;
+

 public class PinCodeActivity extends SherlockFragmentActivity {
 
   
     public final static String EXTRA_ACTIVITY = "com.owncloud.android.ui.activity.PinCodeActivity.ACTIVITY";
     public final static String EXTRA_NEW_STATE = "com.owncloud.android.ui.activity.PinCodeActivity.NEW_STATE";
 public class PinCodeActivity extends SherlockFragmentActivity {
 
   
     public final static String EXTRA_ACTIVITY = "com.owncloud.android.ui.activity.PinCodeActivity.ACTIVITY";
     public final static String EXTRA_NEW_STATE = "com.owncloud.android.ui.activity.PinCodeActivity.NEW_STATE";

-    public final static Integer EXTRA_PIN_CORRECT = 1;

     
     private Button mBCancel;
     private TextView mPinHdr;
     
     private Button mBCancel;
     private TextView mPinHdr;


@@ -368,9 +366,11 @@ public class PinCodeActivity extends SherlockFragmentActivity {
                     }
                     
                     if (mPinCodeChecked && 
                     }
                     
                     if (mPinCodeChecked && 

-                            ( mActivity.equals("FileDisplayActivity") || mActivity.equals("PreviewImageActivity") ) ){
+                       (mActivity.equals("FileDisplayActivity") || mActivity.equals("PreviewImageActivity") || mActivity.equals("ownCloudUploader"))){
+                        PinCheck.setUnlockTimestamp();

                         finish();
                     } else if (mPinCodeChecked){
                         finish();
                     } else if (mPinCodeChecked){

+                        PinCheck.setUnlockTimestamp();

                         
                         Intent intent = getIntent();
                         String newState = intent.getStringExtra(EXTRA_NEW_STATE);
                         
                         Intent intent = getIntent();
                         String newState = intent.getStringExtra(EXTRA_NEW_STATE);


@@ -553,14 +553,10 @@ public class PinCodeActivity extends SherlockFragmentActivity {
         appPrefs.commit();
         
         pinCodeEnd(true);
         appPrefs.commit();
         
         pinCodeEnd(true);

-        
-        
-        

     }
     
     
     protected void clearBoxes(){
     }
     
     
     protected void clearBoxes(){

-        

         mText1.setText("");
         mText2.setText("");
         mText3.setText("");
         mText1.setText("");
         mText2.setText("");
         mText3.setText("");


@@ -572,7 +568,6 @@ public class PinCodeActivity extends SherlockFragmentActivity {
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event){
         if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount()== 0){
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event){
         if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount()== 0){

-            

             if (mActivity.equals("preferences")){
                 SharedPreferences.Editor appPrefsE = PreferenceManager
             
             if (mActivity.equals("preferences")){
                 SharedPreferences.Editor appPrefsE = PreferenceManager
             


@@ -588,14 +583,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
                 finish();
             }
             return true; 
                 finish();
             }
             return true; 

-            

         }
         }

-        

         return super.onKeyDown(keyCode, event);
         return super.onKeyDown(keyCode, event);

-    }
-    
-   
-
-    
-            
+    }     

 }
 }