aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-06-28 19:00:44 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-06-28 19:15:28 +0200
commitd6a2875816f6caf1b6ed8cbc69c4779192b54c99 (patch)
treee0b8a908ef8f205953c4188c9499c15a951ecf35 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
parentb7b22beafc69f9b936196eb2aea3b5fd89b3639e (diff)
downloadopen-keychain-d6a2875816f6caf1b6ed8cbc69c4779192b54c99.tar.gz
open-keychain-d6a2875816f6caf1b6ed8cbc69c4779192b54c99.tar.bz2
open-keychain-d6a2875816f6caf1b6ed8cbc69c4779192b54c99.zip
code cleanup and plurals in import log entries
closes #698
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index 60162a682..fab394a14 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -390,9 +390,6 @@ public class ImportKeysActivity extends ActionBarActivity {
/**
* Scroll ViewPager left and right
- *
- * @param event
- * @return
*/
@Override
public boolean onTouchEvent(MotionEvent event) {
@@ -432,7 +429,7 @@ public class ImportKeysActivity extends ActionBarActivity {
// get returned data bundle
Bundle returnData = message.getData();
final ImportResult result =
- returnData.<ImportResult>getParcelable(KeychainIntentService.RESULT);
+ returnData.getParcelable(KeychainIntentService.RESULT);
int resultType = result.getResult();