diff options
Diffstat (limited to 'OpenKeychain/src/main/java')
7 files changed, 192 insertions, 108 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java index dfd39b345..e70b134aa 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java @@ -61,6 +61,7 @@ public class KeychainApplication extends Application { PRNGFixes.apply(); Log.d(Constants.TAG, "Bouncy Castle set and PRNG Fixes applied!"); + /* if (Constants.DEBUG) { Provider[] providers = Security.getProviders(); Log.d(Constants.TAG, "Installed Security Providers:"); @@ -68,6 +69,7 @@ public class KeychainApplication extends Application { Log.d(Constants.TAG, "provider class: " + p.getClass().getName()); } } + */ // Create APG directory on sdcard if not existing if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/FileImportCache.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/FileImportCache.java deleted file mode 100644 index 08b8afae7..000000000 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/FileImportCache.java +++ /dev/null @@ -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(); - } - } -} diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java index 861f93446..19b0d81b7 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java @@ -609,7 +609,7 @@ public class PgpKeyOperation { for (int i = 0; i < saveParcel.mAddSubKeys.size(); i++) { progress(R.string.progress_modify_subkeyadd, (i-1) * (100 / saveParcel.mAddSubKeys.size())); - SaveKeyringParcel.SubkeyAdd add = saveParcel.mAddSubKeys.get(0); + SaveKeyringParcel.SubkeyAdd add = saveParcel.mAddSubKeys.get(i); log.add(LogLevel.INFO, LogType.MSG_MF_SUBKEY_NEW, indent); if (add.mExpiry != null && new Date(add.mExpiry*1000).before(new Date())) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java index 358b1c552..4a03d942b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java @@ -169,6 +169,7 @@ public class UncachedPublicKey { } @SuppressWarnings("unchecked") + // TODO make this safe public int getKeyUsage() { if(mCacheUsage == null) { mCacheUsage = 0; @@ -182,11 +183,6 @@ public class UncachedPublicKey { if (hashed != null) { mCacheUsage |= hashed.getKeyFlags(); } - - PGPSignatureSubpacketVector unhashed = sig.getUnhashedSubPackets(); - if (unhashed != null) { - mCacheUsage |= unhashed.getKeyFlags(); - } } } } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java index 8d4717eeb..c87e490be 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -24,6 +24,7 @@ import android.net.Uri; import android.os.Bundle; import android.os.Message; import android.os.Messenger; +import android.os.Parcel; import android.os.RemoteException; import org.sufficientlysecure.keychain.Constants; @@ -31,7 +32,7 @@ import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.helper.FileHelper; import org.sufficientlysecure.keychain.helper.OtherHelper; import org.sufficientlysecure.keychain.helper.Preferences; -import org.sufficientlysecure.keychain.keyimport.FileImportCache; +import org.sufficientlysecure.keychain.util.FileImportCache; import org.sufficientlysecure.keychain.keyimport.HkpKeyserver; import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry; import org.sufficientlysecure.keychain.keyimport.KeybaseKeyserver; @@ -387,14 +388,16 @@ public class KeychainIntentService extends IntentService } } else if (ACTION_IMPORT_KEYRING.equals(action)) { try { + List<ParcelableKeyRing> entries; if (data.containsKey(IMPORT_KEY_LIST)) { // get entries from intent entries = data.getParcelableArrayList(IMPORT_KEY_LIST); } else { // get entries from cached file - FileImportCache cache = new FileImportCache(this); - entries = cache.readCache(); + FileImportCache<ParcelableKeyRing> cache = + new FileImportCache<ParcelableKeyRing>(this); + entries = cache.readCacheIntoList(); } PgpImportExport pgpImportExport = new PgpImportExport(this, this); @@ -523,6 +526,7 @@ public class KeychainIntentService extends IntentService Intent importIntent = new Intent(this, KeychainIntentService.class); importIntent.setAction(ACTION_IMPORT_KEYRING); + Bundle importData = new Bundle(); // This is not going through binder, nothing to fear of importData.putParcelableArrayList(IMPORT_KEY_LIST, keyRings); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java index dbc557f9a..4a606a1b3 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java @@ -40,7 +40,7 @@ import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.helper.OtherHelper; import org.sufficientlysecure.keychain.helper.Preferences; -import org.sufficientlysecure.keychain.keyimport.FileImportCache; +import org.sufficientlysecure.keychain.util.FileImportCache; import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry; import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing; import org.sufficientlysecure.keychain.pgp.PgpKeyHelper; @@ -503,7 +503,7 @@ public class ImportKeysActivity extends ActionBarActivity { // to prevent Java Binder problems on heavy imports // read FileImportCache for more info. try { - FileImportCache cache = new FileImportCache(this); + FileImportCache<ParcelableKeyRing> cache = new FileImportCache<ParcelableKeyRing>(this); cache.writeCache(selectedEntries); intent.putExtra(KeychainIntentService.EXTRA_DATA, data); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileImportCache.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileImportCache.java new file mode 100644 index 000000000..5a4bf5311 --- /dev/null +++ b/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 java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.EOFException; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +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); + + DataOutputStream oos = new DataOutputStream(new FileOutputStream(tempFile)); + + while (it.hasNext()) { + Parcel p = Parcel.obtain(); // creating empty parcel object + p.writeParcelable(it.next(), 0); // saving bundle as parcel + byte[] buf = p.marshall(); + oos.writeInt(buf.length); + oos.write(buf); + 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 DataInputStream ois = new DataInputStream(new FileInputStream(tempFile)); + + return new Iterator<E>() { + + E mRing = null; + boolean closed = false; + byte[] buf = new byte[512]; + + private void readNext() { + if (mRing != null || closed) { + return; + } + + try { + + int length = ois.readInt(); + while (buf.length < length) { + buf = new byte[buf.length * 2]; + } + ois.readFully(buf, 0, length); + + Parcel parcel = Parcel.obtain(); // creating empty parcel object + parcel.unmarshall(buf, 0, length); + parcel.setDataPosition(0); + mRing = parcel.readParcelable(KeychainApplication.class.getClassLoader()); + parcel.recycle(); + } catch (EOFException e) { + // aight + close(); + } catch (IOException e) { + Log.e(Constants.TAG, "Encountered IOException during cache read!", e); + } + + } + + @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 { + close(); + super.finalize(); + } + + private void close() { + if (!closed) { + try { + ois.close(); + tempFile.delete(); + } catch (IOException e) { + // nvm + } + } + closed = true; + } + + + }; + } +} |