Merge branch 'master' into performance

1 files changed, 0 insertions, 32 deletions

diff --git a/OpenKeychain/src/main/java/org/spongycastle/openpgp/jcajce/JcaSkipMarkerPGPObjectFactory.java b/OpenKeychain/src/main/java/org/spongycastle/openpgp/jcajce/JcaSkipMarkerPGPObjectFactory.java
deleted file mode 100644
index f1cf9791a..000000000
--- a/OpenKeychain/src/main/java/org/spongycastle/openpgp/jcajce/JcaSkipMarkerPGPObjectFactory.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.spongycastle.openpgp.jcajce;
-
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.spongycastle.openpgp.PGPMarker;
-
-/** This class wraps the regular PGPObjectFactory, changing its behavior to
- * ignore all PGPMarker packets it encounters while reading. These packets
- * carry no semantics of their own, and should be ignored according to
- * RFC 4880.
- * 
- * @see https://tools.ietf.org/html/rfc4880#section-5.8
- * @see org.spongycastle.openpgp.PGPMarker
- * 
- */
-public class JcaSkipMarkerPGPObjectFactory extends JcaPGPObjectFactory {
-
-    public JcaSkipMarkerPGPObjectFactory(InputStream in) {
-        super(in);
-    }
-
-    @Override
-    public Object nextObject() throws IOException {
-        Object o = super.nextObject();
-        while (o instanceof PGPMarker) {
-            o = super.nextObject();
-        }
-        return o;
-    }
-}