diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-27 09:46:42 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-27 09:46:42 +0100 |
commit | e8780b4410c4e4a45f08b4002722b32f0d22d279 (patch) | |
tree | 431846d5aba6b86a7a7ed3afd99976b9201dd471 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java | |
parent | fd29d27e61e531378f0c37c78028fb2e86989dea (diff) | |
parent | e77f9a535119f25b0f3ad31ef8065db18ceddff7 (diff) | |
download | open-keychain-e8780b4410c4e4a45f08b4002722b32f0d22d279.tar.gz open-keychain-e8780b4410c4e4a45f08b4002722b32f0d22d279.tar.bz2 open-keychain-e8780b4410c4e4a45f08b4002722b32f0d22d279.zip |
Merge branch 'development' into detached-sigs-api
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java index 9d1e8468c..144a16a48 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java @@ -39,18 +39,6 @@ import java.util.ArrayList; public class ImportKeysListLoader extends AsyncTaskLoader<AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>> { - public static class NonPgpPartException extends Exception { - private int mCount; - - public NonPgpPartException(int count) { - this.mCount = count; - } - - public int getCount() { - return mCount; - } - } - final Context mContext; final InputData mInputData; |