From 727783dd00a03e81113f618edf0024da60314be6 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Mon, 27 Oct 2014 17:36:39 +0100 Subject: retrofit getBlob method of matrixcursor for android 2.3 --- .../keychain/ui/CertifyKeyFragment.java | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) 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; -- cgit v1.2.3 From e1285eec7b3fea5ea86bb8cac598e98d6d9f7f14 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Wed, 29 Oct 2014 22:39:38 +0100 Subject: Close stream on key export to avoid partial write (see #986) --- .../keychain/operations/ImportExportOperation.java | 7 +++++++ 1 file changed, 7 insertions(+) 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); + } } -- cgit v1.2.3 From 8b53bed6c003f608d2822eeba8a0a8ccfa71046d Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Wed, 29 Oct 2014 22:45:49 +0100 Subject: remove unused ExchangeKeySpinner class --- .../keychain/ui/widget/ExchangeKeySpinner.java | 100 --------------------- 1 file changed, 100 deletions(-) delete mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/ExchangeKeySpinner.java 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 - * - * 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 . - */ - -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 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 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; - } - -} -- cgit v1.2.3 From a221464f38d70e54b5df31ca7a980de2fc2910b2 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Wed, 29 Oct 2014 22:47:34 +0100 Subject: Fix to preselect certification key if only one is available Closes #981 --- .../org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); } } -- cgit v1.2.3