diff options
| author | Dominik <dominik@dominikschuermann.de> | 2012-10-31 18:38:40 +0100 |
|---|---|---|
| committer | Dominik <dominik@dominikschuermann.de> | 2012-10-31 18:38:40 +0100 |
| commit | 586358599e93214f36fb7d75e7dcbba68628fc32 (patch) | |
| tree | 690679cc70cc825a07868c0c31b8030839aded81 /org_apg/src/org/thialfihar/android/apg/service | |
| parent | 6fb9b8055d139d1036e3b3c5bacb2b2f305d6f34 (diff) | |
| download | open-keychain-586358599e93214f36fb7d75e7dcbba68628fc32.tar.gz open-keychain-586358599e93214f36fb7d75e7dcbba68628fc32.tar.bz2 open-keychain-586358599e93214f36fb7d75e7dcbba68628fc32.zip | |
small improvements
Diffstat (limited to 'org_apg/src/org/thialfihar/android/apg/service')
| -rw-r--r-- | org_apg/src/org/thialfihar/android/apg/service/ApgService.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/org_apg/src/org/thialfihar/android/apg/service/ApgService.java b/org_apg/src/org/thialfihar/android/apg/service/ApgService.java index a6a9f3a4c..547e1ee6a 100644 --- a/org_apg/src/org/thialfihar/android/apg/service/ApgService.java +++ b/org_apg/src/org/thialfihar/android/apg/service/ApgService.java @@ -150,7 +150,7 @@ public class ApgService extends IntentService implements ProgressDialogUpdater { // upload key public static final String UPLOAD_KEY_SERVER = "uploadKeyServer"; - public static final String UPLOAD_KEY_KEYRING_ID = "uploadKeyRingId"; + public static final String UPLOAD_KEY_KEYRING_ROW_ID = "uploadKeyRingId"; // query key public static final String QUERY_KEY_SERVER = "queryKeyServer"; @@ -736,14 +736,13 @@ public class ApgService extends IntentService implements ProgressDialogUpdater { try { /* Input */ - int keyRingId = data.getInt(UPLOAD_KEY_KEYRING_ID); + int keyRingRowId = data.getInt(UPLOAD_KEY_KEYRING_ROW_ID); String keyServer = data.getString(UPLOAD_KEY_SERVER); /* Operation */ HkpKeyServer server = new HkpKeyServer(keyServer); - PGPPublicKeyRing keyring = ProviderHelper.getPGPPublicKeyRingByMasterKeyId(this, - keyRingId); + PGPPublicKeyRing keyring = ProviderHelper.getPGPPublicKeyRing(this, keyRingRowId); if (keyring != null) { boolean uploaded = PGPMain.uploadKeyRingToServer(server, (PGPPublicKeyRing) keyring); |