diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-28 17:14:40 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-28 17:14:40 +0200 |
commit | 76522d90faa5a8727493a34786b4490919defc67 (patch) | |
tree | 05fce5d74058f6bd7b3a528a5f2221190dae233f /OpenKeychain/src | |
parent | b5b3ba0c7b9da3cb0e4167014bc31aa4c754a490 (diff) | |
download | open-keychain-76522d90faa5a8727493a34786b4490919defc67.tar.gz open-keychain-76522d90faa5a8727493a34786b4490919defc67.tar.bz2 open-keychain-76522d90faa5a8727493a34786b4490919defc67.zip |
Cleanup OpenPgpService2 code, update openpgp-api lib
Diffstat (limited to 'OpenKeychain/src')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService2.java | 54 |
1 files changed, 3 insertions, 51 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService2.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService2.java index 317d4dd73..110302e55 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService2.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService2.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2015 Dominik Schürmann <dominik@dominikschuermann.de> + * Copyright (C) 2015 Dominik Schürmann <dominik@dominikschuermann.de> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,64 +17,21 @@ package org.sufficientlysecure.keychain.remote; -import android.app.PendingIntent; -import android.content.Context; import android.content.Intent; -import android.database.Cursor; -import android.net.Uri; import android.os.Binder; import android.os.IBinder; import android.os.ParcelFileDescriptor; -import android.os.Parcelable; -import android.text.TextUtils; import org.openintents.openpgp.IOpenPgpService2; -import org.openintents.openpgp.OpenPgpDecryptionResult; -import org.openintents.openpgp.OpenPgpError; -import org.openintents.openpgp.OpenPgpMetadata; -import org.openintents.openpgp.OpenPgpSignatureResult; -import org.openintents.openpgp.util.OpenPgpApi; import org.sufficientlysecure.keychain.Constants; -import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult; -import org.sufficientlysecure.keychain.operations.results.OperationResult.LogEntryParcel; -import org.sufficientlysecure.keychain.operations.results.PgpSignEncryptResult; -import org.sufficientlysecure.keychain.pgp.PgpDecryptVerify; -import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyInputParcel; -import org.sufficientlysecure.keychain.pgp.PgpSecurityConstants; -import org.sufficientlysecure.keychain.pgp.PgpSignEncryptInputParcel; -import org.sufficientlysecure.keychain.pgp.PgpSignEncryptOperation; -import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException; -import org.sufficientlysecure.keychain.provider.KeychainContract; -import org.sufficientlysecure.keychain.provider.KeychainContract.ApiAccounts; -import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; -import org.sufficientlysecure.keychain.provider.KeychainDatabase.Tables; -import org.sufficientlysecure.keychain.provider.ProviderHelper; -import org.sufficientlysecure.keychain.remote.ui.RemoteServiceActivity; -import org.sufficientlysecure.keychain.remote.ui.SelectAllowedKeysActivity; -import org.sufficientlysecure.keychain.remote.ui.SelectSignKeyIdActivity; -import org.sufficientlysecure.keychain.service.input.CryptoInputParcel; -import org.sufficientlysecure.keychain.service.input.RequiredInputParcel; -import org.sufficientlysecure.keychain.ui.ImportKeysActivity; -import org.sufficientlysecure.keychain.ui.NfcOperationActivity; -import org.sufficientlysecure.keychain.ui.PassphraseDialogActivity; -import org.sufficientlysecure.keychain.ui.ViewKeyActivity; -import org.sufficientlysecure.keychain.util.InputData; import org.sufficientlysecure.keychain.util.Log; -import org.sufficientlysecure.keychain.util.Passphrase; import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.ArrayList; -import java.util.Date; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; public class OpenPgpService2 extends OpenPgpService { - - private Map<Long, ParcelFileDescriptor> mOutputPipeMap = new HashMap<Long, ParcelFileDescriptor>(); private long createKey(int id) { @@ -91,23 +48,20 @@ public class OpenPgpService2 extends OpenPgpService { mOutputPipeMap.put(createKey(outputPipeId), pipe[1]); return pipe[0]; } catch (IOException e) { - e.printStackTrace(); + Log.e(Constants.TAG, "IOException in OpenPgpService2", e); return null; } } @Override - public Intent execute(Intent data, ParcelFileDescriptor input,int outputPipeId) { + public Intent execute(Intent data, ParcelFileDescriptor input, int outputPipeId) { long key = createKey(outputPipeId); ParcelFileDescriptor output = mOutputPipeMap.get(key); mOutputPipeMap.remove(key); return executeInternal(data, input, output); } - - - }; @Override @@ -115,6 +69,4 @@ public class OpenPgpService2 extends OpenPgpService { return mBinder; } - - } |