move classes around a bit

OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java

@@ -1,4 +1,4 @@
-package org.sufficientlysecure.keychain.tests;
+package org.sufficientlysecure.keychain.pgp;
 
 import junit.framework.AssertionFailedError;
 
@@ -19,12 +19,6 @@ import org.spongycastle.bcpg.sig.KeyFlags;
 import org.spongycastle.openpgp.PGPSignature;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.Constants.choice.algorithm;
-import org.sufficientlysecure.keychain.pgp.CanonicalizedKeyRing;
-import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKeyRing;
-import org.sufficientlysecure.keychain.pgp.PgpKeyOperation;
-import org.sufficientlysecure.keychain.pgp.UncachedKeyRing;
-import org.sufficientlysecure.keychain.pgp.UncachedPublicKey;
-import org.sufficientlysecure.keychain.pgp.WrappedSignature;
 import org.sufficientlysecure.keychain.service.OperationResultParcel.OperationLog;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel.SubkeyAdd;

OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java

@@ -1,4 +1,4 @@
-package org.sufficientlysecure.keychain.tests;
+package org.sufficientlysecure.keychain.pgp;
 
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
@@ -26,11 +26,6 @@ import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator;
 import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder;
 import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder;
 import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.pgp.CanonicalizedKeyRing;
-import org.sufficientlysecure.keychain.pgp.PgpKeyOperation;
-import org.sufficientlysecure.keychain.pgp.UncachedKeyRing;
-import org.sufficientlysecure.keychain.pgp.UncachedPublicKey;
-import org.sufficientlysecure.keychain.pgp.WrappedSignature;
 import org.sufficientlysecure.keychain.service.OperationResultParcel;
 import org.sufficientlysecure.keychain.service.OperationResults.EditKeyResult;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel;

OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java

@@ -1,4 +1,4 @@
-package org.sufficientlysecure.keychain.tests;
+package org.sufficientlysecure.keychain.pgp;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -10,13 +10,6 @@ import org.robolectric.shadows.ShadowLog;
 import org.spongycastle.bcpg.PacketTags;
 import org.spongycastle.bcpg.sig.KeyFlags;
 import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKeyRing;
-import org.sufficientlysecure.keychain.pgp.PgpKeyOperation;
-import org.sufficientlysecure.keychain.pgp.UncachedKeyRing;
-import org.sufficientlysecure.keychain.pgp.UncachedPublicKey;
-import org.sufficientlysecure.keychain.pgp.CanonicalizedPublicKeyRing;
-import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey;
-import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKeyRing;
 import org.sufficientlysecure.keychain.service.OperationResultParcel;
 import org.sufficientlysecure.keychain.service.OperationResults.EditKeyResult;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel;

OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java

@@ -1,4 +1,4 @@
-package org.sufficientlysecure.keychain.tests;
+package org.sufficientlysecure.keychain.pgp;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -9,21 +9,15 @@ import org.robolectric.RobolectricTestRunner;
 import org.robolectric.shadows.ShadowLog;
 import org.spongycastle.bcpg.sig.KeyFlags;
 import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.pgp.PgpKeyOperation;
-import org.sufficientlysecure.keychain.pgp.UncachedKeyRing;
-import org.sufficientlysecure.keychain.pgp.UncachedPublicKey;
 import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
-import org.sufficientlysecure.keychain.service.OperationResultParcel;
 import org.sufficientlysecure.keychain.service.OperationResults.EditKeyResult;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
 import org.sufficientlysecure.keychain.support.KeyringTestingHelper.RawPacket;
-import org.sufficientlysecure.keychain.util.ProgressScaler;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
 @org.robolectric.annotation.Config(emulateSdk = 18) // Robolectric doesn't yet support 19

OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperKeyringTest.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package tests;
+package org.sufficientlysecure.keychain.provider;
 
 import java.util.Collections;
 import java.util.Arrays;

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/FileImportCache.java

@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 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.keyimport;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.os.Parcel;
-
-import org.sufficientlysecure.keychain.KeychainApplication;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * When sending large data (over 1MB) through Androids Binder IPC you get
- * JavaBinder  E  !!! FAILED BINDER TRANSACTION !!!
- * <p/>
- * To overcome this problem, we cache large Parcelables into a file in our private cache directory
- * instead of sending them through IPC.
- */
-public class FileImportCache {
-
-    private Context mContext;
-
-    private static final String FILENAME = "key_import.pcl";
-    private static final String BUNDLE_DATA = "data";
-
-    public FileImportCache(Context context) {
-        this.mContext = context;
-    }
-
-    public void writeCache(ArrayList<ParcelableKeyRing> selectedEntries) throws IOException {
-        Bundle in = new Bundle();
-        in.putParcelableArrayList(BUNDLE_DATA, selectedEntries);
-        File cacheDir = mContext.getCacheDir();
-        if (cacheDir == null) {
-            // https://groups.google.com/forum/#!topic/android-developers/-694j87eXVU
-            throw new IOException("cache dir is null!");
-        }
-        File tempFile = new File(mContext.getCacheDir(), FILENAME);
-
-        FileOutputStream fos = new FileOutputStream(tempFile);
-        Parcel p = Parcel.obtain(); // creating empty parcel object
-        in.writeToParcel(p, 0); // saving bundle as parcel
-        fos.write(p.marshall()); // writing parcel to file
-        fos.flush();
-        fos.close();
-    }
-
-    public List<ParcelableKeyRing> readCache() throws IOException {
-        Parcel parcel = Parcel.obtain(); // creating empty parcel object
-        Bundle out;
-        File cacheDir = mContext.getCacheDir();
-        if (cacheDir == null) {
-            // https://groups.google.com/forum/#!topic/android-developers/-694j87eXVU
-            throw new IOException("cache dir is null!");
-        }
-
-        File tempFile = new File(cacheDir, FILENAME);
-        try {
-            FileInputStream fis = new FileInputStream(tempFile);
-            byte[] array = new byte[(int) fis.getChannel().size()];
-            fis.read(array, 0, array.length);
-            fis.close();
-
-            parcel.unmarshall(array, 0, array.length);
-            parcel.setDataPosition(0);
-            out = parcel.readBundle(KeychainApplication.class.getClassLoader());
-            out.putAll(out);
-
-            return out.getParcelableArrayList(BUNDLE_DATA);
-        } finally {
-            parcel.recycle();
-            // delete temp file
-            tempFile.delete();
-        }
-    }
-}

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileImportCache.java

