Merge branch 'master' of github.com:open-keychain/open-keychain

1 files changed, 0 insertions, 102 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java
deleted file mode 100644
index 3a5a96fbb..000000000
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2012-2014 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.sufficientlysecure.keychain.pgp;
-
-import org.spongycastle.openpgp.PGPObjectFactory;
-import org.spongycastle.openpgp.PGPSecretKey;
-import org.spongycastle.openpgp.PGPSecretKeyRing;
-import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.util.Log;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-public class PgpConversionHelper {
-
-    /**
-     * Convert from byte[] to ArrayList<PGPSecretKey>
-     *
-     * @param keysBytes
-     * @return
-     */
-    public static ArrayList<UncachedSecretKey> BytesToPGPSecretKeyList(byte[] keysBytes) {
-        PGPObjectFactory factory = new PGPObjectFactory(keysBytes);
-        Object obj = null;
-        ArrayList<UncachedSecretKey> keys = new ArrayList<UncachedSecretKey>();
-        try {
-            while ((obj = factory.nextObject()) != null) {
-                PGPSecretKey secKey = null;
-                if (obj instanceof PGPSecretKey) {
-                    secKey = (PGPSecretKey) obj;
-                    if (secKey == null) {
-                        Log.e(Constants.TAG, "No keys given!");
-                    }
-                    keys.add(new UncachedSecretKey(secKey));
-                } else if (obj instanceof PGPSecretKeyRing) { //master keys are sent as keyrings
-                    PGPSecretKeyRing keyRing = null;
-                    keyRing = (PGPSecretKeyRing) obj;
-                    if (keyRing == null) {
-                        Log.e(Constants.TAG, "No keys given!");
-                    }
-                    @SuppressWarnings("unchecked")
-                    Iterator<PGPSecretKey> itr = keyRing.getSecretKeys();
-                    while (itr.hasNext()) {
-                        keys.add(new UncachedSecretKey(itr.next()));
-                    }
-                }
-            }
-        } catch (IOException e) {
-        }
-
-        return keys;
-    }
-
-    /**
-     * Convert from byte[] to PGPSecretKey
-     * <p/>
-     * Singles keys are encoded as keyRings with one single key in it by Bouncy Castle
-     *
-     * @param keyBytes
-     * @return
-     */
-    public static UncachedSecretKey BytesToPGPSecretKey(byte[] keyBytes) {
-        PGPObjectFactory factory = new PGPObjectFactory(keyBytes);
-        Object obj = null;
-        try {
-            obj = factory.nextObject();
-        } catch (IOException e) {
-            Log.e(Constants.TAG, "Error while converting to PGPSecretKey!", e);
-        }
-        PGPSecretKey secKey = null;
-        if (obj instanceof PGPSecretKey) {
-            if ((secKey = (PGPSecretKey) obj) == null) {
-                Log.e(Constants.TAG, "No keys given!");
-            }
-        } else if (obj instanceof PGPSecretKeyRing) { //master keys are sent as keyrings
-            PGPSecretKeyRing keyRing = null;
-            if ((keyRing = (PGPSecretKeyRing) obj) == null) {
-                Log.e(Constants.TAG, "No keys given!");
-            }
-            secKey = keyRing.getSecretKey();
-        }
-
-        return new UncachedSecretKey(secKey);
-    }
-
-}