Merge lp:~tlnd/financisto/pin-protection into lp:~financisto-dev/financisto/trunk

[Denis Solonenko]

[Denis Solonenko (denis-solonenko)]

I modified PinProtection class to make the states more explicit

=== modified file 'AndroidManifest.xml'
--- AndroidManifest.xml	2011-06-18 10:38:16 +0000
+++ AndroidManifest.xml	2011-07-05 15:54:36 +0000
@@ -79,7 +79,8 @@
 			</intent-filter>
 		</activity>
 
-		<activity android:name=".activity.PinActivity" android:label="@string/enter_pin"/>
+		<activity android:name=".activity.PinActivity" android:label="@string/enter_pin"
+			android:launchMode="singleTop"/>
 
 		<activity android:name=".activity.BlotterActivity" android:label="@string/blotter"/>
 		

=== modified file 'src/ru/orangesoftware/financisto/activity/AbstractActivity.java'
--- src/ru/orangesoftware/financisto/activity/AbstractActivity.java	2011-02-20 19:39:08 +0000
+++ src/ru/orangesoftware/financisto/activity/AbstractActivity.java	2011-07-05 15:54:36 +0000
@@ -15,6 +15,7 @@
 import ru.orangesoftware.financisto.db.DatabaseAdapter;
 import ru.orangesoftware.financisto.db.MyEntityManager;
 import ru.orangesoftware.financisto.model.MultiChoiceItem;
+import ru.orangesoftware.financisto.utils.PinProtection;
 import ru.orangesoftware.financisto.view.NodeInflater;
 import android.app.Activity;
 import android.content.Context;
@@ -43,6 +44,18 @@
 	}
 	
 	@Override
+	protected void onPause() {
+		super.onPause();
+		PinProtection.lock(this);
+	}
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+		PinProtection.unlock(this);
+	}
+	
+	@Override
 	public void onClick(View v) {
 		int id = v.getId();
 		onClick(v, id);

=== modified file 'src/ru/orangesoftware/financisto/activity/AbstractExportActivity.java'
--- src/ru/orangesoftware/financisto/activity/AbstractExportActivity.java	2011-02-20 19:39:08 +0000
+++ src/ru/orangesoftware/financisto/activity/AbstractExportActivity.java	2011-07-05 15:54:36 +0000
@@ -20,6 +20,7 @@
 import ru.orangesoftware.financisto.blotter.WhereFilter;
 import ru.orangesoftware.financisto.blotter.WhereFilter.DateTimeCriteria;
 import ru.orangesoftware.financisto.utils.DateUtils;
+import ru.orangesoftware.financisto.utils.PinProtection;
 import ru.orangesoftware.financisto.utils.DateUtils.Period;
 import ru.orangesoftware.financisto.utils.DateUtils.PeriodType;
 
@@ -125,7 +126,16 @@
 			updatePeriod();
 		}
 	}
-
-
 	
+	@Override
+	protected void onPause() {
+		super.onPause();
+		PinProtection.lock(this);
+	}
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+		PinProtection.unlock(this);
+	}	
 }

=== modified file 'src/ru/orangesoftware/financisto/activity/AbstractListActivity.java'
--- src/ru/orangesoftware/financisto/activity/AbstractListActivity.java	2011-02-20 19:39:08 +0000
+++ src/ru/orangesoftware/financisto/activity/AbstractListActivity.java	2011-07-05 15:54:36 +0000
@@ -17,6 +17,7 @@
 import ru.orangesoftware.financisto.db.DatabaseAdapter;
 import ru.orangesoftware.financisto.db.MyEntityManager;
 import ru.orangesoftware.financisto.utils.MenuItemInfo;
+import ru.orangesoftware.financisto.utils.PinProtection;
 import android.app.ListActivity;
 import android.content.Intent;
 import android.database.Cursor;
@@ -98,6 +99,18 @@
 		db.close();
 		super.onDestroy();
 	}