@@ -0,0 +1,179 @@
+/*
+ * Copyright (C) 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.util;
+
+import android.content.Context;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.KeychainApplication;
+import org.sufficientlysecure.keychain.util.Log;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * When sending large data (over 1MB) through Androids Binder IPC you get
+ * JavaBinder  E  !!! FAILED BINDER TRANSACTION !!!
+ * <p/>
+ * To overcome this problem, we cache large Parcelables into a file in our private cache directory
+ * instead of sending them through IPC.
+ */
+public class FileImportCache<E extends Parcelable> {
+
+    private Context mContext;
+
+    private static final String FILENAME = "key_import.pcl";
+
+    public FileImportCache(Context context) {
+        this.mContext = context;
+    }
+
+    public void writeCache(ArrayList<E> selectedEntries) throws IOException {
+        writeCache(selectedEntries.iterator());
+    }
+
+    public void writeCache(Iterator<E> it) throws IOException {
+
+        File cacheDir = mContext.getCacheDir();
+        if (cacheDir == null) {
+            // https://groups.google.com/forum/#!topic/android-developers/-694j87eXVU
+            throw new IOException("cache dir is null!");
+        }
+
+        File tempFile = new File(mContext.getCacheDir(), FILENAME);
+
+        ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(tempFile));
+
+        while (it.hasNext()) {
+            E ring = it.next();
+            Parcel p = Parcel.obtain(); // creating empty parcel object
+            p.writeParcelable(ring, 0); // saving bundle as parcel
+            oos.writeObject(p.marshall()); // writing parcel to file
+            p.recycle();
+        }
+
+        oos.close();
+
+    }
+
+    public List<E> readCacheIntoList() throws IOException {
+        ArrayList<E> result = new ArrayList<E>();
+        Iterator<E> it = readCache();
+        while (it.hasNext()) {
+            result.add(it.next());
+        }
+        return result;
+    }
+
+    public Iterator<E> readCache() throws IOException {
+
+        File cacheDir = mContext.getCacheDir();
+        if (cacheDir == null) {
+            // https://groups.google.com/forum/#!topic/android-developers/-694j87eXVU
+            throw new IOException("cache dir is null!");
+        }
+
+        final File tempFile = new File(cacheDir, FILENAME);
+        final ObjectInputStream ois = new ObjectInputStream(new FileInputStream(tempFile));
+
+        return new Iterator<E>() {
+
+            E mRing = null;
+            boolean closed = false;
+
+            private void readNext() {
+                if (mRing != null || closed) {
+                    Log.e(Constants.TAG, "err!");
+                    return;
+                }
+
+                try {
+                    if (ois.available() == 0) {
+                        return;
+                    }
+
+                    byte[] data = (byte[]) ois.readObject();
+                    Log.e(Constants.TAG, "bla");
+                    if (data == null) {
+                        if (!closed) {
+                            closed = true;
+                            ois.close();
+                            tempFile.delete();
+                        }
+                        return;
+                    }
+
+                    Parcel parcel = Parcel.obtain(); // creating empty parcel object
+                    parcel.unmarshall(data, 0, data.length);
+                    parcel.setDataPosition(0);
+                    mRing = parcel.readParcelable(KeychainApplication.class.getClassLoader());
+                    parcel.recycle();
+                } catch (ClassNotFoundException e) {
+                    Log.e(Constants.TAG, "Encountered ClassNotFoundException during cache read, this is a bug!");
+                } catch (IOException e) {
+                    Log.e(Constants.TAG, "Encountered IOException during cache read!");
+                }
+
+            }
+
+            @Override
+            public boolean hasNext() {
+                readNext();
+                return mRing != null;
+            }
+
+            @Override
+            public E next() {
+                readNext();
+                try {
+                    return mRing;
+                } finally {
+                    mRing = null;
+                }
+            }
+
+            @Override
+            public void remove() {
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public void finalize() throws Throwable {
+                super.finalize();
+                if (!closed) {
+                    try {
+                        ois.close();
+                        tempFile.delete();
+                    } catch (IOException e) {
+                        // never mind
+                    }
+                }
+            }
+
+        };
+    }
+}