diff options
Diffstat (limited to 'src/org/thialfihar/android/apg/BaseActivity.java')
| -rw-r--r-- | src/org/thialfihar/android/apg/BaseActivity.java | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/org/thialfihar/android/apg/BaseActivity.java b/src/org/thialfihar/android/apg/BaseActivity.java index c0a3b03e1..6ab2089f3 100644 --- a/src/org/thialfihar/android/apg/BaseActivity.java +++ b/src/org/thialfihar/android/apg/BaseActivity.java @@ -192,14 +192,9 @@ public class BaseActivity extends Activity case Id.request.secret_keys: {
if (resultCode == RESULT_OK) {
Bundle bundle = data.getExtras();
- long newId = bundle.getLong("selectedKeyId");
- if (getSecretKeyId() != newId) {
- Apg.setPassPhrase(null);
- }
- setSecretKeyId(newId);
+ setSecretKeyId(bundle.getLong("selectedKeyId"));
} else {
- setSecretKeyId(0);
- Apg.setPassPhrase(null);
+ setSecretKeyId(Id.key.none);
}
break;
}
@@ -271,8 +266,8 @@ public class BaseActivity extends Activity }
- public void passPhraseCallback(String passPhrase) {
- Apg.setPassPhrase(passPhrase);
+ public void passPhraseCallback(long keyId, String passPhrase) {
+ Apg.setCachedPassPhrase(keyId, passPhrase);
}
public void sendMessage(Message msg) {
|