+
+	@Override
+	protected void onPause() {
+		super.onPause();
+		PinProtection.lock(this);
+	}
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+		PinProtection.unlock(this);
+	}
 	
 	@Override
 	public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
@@ -192,5 +205,4 @@
 			requeryCursor();
 		}
 	}
-	
 }

=== modified file 'src/ru/orangesoftware/financisto/activity/AttributeActivity.java'
--- src/ru/orangesoftware/financisto/activity/AttributeActivity.java	2011-02-20 19:39:08 +0000
+++ src/ru/orangesoftware/financisto/activity/AttributeActivity.java	2011-07-05 15:54:36 +0000
@@ -14,6 +14,7 @@
 import ru.orangesoftware.financisto.db.DatabaseAdapter;
 import ru.orangesoftware.financisto.db.DatabaseHelper.AttributeColumns;
 import ru.orangesoftware.financisto.model.Attribute;
+import ru.orangesoftware.financisto.utils.PinProtection;
 import ru.orangesoftware.financisto.utils.Utils;
 import android.app.Activity;
 import android.content.Intent;
@@ -126,6 +127,18 @@
 	}
 
 	@Override
+	protected void onPause() {
+		super.onPause();
+		PinProtection.lock(this);
+	}
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+		PinProtection.unlock(this);
+	}
+	
+	@Override
 	public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
 		boolean showDefaultCheck = Attribute.TYPE_CHECKBOX - position == 1;
 		findViewById(R.id.default_value_layout1).setVisibility(!showDefaultCheck ? View.VISIBLE : View.GONE);

=== modified file 'src/ru/orangesoftware/financisto/activity/CurrencyActivity.java'
--- src/ru/orangesoftware/financisto/activity/CurrencyActivity.java	2011-06-20 15:01:29 +0000
+++ src/ru/orangesoftware/financisto/activity/CurrencyActivity.java	2011-07-05 15:54:36 +0000
@@ -25,6 +25,7 @@
 import ru.orangesoftware.financisto.db.MyEntityManager;
 import ru.orangesoftware.financisto.model.Currency;
 import ru.orangesoftware.financisto.utils.CurrencyCache;
+import ru.orangesoftware.financisto.utils.PinProtection;
 
 import java.text.DecimalFormatSymbols;
 
@@ -153,5 +154,16 @@
 		db.close();
 		super.onDestroy();
 	}
+	
+	@Override
+	protected void onPause() {
+		super.onPause();
+		PinProtection.lock(this);
+	}
 
+	@Override
+	protected void onResume() {
+		super.onResume();
+		PinProtection.unlock(this);
+	}
 }

=== modified file 'src/ru/orangesoftware/financisto/activity/MainActivity.java'
--- src/ru/orangesoftware/financisto/activity/MainActivity.java	2011-06-21 16:47:12 +0000
+++ src/ru/orangesoftware/financisto/activity/MainActivity.java	2011-07-05 15:54:36 +0000
@@ -62,16 +62,15 @@
 import ru.orangesoftware.financisto.utils.EntityEnum;
 import ru.orangesoftware.financisto.utils.EnumUtils;
 import ru.orangesoftware.financisto.utils.MyPreferences;
