aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain
diff options
context:
space:
mode:
authorDaniel Haß <mail@danielhass.de>2014-03-04 13:58:26 +0100
committerDaniel Haß <mail@danielhass.de>2014-03-04 13:58:26 +0100
commit106027a7cd43001a2f9e620ee13ef60d39074c41 (patch)
treee3258bb3d15a8874f5fc11cdf0f2f21f25454107 /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain
parenta12b67c538a1934a35c45fbed3569056a786df67 (diff)
downloadopen-keychain-106027a7cd43001a2f9e620ee13ef60d39074c41.tar.gz
open-keychain-106027a7cd43001a2f9e620ee13ef60d39074c41.tar.bz2
open-keychain-106027a7cd43001a2f9e620ee13ef60d39074c41.zip
Fixed some naming
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain')
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java
index 98884689c..7ca7bc998 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java
@@ -38,9 +38,9 @@ public class ImportKeysListLoader extends AsyncTaskLoader<AsyncTaskResultWrapper
}
- public static class NonPGPPart extends Exception {
+ public static class NonPgpPart extends Exception {
private int count;
- public NonPGPPart(int count) {
+ public NonPgpPart(int count) {
this.count = count;
}
public int getCount() {
@@ -108,7 +108,7 @@ public class ImportKeysListLoader extends AsyncTaskLoader<AsyncTaskResultWrapper
private void generateListOfKeyrings(InputData inputData) {
boolean isEmpty = true;
- int nonPGPcounter = 0;
+ int nonPgpCounter = 0;
PositionAwareInputStream progressIn = new PositionAwareInputStream(
inputData.getInputStream());
@@ -135,14 +135,14 @@ public class ImportKeysListLoader extends AsyncTaskLoader<AsyncTaskResultWrapper
addToData(newKeyring);
} else {
Log.e(Constants.TAG, "Object not recognized as PGPKeyRing!");
- nonPGPcounter++;
+ nonPgpCounter++;
}
}
}
} catch (Exception e) {
Log.e(Constants.TAG, "Exception on parsing key file!", e);
entryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(data, e);
- nonPGPcounter = 0;
+ nonPgpCounter = 0;
}
if(isEmpty) {
@@ -151,9 +151,9 @@ public class ImportKeysListLoader extends AsyncTaskLoader<AsyncTaskResultWrapper
(data, new FileHasNoContent());
}
- if(nonPGPcounter > 0) {
+ if(nonPgpCounter > 0) {
entryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>
- (data, new NonPGPPart(nonPGPcounter));
+ (data, new NonPgpPart(nonPgpCounter));
}
}