moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 11:12:15 -05:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:dschuermann/openpgp-keychain

Browse Source
This commit is contained in:
Dominik Schürmann 2014-01-24 16:05:42 +01:00
commit 206ba4e551
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenPGP-Keychain/res/values/arrays.xml
View File

@ -13,6 +13,7 @@
<item>@string/choice_2hours</item> <item>@string/choice_2hours</item>
<item>@string/choice_4hours</item> <item>@string/choice_4hours</item>
<item>@string/choice_8hours</item> <item>@string/choice_8hours</item>
<item>@string/choice_forever</item>
</string-array> </string-array>
<string-array name="pass_phrase_cache_ttl_values" translatable="false"> <string-array name="pass_phrase_cache_ttl_values" translatable="false">
<item>15</item> <item>15</item>
@ -26,6 +27,7 @@
<item>7200</item> <item>7200</item>
<item>14400</item> <item>14400</item>
<item>28800</item> <item>28800</item>
<item>-1</item>
</string-array> </string-array>
<string-array name="key_size_spinner_values" translatable="false"> <string-array name="key_size_spinner_values" translatable="false">
<item>@string/key_size_512</item> <item>@string/key_size_512</item>

1
OpenPGP-Keychain/res/values/strings.xml
View File

@ -166,6 +166,7 @@
<string name="choice_2hours">2 hours</string> <string name="choice_2hours">2 hours</string>
<string name="choice_4hours">4 hours</string> <string name="choice_4hours">4 hours</string>
<string name="choice_8hours">8 hours</string> <string name="choice_8hours">8 hours</string>
<string name="choice_forever">forever</string>
<string name="dsa">DSA</string> <string name="dsa">DSA</string>
<string name="elgamal">ElGamal</string> <string name="elgamal">ElGamal</string>
<string name="rsa">RSA</string> <string name="rsa">RSA</string>

2
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
View File

@ -291,10 +291,12 @@ public class PassphraseCacheService extends Service {
// add keyId and passphrase to memory // add keyId and passphrase to memory
mPassphraseCache.put(keyId, passphrase); mPassphraseCache.put(keyId, passphrase);
if (ttl > 0) {
// register new alarm with keyId for this passphrase // register new alarm with keyId for this passphrase
long triggerTime = new Date().getTime() + (ttl * 1000); long triggerTime = new Date().getTime() + (ttl * 1000);
AlarmManager am = (AlarmManager) this.getSystemService(Context.ALARM_SERVICE); AlarmManager am = (AlarmManager) this.getSystemService(Context.ALARM_SERVICE);
am.set(AlarmManager.RTC_WAKEUP, triggerTime, buildIntent(this, keyId)); am.set(AlarmManager.RTC_WAKEUP, triggerTime, buildIntent(this, keyId));
}
} else if (ACTION_PASSPHRASE_CACHE_GET.equals(intent.getAction())) { } else if (ACTION_PASSPHRASE_CACHE_GET.equals(intent.getAction())) {
long keyId = intent.getLongExtra(EXTRA_KEY_ID, -1); long keyId = intent.getLongExtra(EXTRA_KEY_ID, -1);
Messenger messenger = intent.getParcelableExtra(EXTRA_MESSENGER); Messenger messenger = intent.getParcelableExtra(EXTRA_MESSENGER);