aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-07-08 02:29:04 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-07-08 02:29:04 +0200
commit3af97bf0e6a711679343a86823b6639917787218 (patch)
tree605849f3bf7f97fbcf3b5330f7b896ff6d028893 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java
parent510999c3a2de2475f7828e283d4f01e46a4fe9f7 (diff)
downloadopen-keychain-3af97bf0e6a711679343a86823b6639917787218.tar.gz
open-keychain-3af97bf0e6a711679343a86823b6639917787218.tar.bz2
open-keychain-3af97bf0e6a711679343a86823b6639917787218.zip
some cleanup and fix for back button in ImportKeysActivity (fixes #1372)
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java
index f45f1b350..663ac3311 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java
@@ -257,7 +257,6 @@ public class ImportKeysProxyActivity extends FragmentActivity
Intent data = new Intent();
data.putExtras(returnData);
returnResult(data);
- return;
}
@Override