From 72fb3ef3cc894e9849b8b84bfd76148489e558d8 Mon Sep 17 00:00:00 2001 From: Dominik Date: Mon, 10 Sep 2012 19:57:39 +0200 Subject: started working on signing --- .../thialfihar/android/apg/service/ApgService.java | 80 +++++ .../android/apg/service/ApgServiceHandler.java | 109 +++++++ .../android/apg/ui/KeyServerUploadActivity.java | 2 +- .../thialfihar/android/apg/ui/SignKeyActivity.java | 354 ++++++++++++++------- 4 files changed, 435 insertions(+), 110 deletions(-) create mode 100644 org_apg/src/org/thialfihar/android/apg/service/ApgServiceHandler.java 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 279277ae6..8a2022825 100644 --- a/org_apg/src/org/thialfihar/android/apg/service/ApgService.java +++ b/org_apg/src/org/thialfihar/android/apg/service/ApgService.java @@ -28,10 +28,18 @@ import java.io.OutputStream; import java.util.ArrayList; import java.util.Vector; +import org.spongycastle.jce.provider.BouncyCastleProvider; import org.spongycastle.openpgp.PGPKeyRing; +import org.spongycastle.openpgp.PGPPrivateKey; +import org.spongycastle.openpgp.PGPPublicKey; import org.spongycastle.openpgp.PGPPublicKeyRing; import org.spongycastle.openpgp.PGPSecretKey; import org.spongycastle.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPSignature; +import org.spongycastle.openpgp.PGPSignatureGenerator; +import org.spongycastle.openpgp.PGPSignatureSubpacketGenerator; +import org.spongycastle.openpgp.PGPSignatureSubpacketVector; +import org.spongycastle.openpgp.PGPUtil; import org.thialfihar.android.apg.Constants; import org.thialfihar.android.apg.Id; import org.thialfihar.android.apg.R; @@ -55,6 +63,9 @@ import android.os.Bundle; import android.os.Message; import android.os.Messenger; import android.os.RemoteException; +import android.widget.CheckBox; +import android.widget.Spinner; + import org.thialfihar.android.apg.util.Log; /** @@ -138,6 +149,10 @@ public class ApgService extends IntentService implements ProgressDialogUpdater { public static final String QUERY_KEY_STRING = "queryKeyString"; public static final String QUERY_KEY_ID = "queryKeyId"; + // sign key + public static final String SIGN_KEY_MASTER_KEY_ID = "signKeyMasterKeyId"; + public static final String SIGN_KEY_PUB_KEY_ID = "signKeyPubKeyId"; + /* possible EXTRA_ACTIONs */ public static final int ACTION_ENCRYPT_SIGN = 10; @@ -155,6 +170,8 @@ public class ApgService extends IntentService implements ProgressDialogUpdater { public static final int ACTION_UPLOAD_KEY = 60; public static final int ACTION_QUERY_KEY = 61; + public static final int ACTION_SIGN_KEY = 70; + /* possible data keys as result send over messenger */ // keys public static final String RESULT_NEW_KEY = "newKey"; @@ -784,6 +801,69 @@ public class ApgService extends IntentService implements ProgressDialogUpdater { break; + case ACTION_SIGN_KEY: + try { + + /* Input */ + + long masterKeyId = data.getInt(SIGN_KEY_MASTER_KEY_ID); + long pubKeyId = data.getInt(SIGN_KEY_PUB_KEY_ID); + + /* Operation */ + + String passphrase = PGPMain.getCachedPassPhrase(masterKeyId); + if (passphrase == null || passphrase.length() <= 0) { + sendErrorToHandler(new GeneralException("Unable to obtain passphrase")); + } else { + PGPPublicKeyRing pubring = PGPMain.getPublicKeyRing(pubKeyId); + + /* + * sign the incoming key + */ + PGPSecretKey secretKey = PGPMain.getSecretKey(masterKeyId); + PGPPrivateKey signingKey = secretKey.extractPrivateKey( + passphrase.toCharArray(), BouncyCastleProvider.PROVIDER_NAME); + PGPSignatureGenerator sGen = new PGPSignatureGenerator(secretKey.getPublicKey() + .getAlgorithm(), PGPUtil.SHA256, BouncyCastleProvider.PROVIDER_NAME); + sGen.initSign(PGPSignature.DIRECT_KEY, signingKey); + + PGPSignatureSubpacketGenerator spGen = new PGPSignatureSubpacketGenerator(); + + PGPSignatureSubpacketVector packetVector = spGen.generate(); + sGen.setHashedSubpackets(packetVector); + + PGPPublicKey signedKey = PGPPublicKey.addCertification( + pubring.getPublicKey(pubKeyId), sGen.generate()); + pubring = PGPPublicKeyRing.insertPublicKey(pubring, signedKey); + + // check if we need to send the key to the server or not + // CheckBox sendKey = (CheckBox) findViewById(R.id.sendKey); + // if (sendKey.isChecked()) { + // Spinner keyServer = (Spinner) findViewById(R.id.keyServer); + // HkpKeyServer server = new HkpKeyServer((String) keyServer.getSelectedItem()); + // + // /* + // * upload the newly signed key to the key server + // */ + // + // PGPMain.uploadKeyRingToServer(server, pubring); + // } + + // store the signed key in our local cache + int retval = PGPMain.storeKeyRingInCache(pubring); + if (retval != Id.return_value.ok && retval != Id.return_value.updated) { + sendErrorToHandler(new GeneralException( + "Failed to store signed key in local cache")); + } + } + + sendMessageToHandler(ApgServiceHandler.MESSAGE_OKAY); + } catch (Exception e) { + sendErrorToHandler(e); + } + + break; + default: break; } diff --git a/org_apg/src/org/thialfihar/android/apg/service/ApgServiceHandler.java b/org_apg/src/org/thialfihar/android/apg/service/ApgServiceHandler.java new file mode 100644 index 000000000..91b7d4451 --- /dev/null +++ b/org_apg/src/org/thialfihar/android/apg/service/ApgServiceHandler.java @@ -0,0 +1,109 @@ +/* + * Copyright (C) 2012 Dominik Schürmann + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.thialfihar.android.apg.service; + +import org.thialfihar.android.apg.R; +import org.thialfihar.android.apg.ui.dialog.ProgressDialogFragment; + +import android.app.Activity; +import android.os.Bundle; +import android.os.Handler; +import android.os.Message; +import android.support.v4.app.FragmentActivity; +import android.widget.Toast; + +public class ApgServiceHandler extends Handler { + + // possible messages send from this service to handler on ui + public static final int MESSAGE_OKAY = 1; + public static final int MESSAGE_EXCEPTION = 2; + public static final int MESSAGE_UPDATE_PROGRESS = 3; + + // possible data keys for messages + public static final String DATA_ERROR = "error"; + public static final String DATA_PROGRESS = "progress"; + public static final String DATA_PROGRESS_MAX = "max"; + public static final String DATA_MESSAGE = "message"; + public static final String DATA_MESSAGE_ID = "message_id"; + + Activity mActivity; + ProgressDialogFragment mProgressDialogFragment; + + public ApgServiceHandler(Activity activity) { + this.mActivity = activity; + } + + public ApgServiceHandler(Activity activity, ProgressDialogFragment progressDialogFragment) { + this.mActivity = activity; + this.mProgressDialogFragment = progressDialogFragment; + } + + public ApgServiceHandler(Activity activity, int progressDialogMessageId, int progressDialogStyle) { + this.mActivity = activity; + this.mProgressDialogFragment = ProgressDialogFragment.newInstance(progressDialogMessageId, + progressDialogStyle); + } + + public void showProgressDialog(FragmentActivity activity) { + mProgressDialogFragment.show(activity.getSupportFragmentManager(), "progressDialog"); + } + + @Override + public void handleMessage(Message message) { + Bundle data = message.getData(); + + switch (message.arg1) { + case MESSAGE_OKAY: + mProgressDialogFragment.dismiss(); + + break; + + case MESSAGE_EXCEPTION: + mProgressDialogFragment.dismiss(); + + // show error from service + if (data.containsKey(DATA_ERROR)) { + Toast.makeText(mActivity, + mActivity.getString(R.string.errorMessage, data.getString(DATA_ERROR)), + Toast.LENGTH_SHORT).show(); + } + + break; + + case MESSAGE_UPDATE_PROGRESS: + if (data.containsKey(DATA_PROGRESS) && data.containsKey(DATA_PROGRESS_MAX)) { + + // update progress from service + if (data.containsKey(DATA_MESSAGE)) { + mProgressDialogFragment.setProgress(data.getString(DATA_MESSAGE), + data.getInt(DATA_PROGRESS), data.getInt(DATA_PROGRESS_MAX)); + } else if (data.containsKey(DATA_MESSAGE_ID)) { + mProgressDialogFragment.setProgress(data.getInt(DATA_MESSAGE_ID), + data.getInt(DATA_PROGRESS), data.getInt(DATA_PROGRESS_MAX)); + } else { + mProgressDialogFragment.setProgress(data.getInt(DATA_PROGRESS), + data.getInt(DATA_PROGRESS_MAX)); + } + } + + break; + + default: + break; + } + } +} diff --git a/org_apg/src/org/thialfihar/android/apg/ui/KeyServerUploadActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/KeyServerUploadActivity.java index 85a9c9021..bc14b160a 100644 --- a/org_apg/src/org/thialfihar/android/apg/ui/KeyServerUploadActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/KeyServerUploadActivity.java @@ -118,7 +118,7 @@ public class KeyServerUploadActivity extends SherlockFragmentActivity { intent.putExtra(ApgService.EXTRA_DATA, data); // Message is received after uploading is done in ApgService - ApgServiceHandler saveHandler = new ApgServiceHandler(this, R.string.progress_importing, + ApgServiceHandler saveHandler = new ApgServiceHandler(this, R.string.progress_exporting, ProgressDialog.STYLE_HORIZONTAL) { public void handleMessage(Message message) { // handle messages by standard ApgHandler first diff --git a/org_apg/src/org/thialfihar/android/apg/ui/SignKeyActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/SignKeyActivity.java index c62462c40..3ae2d6e50 100644 --- a/org_apg/src/org/thialfihar/android/apg/ui/SignKeyActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/SignKeyActivity.java @@ -36,13 +36,22 @@ import org.thialfihar.android.apg.Constants; import org.thialfihar.android.apg.Id; import org.thialfihar.android.apg.R; import org.thialfihar.android.apg.helper.PGPMain; +import org.thialfihar.android.apg.helper.Preferences; +import org.thialfihar.android.apg.service.ApgService; +import org.thialfihar.android.apg.service.ApgServiceHandler; +import org.thialfihar.android.apg.ui.dialog.PassphraseDialogFragment; import org.thialfihar.android.apg.util.HkpKeyServer; +import com.actionbarsherlock.app.SherlockFragmentActivity; import com.actionbarsherlock.view.MenuItem; +import android.app.ProgressDialog; import android.content.Intent; import android.os.Bundle; +import android.os.Handler; import android.os.Message; +import android.os.Messenger; + import org.thialfihar.android.apg.util.Log; import android.view.View; import android.view.View.OnClickListener; @@ -59,7 +68,7 @@ import android.widget.Toast; * * signs the specified public key with the specified secret master key */ -public class SignKeyActivity extends BaseActivity { +public class SignKeyActivity extends SherlockFragmentActivity { public static final String EXTRA_KEY_ID = "keyId"; @@ -93,7 +102,8 @@ public class SignKeyActivity extends BaseActivity { final Spinner keyServer = (Spinner) findViewById(R.id.keyServer); ArrayAdapter adapter = new ArrayAdapter(this, - android.R.layout.simple_spinner_item, mPreferences.getKeyServers()); + android.R.layout.simple_spinner_item, Preferences.getPreferences(this) + .getKeyServers()); adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); keyServer.setAdapter(adapter); @@ -139,6 +149,32 @@ public class SignKeyActivity extends BaseActivity { } } + private void showPassphraseDialog(final long secretKeyId) { + // Message is received after passphrase is cached + Handler returnHandler = new Handler() { + @Override + public void handleMessage(Message message) { + if (message.what == PassphraseDialogFragment.MESSAGE_OKAY) { + startSigning(); + } + } + }; + + // Create a new Messenger for the communication back + Messenger messenger = new Messenger(returnHandler); + + try { + PassphraseDialogFragment passphraseDialog = PassphraseDialogFragment.newInstance( + messenger, secretKeyId); + + passphraseDialog.show(getSupportFragmentManager(), "passphraseDialog"); + } catch (PGPMain.GeneralException e) { + Log.d(Constants.TAG, "No passphrase for this secret key, encrypt directly!"); + // send message to handler to start encryption directly + returnHandler.sendEmptyMessage(PassphraseDialogFragment.MESSAGE_OKAY); + } + } + /** * handles the UI bits of the signing process on the UI thread */ @@ -164,7 +200,7 @@ public class SignKeyActivity extends BaseActivity { */ String passphrase = PGPMain.getCachedPassPhrase(masterKeyId); if (passphrase == null) { - showDialog(Id.dialog.pass_phrase); + showPassphraseDialog(masterKeyId); return; // bail out; need to wait until the user has entered the passphrase // before trying again } else { @@ -172,14 +208,14 @@ public class SignKeyActivity extends BaseActivity { } } else { final Bundle status = new Bundle(); - Message msg = new Message(); + // Message msg = new Message(); - status.putString(EXTRA_ERROR, "Key has already been signed"); + // status.putString(EXTRA_ERROR, "Key has already been signed"); - status.putInt(Constants.extras.STATUS, Id.message.done); + // status.putInt(Constants.extras.STATUS, Id.message.done); - msg.setData(status); - sendMessage(msg); + // msg.setData(status); + // sendMessage(msg); setResult(Id.return_value.error); finish(); @@ -187,111 +223,211 @@ public class SignKeyActivity extends BaseActivity { } } - @Override - public long getSecretKeyId() { - return masterKeyId; - } - - @Override - public void passPhraseCallback(long keyId, String passPhrase) { - super.passPhraseCallback(keyId, passPhrase); - startSigning(); - } + // @Override + // public long getSecretKeyId() { + // return masterKeyId; + // } + // + // @Override + // public void passPhraseCallback(long keyId, String passPhrase) { + // super.passPhraseCallback(keyId, passPhrase); + // startSigning(); + // } /** * kicks off the actual signing process on a background thread */ private void startSigning() { - showDialog(Id.dialog.signing); - startThread(); - } + // Send all information needed to service to sign key in other thread + Intent intent = new Intent(this, ApgService.class); - @Override - public void run() { - final Bundle status = new Bundle(); - Message msg = new Message(); + intent.putExtra(ApgService.EXTRA_ACTION, ApgService.ACTION_SIGN_KEY); - try { - String passphrase = PGPMain.getCachedPassPhrase(masterKeyId); - if (passphrase == null || passphrase.length() <= 0) { - status.putString(EXTRA_ERROR, "Unable to obtain passphrase"); - } else { - PGPPublicKeyRing pubring = PGPMain.getPublicKeyRing(pubKeyId); + // fill values for this action + Bundle data = new Bundle(); - /* - * sign the incoming key - */ - PGPSecretKey secretKey = PGPMain.getSecretKey(masterKeyId); - PGPPrivateKey signingKey = secretKey.extractPrivateKey(passphrase.toCharArray(), - BouncyCastleProvider.PROVIDER_NAME); - PGPSignatureGenerator sGen = new PGPSignatureGenerator(secretKey.getPublicKey() - .getAlgorithm(), PGPUtil.SHA256, BouncyCastleProvider.PROVIDER_NAME); - sGen.initSign(PGPSignature.DIRECT_KEY, signingKey); + int keyRingId = getIntent().getIntExtra(EXTRA_KEY_ID, -1); + data.putInt(ApgService.UPLOAD_KEY_KEYRING_ID, keyRingId); - PGPSignatureSubpacketGenerator spGen = new PGPSignatureSubpacketGenerator(); + Spinner keyServer = (Spinner) findViewById(R.id.keyServer); + String server = (String) keyServer.getSelectedItem(); + data.putString(ApgService.UPLOAD_KEY_SERVER, server); - PGPSignatureSubpacketVector packetVector = spGen.generate(); - sGen.setHashedSubpackets(packetVector); + intent.putExtra(ApgService.EXTRA_DATA, data); - PGPPublicKey signedKey = PGPPublicKey.addCertification( - pubring.getPublicKey(pubKeyId), sGen.generate()); - pubring = PGPPublicKeyRing.insertPublicKey(pubring, signedKey); + // Message is received after signing is done in ApgService + ApgServiceHandler saveHandler = new ApgServiceHandler(this, R.string.progress_signing, + ProgressDialog.STYLE_HORIZONTAL) { + public void handleMessage(Message message) { + // handle messages by standard ApgHandler first + super.handleMessage(message); - // check if we need to send the key to the server or not - CheckBox sendKey = (CheckBox) findViewById(R.id.sendKey); - if (sendKey.isChecked()) { - Spinner keyServer = (Spinner) findViewById(R.id.keyServer); - HkpKeyServer server = new HkpKeyServer((String) keyServer.getSelectedItem()); + if (message.arg1 == ApgServiceHandler.MESSAGE_OKAY) { - /* - * upload the newly signed key to the key server - */ + Toast.makeText(SignKeyActivity.this, R.string.keySignSuccess, + Toast.LENGTH_SHORT).show(); - PGPMain.uploadKeyRingToServer(server, pubring); + // check if we need to send the key to the server or not + CheckBox sendKey = (CheckBox) findViewById(R.id.sendKey); + if (sendKey.isChecked()) { + /* + * upload the newly signed key to the key server + */ + uploadKey(); + } else { + finish(); + } } + }; + }; - // store the signed key in our local cache - int retval = PGPMain.storeKeyRingInCache(pubring); - if (retval != Id.return_value.ok && retval != Id.return_value.updated) { - status.putString(EXTRA_ERROR, "Failed to store signed key in local cache"); - } - } - } catch (PGPException e) { - Log.e(Constants.TAG, "Failed to sign key", e); - status.putString(EXTRA_ERROR, "Failed to sign key"); - status.putInt(Constants.extras.STATUS, Id.message.done); - return; - } catch (NoSuchAlgorithmException e) { - Log.e(Constants.TAG, "Failed to sign key", e); - status.putString(EXTRA_ERROR, "Failed to sign key"); - status.putInt(Constants.extras.STATUS, Id.message.done); - return; - } catch (NoSuchProviderException e) { - Log.e(Constants.TAG, "Failed to sign key", e); - status.putString(EXTRA_ERROR, "Failed to sign key"); - status.putInt(Constants.extras.STATUS, Id.message.done); - return; - } catch (SignatureException e) { - Log.e(Constants.TAG, "Failed to sign key", e); - status.putString(EXTRA_ERROR, "Failed to sign key"); - status.putInt(Constants.extras.STATUS, Id.message.done); - return; - } + // Create a new Messenger for the communication back + Messenger messenger = new Messenger(saveHandler); + intent.putExtra(ApgService.EXTRA_MESSENGER, messenger); - status.putInt(Constants.extras.STATUS, Id.message.done); + // show progress dialog + saveHandler.showProgressDialog(this); - msg.setData(status); - sendMessage(msg); + // start service with intent + startService(intent); + } - if (status.containsKey(EXTRA_ERROR)) { - setResult(Id.return_value.error); - } else { - setResult(Id.return_value.ok); - } + private void uploadKey() { + // Send all information needed to service to upload key in other thread + Intent intent = new Intent(this, ApgService.class); + + intent.putExtra(ApgService.EXTRA_ACTION, ApgService.ACTION_UPLOAD_KEY); + + // fill values for this action + Bundle data = new Bundle(); + + data.putLong(ApgService.UPLOAD_KEY_KEYRING_ID, pubKeyId); + + Spinner keyServer = (Spinner) findViewById(R.id.keyServer); + String server = (String) keyServer.getSelectedItem(); + data.putString(ApgService.UPLOAD_KEY_SERVER, server); + + intent.putExtra(ApgService.EXTRA_DATA, data); + + // Message is received after uploading is done in ApgService + ApgServiceHandler saveHandler = new ApgServiceHandler(this, R.string.progress_exporting, + ProgressDialog.STYLE_HORIZONTAL) { + public void handleMessage(Message message) { + // handle messages by standard ApgHandler first + super.handleMessage(message); + + if (message.arg1 == ApgServiceHandler.MESSAGE_OKAY) { + + Toast.makeText(SignKeyActivity.this, R.string.keySendSuccess, + Toast.LENGTH_SHORT).show(); - finish(); + finish(); + } + }; + }; + + // Create a new Messenger for the communication back + Messenger messenger = new Messenger(saveHandler); + intent.putExtra(ApgService.EXTRA_MESSENGER, messenger); + + // show progress dialog + saveHandler.showProgressDialog(this); + + // start service with intent + startService(intent); } + // private void startSigning() { + // showDialog(Id.dialog.signing); + // startThread(); + // } + + // @Override + // public void run() { + // final Bundle status = new Bundle(); + // Message msg = new Message(); + // + // try { + // String passphrase = PGPMain.getCachedPassPhrase(masterKeyId); + // if (passphrase == null || passphrase.length() <= 0) { + // status.putString(EXTRA_ERROR, "Unable to obtain passphrase"); + // } else { + // PGPPublicKeyRing pubring = PGPMain.getPublicKeyRing(pubKeyId); + // + // /* + // * sign the incoming key + // */ + // PGPSecretKey secretKey = PGPMain.getSecretKey(masterKeyId); + // PGPPrivateKey signingKey = secretKey.extractPrivateKey(passphrase.toCharArray(), + // BouncyCastleProvider.PROVIDER_NAME); + // PGPSignatureGenerator sGen = new PGPSignatureGenerator(secretKey.getPublicKey() + // .getAlgorithm(), PGPUtil.SHA256, BouncyCastleProvider.PROVIDER_NAME); + // sGen.initSign(PGPSignature.DIRECT_KEY, signingKey); + // + // PGPSignatureSubpacketGenerator spGen = new PGPSignatureSubpacketGenerator(); + // + // PGPSignatureSubpacketVector packetVector = spGen.generate(); + // sGen.setHashedSubpackets(packetVector); + // + // PGPPublicKey signedKey = PGPPublicKey.addCertification( + // pubring.getPublicKey(pubKeyId), sGen.generate()); + // pubring = PGPPublicKeyRing.insertPublicKey(pubring, signedKey); + // + // // check if we need to send the key to the server or not + // CheckBox sendKey = (CheckBox) findViewById(R.id.sendKey); + // if (sendKey.isChecked()) { + // Spinner keyServer = (Spinner) findViewById(R.id.keyServer); + // HkpKeyServer server = new HkpKeyServer((String) keyServer.getSelectedItem()); + // + // /* + // * upload the newly signed key to the key server + // */ + // + // PGPMain.uploadKeyRingToServer(server, pubring); + // } + // + // // store the signed key in our local cache + // int retval = PGPMain.storeKeyRingInCache(pubring); + // if (retval != Id.return_value.ok && retval != Id.return_value.updated) { + // status.putString(EXTRA_ERROR, "Failed to store signed key in local cache"); + // } + // } + // } catch (PGPException e) { + // Log.e(Constants.TAG, "Failed to sign key", e); + // status.putString(EXTRA_ERROR, "Failed to sign key"); + // status.putInt(Constants.extras.STATUS, Id.message.done); + // return; + // } catch (NoSuchAlgorithmException e) { + // Log.e(Constants.TAG, "Failed to sign key", e); + // status.putString(EXTRA_ERROR, "Failed to sign key"); + // status.putInt(Constants.extras.STATUS, Id.message.done); + // return; + // } catch (NoSuchProviderException e) { + // Log.e(Constants.TAG, "Failed to sign key", e); + // status.putString(EXTRA_ERROR, "Failed to sign key"); + // status.putInt(Constants.extras.STATUS, Id.message.done); + // return; + // } catch (SignatureException e) { + // Log.e(Constants.TAG, "Failed to sign key", e); + // status.putString(EXTRA_ERROR, "Failed to sign key"); + // status.putInt(Constants.extras.STATUS, Id.message.done); + // return; + // } + // + // status.putInt(Constants.extras.STATUS, Id.message.done); + // + // msg.setData(status); + // sendMessage(msg); + // + // if (status.containsKey(EXTRA_ERROR)) { + // setResult(Id.return_value.error); + // } else { + // setResult(Id.return_value.ok); + // } + // + // finish(); + // } + @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { switch (requestCode) { @@ -312,22 +448,22 @@ public class SignKeyActivity extends BaseActivity { } } } - - @Override - public void doneCallback(Message msg) { - super.doneCallback(msg); - - removeDialog(Id.dialog.signing); - - Bundle data = msg.getData(); - String error = data.getString(EXTRA_ERROR); - if (error != null) { - Toast.makeText(this, getString(R.string.errorMessage, error), Toast.LENGTH_SHORT) - .show(); - return; - } - - Toast.makeText(this, R.string.keySignSuccess, Toast.LENGTH_SHORT).show(); - finish(); - } + // + // @Override + // public void doneCallback(Message msg) { + // super.doneCallback(msg); + // + // removeDialog(Id.dialog.signing); + // + // Bundle data = msg.getData(); + // String error = data.getString(EXTRA_ERROR); + // if (error != null) { + // Toast.makeText(this, getString(R.string.errorMessage, error), Toast.LENGTH_SHORT) + // .show(); + // return; + // } + // + // Toast.makeText(this, R.string.keySignSuccess, Toast.LENGTH_SHORT).show(); + // finish(); + // } } -- cgit v1.2.3