mirror of
https://github.com/Kunzisoft/KeePassDX.git
synced 2026-11-21 09:31:29 -08:00
Add setting to control timeout duration.
This commit is contained in:
1 parent
0886f50e38
commit
3532cebcfa
6 files changed
+35
-2
No files matched your search
@@ -1,3 +1,6 @@
|
||||
KeePassDroid (1.5.10)
|
||||
* Add setting to control timeout duration.
|
||||
|
||||
KeePassDroid (1.5.9)
|
||||
* Bump target sdk to 8
|
||||
* Allow install to sdcard
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
<!-- Preference settings -->
|
||||
<string name="algorithm_key">algorithm</string>
|
||||
<string name="app_key">app</string>
|
||||
<string name="app_timeout_key">app_timeout_key</string>
|
||||
<string name="clipboard_timeout_key">clip_timeout_key</string>
|
||||
<string name="db_key">db</string>
|
||||
<string name="rounds_key">rounds</string>
|
||||
|
||||
@@ -29,6 +29,8 @@
|
||||
<string name="algorithm">Algorithm</string>
|
||||
<string name="algorithm_colon">Algorithm:</string>
|
||||
<string name="app_name">KeePassDroid</string>
|
||||
<string name="app_timeout">Application timeout</string>
|
||||
<string name="app_timeout_summary">Time before locking database when the application is inactive.</string>
|
||||
<string name="application">Application</string>
|
||||
<string name="application_settings">Application settings</string>
|
||||
<string name="building_search_idx">Building search index...</string>
|
||||
|
||||
@@ -52,6 +52,14 @@
|
||||
android:entryValues="@array/clipboard_timeout_values"
|
||||
android:dialogTitle="@string/clipboard_timeout"
|
||||
android:defaultValue="@string/clipboard_timeout_default"/>
|
||||
<ListPreference
|
||||
android:key="@string/app_timeout_key"
|
||||
android:title="@string/app_timeout"
|
||||
android:summary="@string/app_timeout_summary"
|
||||
android:entries="@array/clipboard_timeout_options"
|
||||
android:entryValues="@array/clipboard_timeout_values"
|
||||
android:dialogTitle="@string/app_timeout"
|
||||
android:defaultValue="@string/clipboard_timeout_default"/>
|
||||
<CheckBoxPreference
|
||||
android:key="@string/maskpass_key"
|
||||
android:title="@string/maskpass_title"
|
||||
|
||||
@@ -355,7 +355,7 @@ public class EntryActivity extends LockCloseActivity {
|
||||
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
|
||||
String sClipClear = prefs.getString(getString(R.string.clipboard_timeout_key), getString(R.string.clipboard_timeout_default));
|
||||
|
||||
long clipClearTime = Integer.parseInt(sClipClear);
|
||||
long clipClearTime = Long.parseLong(sClipClear);
|
||||
|
||||
if ( clipClearTime > 0 ) {
|
||||
mTimer.schedule(new ClearClipboardTask(this, text), clipClearTime);
|
||||
|
||||
@@ -4,8 +4,11 @@ import android.app.AlarmManager;
|
||||
import android.app.PendingIntent;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.SharedPreferences;
|
||||
import android.preference.PreferenceManager;
|
||||
import android.util.Log;
|
||||
|
||||
import com.android.keepass.R;
|
||||
import com.keepassdroid.intents.Intents;
|
||||
import com.keepassdroid.services.TimeoutService;
|
||||
|
||||
@@ -23,9 +26,25 @@ public class Timeout {
|
||||
|
||||
public static void start(Context ctx) {
|
||||
|
||||
|
||||
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx);
|
||||
String sTimeout = prefs.getString(ctx.getString(R.string.app_timeout_key), ctx.getString(R.string.clipboard_timeout_default));
|
||||
|
||||
long timeout;
|
||||
try {
|
||||
timeout = Long.parseLong(sTimeout);
|
||||
} catch (NumberFormatException e) {
|
||||
timeout = DEFAULT_TIMEOUT;
|
||||
}
|
||||
|
||||
if ( timeout == -1 ) {
|
||||
// No timeout don't start timeout service
|
||||
return;
|
||||
}
|
||||
|
||||
ctx.startService(new Intent(ctx, TimeoutService.class));
|
||||
|
||||
long triggerTime = System.currentTimeMillis() + DEFAULT_TIMEOUT;
|
||||
long triggerTime = System.currentTimeMillis() + timeout;
|
||||
AlarmManager am = (AlarmManager) ctx.getSystemService(Context.ALARM_SERVICE);
|
||||
|
||||
Log.d(TAG, "Timeout start");
|
||||
|
||||
Reference in new issue
Block a user