aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-04-12 21:23:59 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-04-12 21:23:59 +0200
commit9fc001c9b98e54f37eb8254a215f9d4c1e1c95ca (patch)
tree8f77779134c2fbe13fd635936eacae7b73781747 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
parent4a553087416097cfe08269c0417313fa691b3042 (diff)
downloadopen-keychain-9fc001c9b98e54f37eb8254a215f9d4c1e1c95ca.tar.gz
open-keychain-9fc001c9b98e54f37eb8254a215f9d4c1e1c95ca.tar.bz2
open-keychain-9fc001c9b98e54f37eb8254a215f9d4c1e1c95ca.zip
Clearer var naming
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
index ba3216c23..2e09db900 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
@@ -322,11 +322,11 @@ public class PassphraseCacheService extends Service {
/**
* Build pending intent that is executed by alarm manager to time out a specific passphrase
*/
- private static PendingIntent buildIntent(Context context, long keyId) {
+ private static PendingIntent buildIntent(Context context, long referenceKeyId) {
Intent intent = new Intent(BROADCAST_ACTION_PASSPHRASE_CACHE_SERVICE);
- intent.putExtra(EXTRA_KEY_ID, keyId);
+ intent.putExtra(EXTRA_KEY_ID, referenceKeyId);
// request code should be unique for each PendingIntent, thus keyId is used
- return PendingIntent.getBroadcast(context, (int) keyId, intent,
+ return PendingIntent.getBroadcast(context, (int) referenceKeyId, intent,
PendingIntent.FLAG_CANCEL_CURRENT);
}
@@ -400,15 +400,15 @@ public class PassphraseCacheService extends Service {
if (intent.hasExtra(EXTRA_SUBKEY_ID) && intent.hasExtra(EXTRA_KEY_ID)) {
- long keyId;
+ long referenceKeyId;
if (Preferences.getPreferences(mContext).getPassphraseCacheSubs()) {
- keyId = intent.getLongExtra(EXTRA_KEY_ID, 0L);
+ referenceKeyId = intent.getLongExtra(EXTRA_KEY_ID, 0L);
} else {
- keyId = intent.getLongExtra(EXTRA_SUBKEY_ID, 0L);
+ referenceKeyId = intent.getLongExtra(EXTRA_SUBKEY_ID, 0L);
}
// Stop specific ttl alarm and
- am.cancel(buildIntent(this, keyId));
- mPassphraseCache.delete(keyId);
+ am.cancel(buildIntent(this, referenceKeyId));
+ mPassphraseCache.delete(referenceKeyId);
} else {