+import ru.orangesoftware.financisto.utils.PinProtection;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 public class MainActivity extends TabActivity implements TabHost.OnTabChangeListener {
 	
-	private static final int ACTIVITY_PIN = 1;
 	private static final int ACTIVITY_CSV_EXPORT = 2;
     private static final int ACTIVITY_QIF_EXPORT = 3;
 
@@ -90,25 +89,12 @@
 
 	private final HashMap<String, Boolean> started = new HashMap<String, Boolean>();
 
-	private boolean shouldAskForPinOnResume = false;
-    private long activityPausedAtTime = 0;
-
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		requestWindowFeature(Window.FEATURE_NO_TITLE);
-
-		Boolean isPinProtected = (Boolean)getLastNonConfigurationInstance();
-		if (isPinProtected == null) {
-			isPinProtected = true;
-		}
 		
-		if (isPinProtected && MyPreferences.shouldAskForPin(this)) {
-            shouldAskForPinOnResume = false;
-            askForPin();
-		} else {
-			initialLoad();
-		}
+		initialLoad();
 		
 		if (MyPreferences.isSendErrorReport(this)) {
 			ExceptionHandler.register(this, "http://orangesoftware.ru/bugs/server.php");		
@@ -125,45 +111,27 @@
 		tabHost.setOnTabChangedListener(this);		
     }
 
-    private void askForPin() {
-        Intent intent = new Intent(this, PinActivity.class);
-        startActivityForResult(intent, ACTIVITY_PIN);
-    }
-
     @Override
     protected void onResume() {
         super.onResume();
-        if (shouldAskForPinOnResume && MyPreferences.isPinLockEnabled(this)) {
-            long deltaTimeMs = TimeUnit.MILLISECONDS.convert(MyPreferences.getLockTimeSeconds(this), TimeUnit.SECONDS);
-            if (deltaTimeMs > 0 && System.currentTimeMillis() - activityPausedAtTime > deltaTimeMs) {
-                askForPin();
-            }
-        }
+        PinProtection.unlock(this);
     }
 
     @Override
     protected void onPause() {
         super.onPause();
-        shouldAskForPinOnResume = true;
-        activityPausedAtTime = System.currentTimeMillis();
-        MyPreferences.setPinRequired(true);
+        PinProtection.lock(this);
     }
-
+    
     @Override
-    public Object onRetainNonConfigurationInstance() {
-        return MyPreferences.shouldAskForPin(this);
+    protected void onDestroy() {
+        super.onDestroy();
+        PinProtection.immediateLock(this);
     }
 
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		if (requestCode == ACTIVITY_PIN) {
-			if (resultCode == RESULT_OK && data != null && data.hasExtra(PinActivity.SUCCESS)) {
-				initialLoad();			
-			} else {		
-				finish();
-				System.exit(-1);
-			}
-		} else if (requestCode == ACTIVITY_CSV_EXPORT) {
+		if (requestCode == ACTIVITY_CSV_EXPORT) {
 			if (resultCode == RESULT_OK) {
 				WhereFilter filter = WhereFilter.fromIntent(data);
 				Currency currency = new Currency();
@@ -231,12 +199,6 @@
 	}
 
 	@Override
-	protected void onStop() {
-		super.onStop();
-		MyPreferences.setPinRequired(true);
-	}
-	
-	@Override
 	public void onTabChanged(String tabId) {
 		if (started.containsKey(tabId)) {
 			Context c = getTabHost().getCurrentView().getContext();

=== modified file 'src/ru/orangesoftware/financisto/activity/MonthlyViewActivity.java'
--- src/ru/orangesoftware/financisto/activity/MonthlyViewActivity.java	2011-02-23 12:53:52 +0000
+++ src/ru/orangesoftware/financisto/activity/MonthlyViewActivity.java	2011-07-05 15:54:36 +0000
@@ -12,6 +12,7 @@
 import ru.orangesoftware.financisto.model.Account;
 import ru.orangesoftware.financisto.model.AccountType;
 import ru.orangesoftware.financisto.model.Currency;
+import ru.orangesoftware.financisto.utils.PinProtection;
 import ru.orangesoftware.financisto.utils.Utils;
 import android.app.ListActivity;
 import android.content.Intent;
@@ -102,8 +103,18 @@
     	dbAdapter.close();
     	super.onDestroy();
     }
+	
+	@Override
+	protected void onPause() {
+		super.onPause();
+		PinProtection.lock(this);
+	}
 
-    
+	@Override
+	protected void onResume() {
+		super.onResume();
+		PinProtection.unlock(this);
+	}
     
     /**
      * Initialize data and GUI elements.

=== modified file 'src/ru/orangesoftware/financisto/activity/MyEntityActivity.java'
--- src/ru/orangesoftware/financisto/activity/MyEntityActivity.java	2011-02-20 19:39:08 +0000
+++ src/ru/orangesoftware/financisto/activity/MyEntityActivity.java	2011-07-05 15:54:36 +0000
@@ -22,6 +22,7 @@
 import ru.orangesoftware.financisto.db.DatabaseHelper;
 import ru.orangesoftware.financisto.db.MyEntityManager;
 import ru.orangesoftware.financisto.model.MyEntity;
+import ru.orangesoftware.financisto.utils.PinProtection;
 
 public abstract class MyEntityActivity<T extends MyEntity> extends Activity {
 	
@@ -99,4 +100,15 @@
 		super.onDestroy();
 	}
 	
+	@Override
+	protected void onPause() {
+		super.onPause();
+		PinProtection.lock(this);
+	}
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+		PinProtection.unlock(this);
+	}
 }

=== modified file 'src/ru/orangesoftware/financisto/activity/PinActivity.java'
--- src/ru/orangesoftware/financisto/activity/PinActivity.java	2011-02-20 19:39:08 +0000
+++ src/ru/orangesoftware/financisto/activity/PinActivity.java	2011-07-05 15:54:36 +0000
@@ -39,11 +39,15 @@
 
 	@Override
 	public void onSuccess(String pinBase64) {
-		MyPreferences.setPinRequired(false);
+		MyPreferences.setPinLockEnabled(this, false);
 		Intent data = new Intent();
 		data.putExtra(SUCCESS, true);
 		setResult(RESULT_OK, data);
 		finish();
 	}
 
+	@Override
+	public void onBackPressed() {
+	}
+
 }

=== modified file 'src/ru/orangesoftware/financisto/activity/PreferencesActivity.java'
--- src/ru/orangesoftware/financisto/activity/PreferencesActivity.java	2011-02-20 19:39:08 +0000
+++ src/ru/orangesoftware/financisto/activity/PreferencesActivity.java	2011-07-05 15:54:36 +0000
@@ -12,6 +12,7 @@
 
 import ru.orangesoftware.financisto.R;
 import ru.orangesoftware.financisto.utils.MyPreferences;
+import ru.orangesoftware.financisto.utils.PinProtection;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.Intent.ShortcutIconResource;
@@ -75,4 +76,16 @@
 		return intent;
 	}
 
+	@Override
+	protected void onPause() {
+		super.onPause();
+		PinProtection.lock(this);
+	}
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+		PinProtection.unlock(this);
+	}
+
 }

=== modified file 'src/ru/orangesoftware/financisto/activity/RecurActivity.java'
--- src/ru/orangesoftware/financisto/activity/RecurActivity.java	2011-02-20 19:39:08 +0000
+++ src/ru/orangesoftware/financisto/activity/RecurActivity.java	2011-07-05 15:54:36 +0000
@@ -16,6 +16,7 @@
 import ru.orangesoftware.financisto.R;
 import ru.orangesoftware.financisto.utils.DateUtils;
 import ru.orangesoftware.financisto.utils.LocalizableEnum;
+import ru.orangesoftware.financisto.utils.PinProtection;
 import ru.orangesoftware.financisto.utils.RecurUtils;
 import ru.orangesoftware.financisto.utils.Utils;
 import ru.orangesoftware.financisto.utils.RecurUtils.DayOfWeek;
@@ -422,5 +423,16 @@
 		}
 		return selected;
 	}
+	
+	@Override
+	protected void onPause() {
+		super.onPause();
+		PinProtection.lock(this);
+	}
 
+	@Override
+	protected void onResume() {
+		super.onResume();
+		PinProtection.unlock(this);
+	}
 }

=== modified file 'src/ru/orangesoftware/financisto/activity/Report2DChartActivity.java'
--- src/ru/orangesoftware/financisto/activity/Report2DChartActivity.java	2011-02-20 19:39:08 +0000
+++ src/ru/orangesoftware/financisto/activity/Report2DChartActivity.java	2011-07-05 15:54:36 +0000
@@ -13,6 +13,7 @@
 import ru.orangesoftware.financisto.report.*;
 import ru.orangesoftware.financisto.utils.CurrencyCache;
 import ru.orangesoftware.financisto.utils.MyPreferences;
+import ru.orangesoftware.financisto.utils.PinProtection;
 import ru.orangesoftware.financisto.utils.Utils;
 import ru.orangesoftware.financisto.view.Report2DChartView;
 import android.app.Activity;
@@ -482,4 +483,15 @@
 		super.onDestroy();
 	}
 	
+	@Override
+	protected void onPause() {
+		super.onPause();
+		PinProtection.lock(this);
+	}
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+		PinProtection.unlock(this);
+	}
 }

=== modified file 'src/ru/orangesoftware/financisto/activity/ReportActivity.java'
--- src/ru/orangesoftware/financisto/activity/ReportActivity.java	2011-04-18 14:37:21 +0000
+++ src/ru/orangesoftware/financisto/activity/ReportActivity.java	2011-07-05 15:54:36 +0000
@@ -36,6 +36,7 @@
 import ru.orangesoftware.financisto.report.PeriodReport;
 import ru.orangesoftware.financisto.report.Report;
 import ru.orangesoftware.financisto.report.ReportData;
+import ru.orangesoftware.financisto.utils.PinProtection;
 
 public class ReportActivity extends ListActivity implements RequeryCursorActivity {
 
@@ -83,6 +84,18 @@
         showOrRemoveTotals();
 	}
 
+	@Override
+	protected void onPause() {
+		super.onPause();
+		PinProtection.lock(this);
+	}
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+		PinProtection.unlock(this);
+	}
+	
     private void showOrRemoveTotals() {
         if (!currentReport.shouldDisplayTotal()) {
             findViewById(R.id.labelTotal).setVisibility(View.GONE);

=== modified file 'src/ru/orangesoftware/financisto/activity/ReportPreferencesActivity.java'
--- src/ru/orangesoftware/financisto/activity/ReportPreferencesActivity.java	2011-02-20 19:39:08 +0000
+++ src/ru/orangesoftware/financisto/activity/ReportPreferencesActivity.java	2011-07-05 15:54:36 +0000
@@ -18,6 +18,7 @@
 import ru.orangesoftware.financisto.model.Currency;
 import ru.orangesoftware.financisto.utils.CurrencyCache;
 import ru.orangesoftware.financisto.utils.MyPreferences;
+import ru.orangesoftware.financisto.utils.PinProtection;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
@@ -107,5 +108,16 @@
 			dialog.cancel();
 		return true;
 	}
+	
+	@Override
+	protected void onPause() {
+		super.onPause();
+		PinProtection.lock(this);
+	}
 
+	@Override
+	protected void onResume() {
+		super.onResume();
+		PinProtection.unlock(this);
+	}
 }

=== modified file 'src/ru/orangesoftware/financisto/activity/ReportsListActivity.java'
--- src/ru/orangesoftware/financisto/activity/ReportsListActivity.java	2011-02-20 19:39:08 +0000
+++ src/ru/orangesoftware/financisto/activity/ReportsListActivity.java	2011-07-05 15:54:36 +0000
@@ -16,6 +16,7 @@
 import ru.orangesoftware.financisto.graph.Report2DChart;
 import ru.orangesoftware.financisto.report.Report;
 import ru.orangesoftware.financisto.report.ReportType;
+import ru.orangesoftware.financisto.utils.PinProtection;
 import android.app.ListActivity;
 import android.content.Context;
 import android.content.Intent;
@@ -47,8 +48,19 @@
 		setContentView(R.layout.reports_list);		
 		setListAdapter(new ReportListAdapter(this, reports));
 	}
+	
+	@Override
+	protected void onPause() {
+		super.onPause();
+		PinProtection.lock(this);
+	}
 
 	@Override
+	protected void onResume() {
+		super.onResume();
+		PinProtection.unlock(this);
+	}
+	@Override
 	protected void onListItemClick(ListView l, View v, int position, long id) {
 		if (reports[position].isConventionalBarReport()) {
 			// Conventional Bars reports

=== modified file 'src/ru/orangesoftware/financisto/utils/MyPreferences.java'
--- src/ru/orangesoftware/financisto/utils/MyPreferences.java	2011-06-21 16:47:12 +0000
+++ src/ru/orangesoftware/financisto/utils/MyPreferences.java	2011-07-05 15:54:36 +0000
@@ -78,10 +78,6 @@
 		return sharedPreferences.getBoolean("use_my_location", true);
 	}
 
-	public static boolean shouldAskForPin(Context context) {
-		return isPinProtected(context) && isPinRequired;
-	}
-
     public static boolean isPinProtected(Context context) {
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
         return sharedPreferences.getBoolean("pin_protection", false);
@@ -92,6 +88,13 @@
         return isPinProtected(context) && sharedPreferences.getBoolean("pin_protection_lock", true);
     }
 
+    public static void setPinLockEnabled(Context context, boolean enabled) {
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+        SharedPreferences.Editor editor = sharedPreferences.edit();
+        editor.putBoolean("pin_protection_lock", enabled);
+        editor.commit();
+    }
+    
     public static int getLockTimeSeconds(Context context) {
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
         return isPinLockEnabled(context) ? 60*Integer.parseInt(sharedPreferences.getString("pin_protection_lock_time", "5")) : 0;
@@ -101,10 +104,6 @@
 		SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
 		return sharedPreferences.getString("pin", null);
 	}
-	
-	public static void setPinRequired(boolean isPinRequired) {
-		MyPreferences.isPinRequired = isPinRequired;
-	}
 
 	public static AccountSortOrder getAccountSortOrder(Context context) {
 		SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);

=== added file 'src/ru/orangesoftware/financisto/utils/PinProtection.java'
--- src/ru/orangesoftware/financisto/utils/PinProtection.java	1970-01-01 00:00:00 +0000
+++ src/ru/orangesoftware/financisto/utils/PinProtection.java	2011-07-05 15:54:36 +0000
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Timo Lindhorst
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     Timo Lindhorst - Initial implementation
+ ******************************************************************************/
+package ru.orangesoftware.financisto.utils;
+
+
+import java.util.concurrent.TimeUnit;
+
+import android.content.Context;
+import android.content.Intent;
+import ru.orangesoftware.financisto.activity.PinActivity;
+
+public class PinProtection {
+	private static long lockTime = 0;
+	private static boolean unlocked = false;
+	private static final int MIN_DELTA_TIME_MS = 3000;
+	
+	private static void askForPin(Context c) {
+		Intent intent = new Intent(c, PinActivity.class);
+		intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+		c.startActivity(intent);
+	}
+
+	public static void lock(Context c) {
+		if (unlocked) {
+			lockTime = System.currentTimeMillis();
+		}
+	}
+
+	public static void unlock(Context c) {
+		long curTime = System.currentTimeMillis();
+		long deltaTimeMs = TimeUnit.MILLISECONDS.convert(MyPreferences.getLockTimeSeconds(c), TimeUnit.SECONDS);
+		if (deltaTimeMs < MIN_DELTA_TIME_MS)
+			deltaTimeMs = MIN_DELTA_TIME_MS;
+		if ((curTime - lockTime) < deltaTimeMs) {
+			unlocked = true;
+		} else if (! MyPreferences.isPinProtected(c)) {
+			unlocked = true;
+			lockTime = System.currentTimeMillis();
+		} else if (! MyPreferences.isPinLockEnabled(c)) {
+			unlocked = true;
+			lockTime = System.currentTimeMillis();
+			MyPreferences.setPinLockEnabled(c, true);
+		} else {
+			askForPin(c);
+		}
+	}
+	
+	public static void immediateLock(Context c) {
+		lockTime = 0;
+		unlocked = false;
+	}
+}