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

4 files changed, 28 insertions, 102 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java
index 6dfac8429..9db9e700f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java
@@ -494,6 +494,13 @@ public class ImportExportOperation extends BaseOperation {
         } catch (IOException e) {
             log.add(LogType.MSG_EXPORT_ERROR_IO, 1);
             return new ExportResult(ExportResult.RESULT_ERROR, log, okPublic, okSecret);
+        } finally {
+            // Make sure the stream is closed
+            if (outStream != null) try {
+                outStream.close();
+            } catch (Exception e) {
+                Log.e(Constants.TAG, "error closing stream", e);
+            }
         }
 
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
index 94ece06fb..4d10d8639 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
@@ -25,6 +25,8 @@ import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.graphics.PorterDuff;
 import android.net.Uri;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.os.Message;
 import android.os.Messenger;
@@ -62,6 +64,7 @@ import org.sufficientlysecure.keychain.ui.widget.KeySpinner;
 import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.util.Preferences;
 
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 
 public class CertifyKeyFragment extends LoaderFragment
@@ -210,7 +213,23 @@ public class CertifyKeyFragment extends LoaderFragment
 
         MatrixCursor matrix = new MatrixCursor(new String[]{
                 "_id", "user_data", "grouped"
-        });
+        }) {
+            @Override
+            public byte[] getBlob(int column) {
+                // For some reason, getBlob was not implemented before ICS
+                if (VERSION.SDK_INT < VERSION_CODES.ICE_CREAM_SANDWICH) {
+                    try {
+                        // haha, yes there is int.class
+                        Method m = MatrixCursor.class.getDeclaredMethod("get", new Class[]{int.class});
+                        m.setAccessible(true);
+                        return (byte[]) m.invoke(this, 1);
+                    } catch (Exception e) {
+                        throw new UnsupportedOperationException(e);
+                    }
+                }
+                return super.getBlob(column);
+            }
+        };
         data.moveToFirst();
 
         long lastMasterKeyId = 0;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
index 6f37f1c72..14f42eb04 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
@@ -89,7 +89,7 @@ public class CertifyKeySpinner extends KeySpinner {
             // If there is only one choice, pick it by default
             if (mAdapter.getCount() == 2) {
                 // preselect if key can certify
-                if (data.moveToPosition(1) && data.isNull(mIndexHasCertify)) {
+                if (data.moveToPosition(1) && !data.isNull(mIndexHasCertify)) {
                     setSelection(1);
                 }
             }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/ExchangeKeySpinner.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/ExchangeKeySpinner.java
deleted file mode 100644
index e31d14d48..000000000
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/ExchangeKeySpinner.java
+++ /dev/null
@@ -1,100 +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.ui.widget;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.v4.content.CursorLoader;
-import android.support.v4.content.Loader;
-import android.util.AttributeSet;
-import android.widget.ImageView;
-
-import org.sufficientlysecure.keychain.provider.KeychainContract;
-import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
-
-public class ExchangeKeySpinner extends KeySpinner {
-    public ExchangeKeySpinner(Context context) {
-        super(context);
-    }
-
-    public ExchangeKeySpinner(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public ExchangeKeySpinner(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    @Override
-    public Loader<Cursor> onCreateLoader(int loaderId, Bundle data) {
-        // This is called when a new Loader needs to be created. This
-        // sample only has one Loader, so we don't care about the ID.
-        Uri baseUri = KeychainContract.KeyRings.buildUnifiedKeyRingsUri();
-
-        // These are the rows that we will retrieve.
-        String[] projection = new String[]{
-                KeychainContract.KeyRings._ID,
-                KeychainContract.KeyRings.MASTER_KEY_ID,
-                KeychainContract.KeyRings.KEY_ID,
-                KeychainContract.KeyRings.USER_ID,
-                KeychainContract.KeyRings.IS_REVOKED,
-                KeychainContract.KeyRings.IS_EXPIRED,
-                KeychainContract.KeyRings.HAS_ANY_SECRET
-        };
-
-        String where = KeychainContract.KeyRings.HAS_ANY_SECRET + " = 1";
-
-        // Now create and return a CursorLoader that will take care of
-        // creating a Cursor for the data being displayed.
-        return new CursorLoader(getContext(), baseUri, projection, where, null, null);
-    }
-
-    private int mIndexIsRevoked, mIndexIsExpired;
-
-    @Override
-    public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
-        super.onLoadFinished(loader, data);
-
-        if (loader.getId() == LOADER_ID) {
-            // If there is only one choice, pick it by default
-            if (mAdapter.getCount() == 2) {
-                setSelection(1);
-            }
-            mIndexIsRevoked = data.getColumnIndex(KeychainContract.KeyRings.IS_REVOKED);
-            mIndexIsExpired = data.getColumnIndex(KeychainContract.KeyRings.IS_EXPIRED);
-        }
-    }
-
-    @Override
-    boolean setStatus(Context context, Cursor cursor, ImageView statusView) {
-        if (cursor.getInt(mIndexIsRevoked) != 0) {
-            KeyFormattingUtils.setStatusImage(getContext(), statusView, KeyFormattingUtils.STATE_REVOKED);
-            return false;
-        }
-        if (cursor.getInt(mIndexIsExpired) != 0) {
-            KeyFormattingUtils.setStatusImage(getContext(), statusView, KeyFormattingUtils.STATE_EXPIRED);
-            return false;
-        }
-
-        // valid key
-        return true;
-    }
-
-}