aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintActivity.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-02-28 04:28:21 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-02-28 04:34:08 +0100
commit2ae4d6ce05e6ca1585239b779b1dd6f39f58050a (patch)
treec2a3b36c9ca3c890ad63f9cce32c172b370496dc /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintActivity.java
parentf3710b12f6a9c40b43f973c02790136fb17065ac (diff)
downloadopen-keychain-2ae4d6ce05e6ca1585239b779b1dd6f39f58050a.tar.gz
open-keychain-2ae4d6ce05e6ca1585239b779b1dd6f39f58050a.tar.bz2
open-keychain-2ae4d6ce05e6ca1585239b779b1dd6f39f58050a.zip
pass through messenger to certify service from ViewKeyActivity
the idea here is to handle progress and result of the CertifyActivity directly in ViewKeyActivity by passing a messenger through to it. this allows smoother transition from an uncertified to certified state.
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintActivity.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintActivity.java12
1 files changed, 0 insertions, 12 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintActivity.java
index c75f6d838..b7c80c1ed 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintActivity.java
@@ -17,14 +17,12 @@
package org.sufficientlysecure.keychain.ui;
-import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.view.View;
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.operations.results.OperationResult;
import org.sufficientlysecure.keychain.util.Log;
public class CertifyFingerprintActivity extends BaseActivity {
@@ -79,14 +77,4 @@ public class CertifyFingerprintActivity extends BaseActivity {
getSupportFragmentManager().executePendingTransactions();
}
- @Override
- protected void onActivityResult(int requestCode, int resultCode, Intent data) {
- // if a result has been returned, display a notify
- if (data != null && data.hasExtra(OperationResult.EXTRA_RESULT)) {
- setResult(RESULT_OK, data);
- finish();
- } else {
- super.onActivityResult(requestCode, resultCode, data);
- }
- }
}