From 1b0666e9de5caea14997a3e638a6209b45c97d60 Mon Sep 17 00:00:00 2001 From: mar-v-in Date: Sun, 6 Jul 2014 02:10:35 +0200 Subject: [PATCH] Many changes to file ... and still incomplete - Multi file - Reworked UI --- .gitmodules | 3 + OpenKeychain/build.gradle | 2 +- OpenKeychain/src/main/AndroidManifest.xml | 1 + .../keychain/helper/ContactHelper.java | 14 ++ .../keychain/helper/FileHelper.java | 41 ++++ .../provider/CachedPublicKeyRing.java | 62 +++++- .../keychain/provider/ProviderHelper.java | 4 + .../keychain/ui/EncryptActivity.java | 77 ++++++- .../keychain/ui/EncryptActivityInterface.java | 2 + .../ui/EncryptAsymmetricFragment.java | 105 ++++++--- .../keychain/ui/EncryptFileFragment.java | 190 +++++++++++----- .../ui/widget/EncryptKeyCompletionView.java | 204 ++++++++++++++++++ .../widget/NoSwipeWrapContentViewPager.java | 44 ++++ .../drawable-hdpi/attachment_bg_holo.9.png | Bin 0 -> 282 bytes .../res/drawable-hdpi/ic_doc_generic_am.png | Bin 0 -> 694 bytes .../main/res/drawable-hdpi/ic_generic_man.png | Bin 0 -> 2375 bytes .../drawable-mdpi/attachment_bg_holo.9.png | Bin 0 -> 204 bytes .../res/drawable-mdpi/ic_doc_generic_am.png | Bin 0 -> 561 bytes .../main/res/drawable-mdpi/ic_generic_man.png | Bin 0 -> 1657 bytes .../drawable-xhdpi/attachment_bg_holo.9.png | Bin 0 -> 344 bytes .../res/drawable-xhdpi/ic_doc_generic_am.png | Bin 0 -> 831 bytes .../res/drawable-xhdpi/ic_generic_man.png | Bin 0 -> 3149 bytes .../drawable-xxhdpi/attachment_bg_holo.9.png | Bin 0 -> 1316 bytes .../res/drawable-xxhdpi/ic_doc_generic_am.png | Bin 0 -> 585 bytes .../res/drawable-xxhdpi/ic_generic_man.png | Bin 0 -> 3607 bytes .../src/main/res/layout/encrypt_activity.xml | 13 +- .../layout/encrypt_asymmetric_fragment.xml | 64 +----- .../src/main/res/layout/encrypt_content.xml | 16 +- .../layout/encrypt_content_adv_settings.xml | 26 --- .../main/res/layout/encrypt_file_fragment.xml | 158 ++++++-------- .../res/layout/encrypt_symmetric_fragment.xml | 74 +++---- .../src/main/res/layout/file_list_entry.xml | 60 ++++++ .../main/res/layout/file_list_entry_add.xml | 21 ++ .../main/res/layout/recipient_box_entry.xml | 24 +++ .../layout/recipient_selection_list_entry.xml | 42 ++++ .../src/main/res/menu/encrypt_activity.xml | 7 + OpenKeychain/src/main/res/values/strings.xml | 1 + extern/TokenAutoComplete | 1 + 38 files changed, 906 insertions(+), 350 deletions(-) create mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java create mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/NoSwipeWrapContentViewPager.java create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/attachment_bg_holo.9.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_doc_generic_am.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_generic_man.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/attachment_bg_holo.9.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_doc_generic_am.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_generic_man.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/attachment_bg_holo.9.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_doc_generic_am.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_generic_man.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/attachment_bg_holo.9.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_doc_generic_am.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_generic_man.png create mode 100644 OpenKeychain/src/main/res/layout/file_list_entry.xml create mode 100644 OpenKeychain/src/main/res/layout/file_list_entry_add.xml create mode 100644 OpenKeychain/src/main/res/layout/recipient_box_entry.xml create mode 100644 OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml create mode 100644 OpenKeychain/src/main/res/menu/encrypt_activity.xml create mode 160000 extern/TokenAutoComplete diff --git a/.gitmodules b/.gitmodules index b7b0e1173..b01f9a0ff 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,3 +34,6 @@ [submodule "OpenKeychain/src/test/resources/extern/OpenPGP-Haskell"] path = OpenKeychain/src/test/resources/extern/OpenPGP-Haskell url = https://github.com/singpolyma/OpenPGP-Haskell.git +[submodule "extern/TokenAutoComplete"] + path = extern/TokenAutoComplete + url = https://github.com/open-keychain/TokenAutoComplete diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index f419141b4..18a801ce0 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -20,7 +20,7 @@ dependencies { compile project(':extern:SuperToasts:supertoasts') compile project(':extern:minidns') compile project(':extern:KeybaseLib:Lib') - + compile project(':extern:TokenAutoComplete:library') // Unit tests are run with Robolectric testCompile 'junit:junit:4.11' diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 6a67ac9bf..bed47a44a 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -155,6 +155,7 @@ + diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ContactHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ContactHelper.java index e639824ec..1b9ef57b3 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ContactHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ContactHelper.java @@ -21,6 +21,8 @@ import android.accounts.Account; import android.accounts.AccountManager; import android.content.*; import android.database.Cursor; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; import android.net.Uri; import android.os.Build; import android.provider.ContactsContract; @@ -33,6 +35,7 @@ import org.sufficientlysecure.keychain.pgp.PgpKeyHelper; import org.sufficientlysecure.keychain.provider.KeychainContract; import org.sufficientlysecure.keychain.util.Log; +import java.io.InputStream; import java.util.*; public class ContactHelper { @@ -232,6 +235,17 @@ public class ContactHelper { return null; } + public static Bitmap photoFromFingerprint(ContentResolver contentResolver, String fingerprint) { + int rawContactId = findRawContactId(contentResolver, fingerprint); + if (rawContactId == -1) return null; + Uri rawContactUri = ContentUris.withAppendedId(ContactsContract.RawContacts.CONTENT_URI, rawContactId); + Uri contactUri = ContactsContract.RawContacts.getContactLookupUri(contentResolver, rawContactUri); + InputStream photoInputStream = + ContactsContract.Contacts.openContactPhotoInputStream(contentResolver, contactUri); + if (photoInputStream == null) return null; + return BitmapFactory.decodeStream(photoInputStream); + } + /** * Write the current Keychain to the contact db */ diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/FileHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/FileHelper.java index 2898c7030..e42c7987b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/FileHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/FileHelper.java @@ -23,22 +23,28 @@ import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; import android.database.Cursor; +import android.graphics.Bitmap; +import android.graphics.Point; import android.net.Uri; import android.os.Build; import android.os.Environment; import android.os.Handler; import android.os.Message; import android.os.Messenger; +import android.provider.DocumentsContract; import android.provider.OpenableColumns; import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentActivity; import android.support.v4.app.FragmentManager; import android.widget.Toast; +import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.compatibility.DialogFragmentWorkaround; import org.sufficientlysecure.keychain.ui.dialog.FileDialogFragment; import java.io.File; +import java.text.DecimalFormat; public class FileHelper { @@ -182,6 +188,41 @@ public class FileHelper { return filename; } + public static long getFileSize(Context context, Uri uri) { + long size = -1; + try { + Cursor cursor = context.getContentResolver().query(uri, new String[]{OpenableColumns.SIZE}, null, null, null); + + if (cursor != null) { + if (cursor.moveToNext()) { + size = cursor.getLong(0); + } + cursor.close(); + } + } catch (Exception ignored) { + // This happens in rare cases (eg: document deleted since selection) and should not cause a failure + } + return size; + } + + /** + * Retrieve thumbnail of file, document api feature and thus KitKat only + */ + public static Bitmap getThumbnail(Context context, Uri uri, Point size) { + if (Constants.KITKAT) { + return DocumentsContract.getDocumentThumbnail(context.getContentResolver(), uri, size, null); + } else { + return null; + } + } + + public static String readableFileSize(long size) { + if(size <= 0) return "0"; + final String[] units = new String[] { "B", "KB", "MB", "GB", "TB" }; + int digitGroups = (int) (Math.log10(size)/Math.log10(1024)); + return new DecimalFormat("#,##0.#").format(size/Math.pow(1024, digitGroups)) + " " + units[digitGroups]; + } + public static interface FileDialogCallback { public void onFileSelected(File file, boolean checked); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java index 52ca71679..bc7221d13 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java @@ -1,5 +1,6 @@ package org.sufficientlysecure.keychain.provider; +import android.database.Cursor; import android.net.Uri; import org.sufficientlysecure.keychain.Constants; @@ -33,6 +34,7 @@ public class CachedPublicKeyRing extends KeyRing { mUri = uri; } + @Override public long getMasterKeyId() throws PgpGeneralException { try { Object data = mProviderHelper.getGenericData(mUri, @@ -59,6 +61,17 @@ public class CachedPublicKeyRing extends KeyRing { return getMasterKeyId(); } + public byte[] getFingerprint() throws PgpGeneralException { + try { + Object data = mProviderHelper.getGenericData(mUri, + KeychainContract.KeyRings.FINGERPRINT, ProviderHelper.FIELD_TYPE_BLOB); + return (byte[]) data; + } catch (ProviderHelper.NotFoundException e) { + throw new PgpGeneralException(e); + } + } + + @Override public String getPrimaryUserId() throws PgpGeneralException { try { Object data = mProviderHelper.getGenericData(mUri, @@ -70,6 +83,7 @@ public class CachedPublicKeyRing extends KeyRing { } } + @Override public boolean isRevoked() throws PgpGeneralException { try { Object data = mProviderHelper.getGenericData(mUri, @@ -81,6 +95,7 @@ public class CachedPublicKeyRing extends KeyRing { } } + @Override public boolean canCertify() throws PgpGeneralException { try { Object data = mProviderHelper.getGenericData(mUri, @@ -92,17 +107,28 @@ public class CachedPublicKeyRing extends KeyRing { } } + @Override public long getEncryptId() throws PgpGeneralException { try { - Object data = mProviderHelper.getGenericData(mUri, - KeychainContract.KeyRings.MASTER_KEY_ID, - ProviderHelper.FIELD_TYPE_INTEGER); - return (Long) data; - } catch(ProviderHelper.NotFoundException e) { + Cursor subkeys = getSubkeys(); + if (subkeys != null) { + try { + while (subkeys.moveToNext()) { + if (subkeys.getInt(subkeys.getColumnIndexOrThrow(KeychainContract.Keys.CAN_ENCRYPT)) != 0) { + return subkeys.getLong(subkeys.getColumnIndexOrThrow(KeychainContract.Keys.KEY_ID)); + } + } + } finally { + subkeys.close(); + } + } + } catch(Exception e) { throw new PgpGeneralException(e); } + throw new PgpGeneralException("No encrypt key found"); } + @Override public boolean hasEncrypt() throws PgpGeneralException { try { Object data = mProviderHelper.getGenericData(mUri, @@ -114,17 +140,28 @@ public class CachedPublicKeyRing extends KeyRing { } } + @Override public long getSignId() throws PgpGeneralException { try { - Object data = mProviderHelper.getGenericData(mUri, - KeychainContract.KeyRings.MASTER_KEY_ID, - ProviderHelper.FIELD_TYPE_INTEGER); - return (Long) data; - } catch(ProviderHelper.NotFoundException e) { + Cursor subkeys = getSubkeys(); + if (subkeys != null) { + try { + while (subkeys.moveToNext()) { + if (subkeys.getInt(subkeys.getColumnIndexOrThrow(KeychainContract.Keys.CAN_SIGN)) != 0) { + return subkeys.getLong(subkeys.getColumnIndexOrThrow(KeychainContract.Keys.KEY_ID)); + } + } + } finally { + subkeys.close(); + } + } + } catch(Exception e) { throw new PgpGeneralException(e); } + throw new PgpGeneralException("No sign key found"); } + @Override public boolean hasSign() throws PgpGeneralException { try { Object data = mProviderHelper.getGenericData(mUri, @@ -136,6 +173,7 @@ public class CachedPublicKeyRing extends KeyRing { } } + @Override public int getVerified() throws PgpGeneralException { try { Object data = mProviderHelper.getGenericData(mUri, @@ -156,6 +194,10 @@ public class CachedPublicKeyRing extends KeyRing { } catch(ProviderHelper.NotFoundException e) { throw new PgpGeneralException(e); } + } + private Cursor getSubkeys() throws PgpGeneralException { + Uri keysUri = KeychainContract.Keys.buildKeysUri(Long.toString(extractOrGetMasterKeyId())); + return mProviderHelper.getContentResolver().query(keysUri, null, null, null, null); } } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java index 28495d51d..4bf3a38a0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java @@ -1034,4 +1034,8 @@ public class ProviderHelper { } } } + + public ContentResolver getContentResolver() { + return mContentResolver; + } } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java index c77fe9ab8..5542cccd1 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java @@ -21,14 +21,21 @@ package org.sufficientlysecure.keychain.ui; import android.content.Intent; import android.net.Uri; import android.os.Bundle; +import android.support.v4.app.Fragment; import android.support.v4.view.PagerTabStrip; import android.support.v4.view.ViewPager; +import android.view.Menu; +import android.view.MenuItem; +import android.view.ViewGroup; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; +import org.sufficientlysecure.keychain.helper.Preferences; import org.sufficientlysecure.keychain.ui.adapter.PagerTabStripAdapter; import org.sufficientlysecure.keychain.util.Log; +import java.util.ArrayList; + public class EncryptActivity extends DrawerActivity implements EncryptSymmetricFragment.OnSymmetricKeySelection, EncryptAsymmetricFragment.OnAsymmetricKeySelection, @@ -49,7 +56,7 @@ public class EncryptActivity extends DrawerActivity implements // view ViewPager mViewPagerMode; - PagerTabStrip mPagerTabStripMode; + //PagerTabStrip mPagerTabStripMode; PagerTabStripAdapter mTabsAdapterMode; ViewPager mViewPagerContent; PagerTabStrip mPagerTabStripContent; @@ -74,6 +81,9 @@ public class EncryptActivity extends DrawerActivity implements private long mSigningKeyId = Constants.key.none; private String mPassphrase; private String mPassphraseAgain; + private int mCurrentMode = PAGER_MODE_ASYMMETRIC; + private boolean mUseArmor; + private boolean mDeleteAfterEncrypt = false; @Override public void onSigningKeySelected(long signingKeyId) { @@ -102,7 +112,7 @@ public class EncryptActivity extends DrawerActivity implements @Override public boolean isModeSymmetric() { - return PAGER_MODE_SYMMETRIC == mViewPagerMode.getCurrentItem(); + return PAGER_MODE_SYMMETRIC == mCurrentMode; } @Override @@ -130,10 +140,19 @@ public class EncryptActivity extends DrawerActivity implements return mPassphraseAgain; } + @Override + public boolean isUseArmor() { + return mUseArmor; + } + + @Override + public boolean isDeleteAfterEncrypt() { + return mDeleteAfterEncrypt; + } private void initView() { mViewPagerMode = (ViewPager) findViewById(R.id.encrypt_pager_mode); - mPagerTabStripMode = (PagerTabStrip) findViewById(R.id.encrypt_pager_tab_strip_mode); + //mPagerTabStripMode = (PagerTabStrip) findViewById(R.id.encrypt_pager_tab_strip_mode); mViewPagerContent = (ViewPager) findViewById(R.id.encrypt_pager_content); mPagerTabStripContent = (PagerTabStrip) findViewById(R.id.encrypt_pager_tab_strip_content); @@ -172,6 +191,37 @@ public class EncryptActivity extends DrawerActivity implements mTabsAdapterContent.addTab(EncryptFileFragment.class, mFileFragmentBundle, getString(R.string.label_file)); mViewPagerContent.setCurrentItem(mSwitchToContent); + + mUseArmor = Preferences.getPreferences(this).getDefaultAsciiArmor(); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.encrypt_activity, menu); + menu.findItem(R.id.check_use_armor).setChecked(mUseArmor); + return super.onCreateOptionsMenu(menu); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.isCheckable()) { + item.setChecked(!item.isChecked()); + } + switch (item.getItemId()) { + case R.id.check_use_symmetric: + mSwitchToMode = item.isChecked() ? PAGER_MODE_SYMMETRIC : PAGER_MODE_ASYMMETRIC; + mViewPagerMode.setCurrentItem(mSwitchToMode); + break; + case R.id.check_use_armor: + mUseArmor = item.isChecked(); + break; + case R.id.check_delete_after_encrypt: + mDeleteAfterEncrypt = item.isChecked(); + break; + default: + return super.onOptionsItemSelected(item); + } + return true; } /** @@ -183,12 +233,16 @@ public class EncryptActivity extends DrawerActivity implements String action = intent.getAction(); Bundle extras = intent.getExtras(); String type = intent.getType(); - Uri uri = intent.getData(); + ArrayList uris = new ArrayList(); if (extras == null) { extras = new Bundle(); } + if (intent.getData() != null) { + uris.add(intent.getData()); + } + /* * Android's Action */ @@ -206,14 +260,19 @@ public class EncryptActivity extends DrawerActivity implements } } else { // Files via content provider, override uri and action - uri = intent.getParcelableExtra(Intent.EXTRA_STREAM); + uris.clear(); + uris.add(intent.getParcelableExtra(Intent.EXTRA_STREAM)); action = ACTION_ENCRYPT; } } + if (Intent.ACTION_SEND_MULTIPLE.equals(action) && type != null) { + uris = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM); + action = ACTION_ENCRYPT; + } + if (extras.containsKey(EXTRA_ASCII_ARMOR)) { - boolean requestAsciiArmor = extras.getBoolean(EXTRA_ASCII_ARMOR, true); - mFileFragmentBundle.putBoolean(EncryptFileFragment.ARG_ASCII_ARMOR, requestAsciiArmor); + mUseArmor = extras.getBoolean(EXTRA_ASCII_ARMOR, true); } String textData = extras.getString(EXTRA_TEXT); @@ -235,9 +294,9 @@ public class EncryptActivity extends DrawerActivity implements // encrypt text based on given extra mMessageFragmentBundle.putString(EncryptMessageFragment.ARG_TEXT, textData); mSwitchToContent = PAGER_CONTENT_MESSAGE; - } else if (ACTION_ENCRYPT.equals(action) && uri != null) { + } else if (ACTION_ENCRYPT.equals(action) && uris != null && !uris.isEmpty()) { // encrypt file based on Uri - mFileFragmentBundle.putParcelable(EncryptFileFragment.ARG_URI, uri); + mFileFragmentBundle.putParcelableArrayList(EncryptFileFragment.ARG_URIS, uris); mSwitchToContent = PAGER_CONTENT_FILE; } else { Log.e(Constants.TAG, diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivityInterface.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivityInterface.java index ca2ee3b55..6d649c32e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivityInterface.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivityInterface.java @@ -28,4 +28,6 @@ public interface EncryptActivityInterface { public String getPassphrase(); public String getPassphraseAgain(); + boolean isUseArmor(); + boolean isDeleteAfterEncrypt(); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java index be845f05e..dc9cfe72e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java @@ -19,25 +19,30 @@ package org.sufficientlysecure.keychain.ui; import android.app.Activity; import android.content.Intent; +import android.database.Cursor; import android.net.Uri; import android.os.Bundle; import android.support.v4.app.Fragment; +import android.support.v4.app.LoaderManager; +import android.support.v4.content.CursorLoader; +import android.support.v4.content.Loader; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.CheckBox; -import android.widget.TextView; -import android.widget.Button; +import android.widget.*; +import com.tokenautocomplete.TokenCompleteTextView; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException; import org.sufficientlysecure.keychain.provider.CachedPublicKeyRing; +import org.sufficientlysecure.keychain.provider.KeychainContract; import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; import org.sufficientlysecure.keychain.provider.ProviderHelper; +import org.sufficientlysecure.keychain.ui.widget.EncryptKeyCompletionView; import org.sufficientlysecure.keychain.util.Log; -import java.util.Vector; +import java.util.*; public class EncryptAsymmetricFragment extends Fragment { public static final String ARG_SIGNATURE_KEY_ID = "signature_key_id"; @@ -51,10 +56,8 @@ public class EncryptAsymmetricFragment extends Fragment { OnAsymmetricKeySelection mKeySelectionListener; // view - private Button mSelectKeysButton; private CheckBox mSign; - private TextView mMainUserId; - private TextView mMainUserIdRest; + private EncryptKeyCompletionView mEncryptKeyView; // model private long mSecretKeyId = Constants.key.none; @@ -108,15 +111,7 @@ public class EncryptAsymmetricFragment extends Fragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View view = inflater.inflate(R.layout.encrypt_asymmetric_fragment, container, false); - mSelectKeysButton = (Button) view.findViewById(R.id.btn_selectEncryptKeys); mSign = (CheckBox) view.findViewById(R.id.sign); - mMainUserId = (TextView) view.findViewById(R.id.mainUserId); - mMainUserIdRest = (TextView) view.findViewById(R.id.mainUserIdRest); - mSelectKeysButton.setOnClickListener(new View.OnClickListener() { - public void onClick(View v) { - selectPublicKeys(); - } - }); mSign.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { CheckBox checkBox = (CheckBox) v; @@ -127,6 +122,7 @@ public class EncryptAsymmetricFragment extends Fragment { } } }); + mEncryptKeyView = (EncryptKeyCompletionView) view.findViewById(R.id.recipient_list); return view; } @@ -140,6 +136,40 @@ public class EncryptAsymmetricFragment extends Fragment { mProviderHelper = new ProviderHelper(getActivity()); + getLoaderManager().initLoader(0, null, new LoaderManager.LoaderCallbacks() { + @Override + public Loader onCreateLoader(int id, Bundle args) { + return new CursorLoader(getActivity(), KeychainContract.KeyRings.buildUnifiedKeyRingsUri(), + new String[]{KeyRings.HAS_ENCRYPT, KeyRings.KEY_ID, KeyRings.USER_ID, KeyRings.FINGERPRINT}, + null, null, null); + } + + @Override + public void onLoadFinished(Loader loader, Cursor data) { + mEncryptKeyView.fromCursor(data); + } + + @Override + public void onLoaderReset(Loader loader) { + mEncryptKeyView.fromCursor(null); + } + }); + mEncryptKeyView.setTokenListener(new TokenCompleteTextView.TokenListener() { + @Override + public void onTokenAdded(Object token) { + if (token instanceof EncryptKeyCompletionView.EncryptionKey) { + updateEncryptionKeys(); + } + } + + @Override + public void onTokenRemoved(Object token) { + if (token instanceof EncryptKeyCompletionView.EncryptionKey) { + updateEncryptionKeys(); + } + } + }); + // preselect keys given by arguments (given by Intent to EncryptActivity) preselectKeys(signatureKeyId, encryptionKeyIds, mProviderHelper); } @@ -168,44 +198,31 @@ public class EncryptAsymmetricFragment extends Fragment { } if (preselectedEncryptionKeyIds != null) { - Vector goodIds = new Vector(); - Vector goodUserIds = new Vector(); for (long preselectedId : preselectedEncryptionKeyIds) { try { CachedPublicKeyRing ring = providerHelper.getCachedPublicKeyRing( KeyRings.buildUnifiedKeyRingsFindBySubkeyUri(preselectedId)); - long id = ring.getMasterKeyId(); - ring.getSplitPrimaryUserId(); - goodUserIds.add(ring.getPrimaryUserId()); - goodIds.add(id); + mEncryptKeyView.addObject(mEncryptKeyView.new EncryptionKey(ring)); } catch (PgpGeneralException e) { Log.e(Constants.TAG, "key not found!", e); } } - if (goodIds.size() > 0) { - long[] keyIds = new long[goodIds.size()]; - for (int i = 0; i < goodIds.size(); ++i) { - keyIds[i] = goodIds.get(i); - } - setEncryptionKeyIds(keyIds); - setEncryptionUserIds(goodUserIds.toArray(new String[goodUserIds.size()])); - } + updateEncryptionKeys(); } } private void updateView() { - if (mEncryptionKeyIds == null || mEncryptionKeyIds.length == 0) { + /*if (mEncryptionKeyIds == null || mEncryptionKeyIds.length == 0) { mSelectKeysButton.setText(getString(R.string.select_keys_button_default)); } else { mSelectKeysButton.setText(getResources().getQuantityString( R.plurals.select_keys_button, mEncryptionKeyIds.length, mEncryptionKeyIds.length)); - } + }*/ + /* if (mSecretKeyId == Constants.key.none) { mSign.setChecked(false); - mMainUserId.setText(""); - mMainUserIdRest.setText(""); } else { // See if we can get a user_id from a unified query String[] userId; @@ -216,7 +233,7 @@ public class EncryptAsymmetricFragment extends Fragment { userId = null; } if (userId != null && userId[0] != null) { - mMainUserId.setText(String.format("%#16x", Long.parseLong(userId[0]))); + mMainUserId.setText(userId[0]); } else { mMainUserId.setText(getResources().getString(R.string.user_id_no_name)); } @@ -227,6 +244,26 @@ public class EncryptAsymmetricFragment extends Fragment { } mSign.setChecked(true); } + */ + } + + private void updateEncryptionKeys() { + List objects = mEncryptKeyView.getObjects(); + List keyIds = new ArrayList(); + List userIds = new ArrayList(); + for (Object object : objects) { + if (object instanceof EncryptKeyCompletionView.EncryptionKey) { + keyIds.add(((EncryptKeyCompletionView.EncryptionKey) object).getKeyId()); + userIds.add(((EncryptKeyCompletionView.EncryptionKey) object).getUserId()); + } + } + long[] keyIdsArr = new long[keyIds.size()]; + Iterator iterator = keyIds.iterator(); + for (int i = 0; i < keyIds.size(); i++) { + keyIdsArr[i] = iterator.next(); + } + setEncryptionKeyIds(keyIdsArr); + setEncryptionUserIds(userIds.toArray(new String[userIds.size()])); } private void selectPublicKeys() { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java index 3111e5c3e..350bc03aa 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java @@ -20,6 +20,8 @@ package org.sufficientlysecure.keychain.ui; import android.app.Activity; import android.app.ProgressDialog; import android.content.Intent; +import android.graphics.Bitmap; +import android.graphics.Point; import android.net.Uri; import android.os.Bundle; import android.os.Handler; @@ -29,15 +31,13 @@ import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.ArrayAdapter; -import android.widget.CheckBox; -import android.widget.Spinner; -import android.widget.TextView; +import android.widget.*; import com.devspark.appmsg.AppMsg; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; +import org.sufficientlysecure.keychain.helper.OtherHelper; import org.sufficientlysecure.keychain.pgp.KeyRing; import org.sufficientlysecure.keychain.provider.TemporaryStorageProvider; import org.sufficientlysecure.keychain.helper.FileHelper; @@ -45,18 +45,18 @@ import org.sufficientlysecure.keychain.helper.Preferences; import org.sufficientlysecure.keychain.service.KeychainIntentService; import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler; import org.sufficientlysecure.keychain.service.PassphraseCacheService; -import org.sufficientlysecure.keychain.ui.dialog.DeleteFileDialogFragment; import org.sufficientlysecure.keychain.ui.dialog.PassphraseDialogFragment; import org.sufficientlysecure.keychain.util.Choice; import org.sufficientlysecure.keychain.util.Log; import java.io.File; +import java.util.ArrayList; import java.util.HashSet; +import java.util.List; import java.util.Set; public class EncryptFileFragment extends Fragment { - public static final String ARG_URI = "uri"; - public static final String ARG_ASCII_ARMOR = "ascii_armor"; + public static final String ARG_URIS = "uris"; private static final int REQUEST_CODE_INPUT = 0x00007003; private static final int REQUEST_CODE_OUTPUT = 0x00007007; @@ -64,16 +64,14 @@ public class EncryptFileFragment extends Fragment { private EncryptActivityInterface mEncryptInterface; // view - private CheckBox mAsciiArmor = null; private Spinner mFileCompression = null; - private TextView mFilename = null; - private CheckBox mDeleteAfter = null; private View mShareFile; private View mEncryptFile; + private SelectedFilesAdapter mAdapter = new SelectedFilesAdapter(); // model - private Uri mInputUri = null; - private Uri mOutputUri = null; + private ArrayList mInputUri = new ArrayList(); + private ArrayList mOutputUri = new ArrayList(); @Override public void onAttach(Activity activity) { @@ -107,17 +105,33 @@ public class EncryptFileFragment extends Fragment { } }); - mFilename = (TextView) view.findViewById(R.id.filename); - view.findViewById(R.id.btn_browse).setOnClickListener(new View.OnClickListener() { + //mFilename = (TextView) view.findViewById(R.id.filename); + //view.findViewById(R.id.btn_browse).setOnClickListener(new View.OnClickListener() { + // public void onClick(View v) { + // if (Constants.KITKAT) { + // FileHelper.openDocument(EncryptFileFragment.this, "*/*", REQUEST_CODE_INPUT); + // } else { + // FileHelper.openFile(EncryptFileFragment.this, + // mInputUri.isEmpty() ? null : mInputUri.get(mInputUri.size() - 1), "*/*", REQUEST_CODE_INPUT); + // } + // } + //}); + + View addFile = inflater.inflate(R.layout.file_list_entry_add, null); + addFile.setOnClickListener(new View.OnClickListener() { + @Override public void onClick(View v) { if (Constants.KITKAT) { FileHelper.openDocument(EncryptFileFragment.this, "*/*", REQUEST_CODE_INPUT); } else { - FileHelper.openFile(EncryptFileFragment.this, mInputUri, "*/*", - REQUEST_CODE_INPUT); + FileHelper.openFile(EncryptFileFragment.this, + mInputUri.isEmpty() ? null : mInputUri.get(mInputUri.size() - 1), "*/*", REQUEST_CODE_INPUT); } } }); + ListView listView = (ListView) view.findViewById(R.id.selected_files_list); + listView.addFooterView(addFile); + listView.setAdapter(mAdapter); mFileCompression = (Spinner) view.findViewById(R.id.fileCompression); Choice[] choices = new Choice[]{ @@ -143,11 +157,6 @@ public class EncryptFileFragment extends Fragment { } } - mDeleteAfter = (CheckBox) view.findViewById(R.id.deleteAfterEncryption); - - mAsciiArmor = (CheckBox) view.findViewById(R.id.asciiArmor); - mAsciiArmor.setChecked(Preferences.getPreferences(getActivity()).getDefaultAsciiArmor()); - return view; } @@ -155,43 +164,57 @@ public class EncryptFileFragment extends Fragment { public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - setInputUri(getArguments().getParcelable(ARG_URI)); - boolean asciiArmor = getArguments().getBoolean(ARG_ASCII_ARMOR); - if (asciiArmor) { - mAsciiArmor.setChecked(true); + addInputUris(getArguments().getParcelableArrayList(ARG_URIS)); + } + + private void addInputUris(List uris) { + if (uris != null) { + for (Uri uri : uris) { + addInputUri(uri); + } } } - private void setInputUri(Uri inputUri) { + private void addInputUri(Uri inputUri) { if (inputUri == null) { - mInputUri = null; - mFilename.setText(""); return; } - mInputUri = inputUri; - mFilename.setText(FileHelper.getFilename(getActivity(), mInputUri)); + mInputUri.add(inputUri); + mAdapter.notifyDataSetChanged(); + } + + private void delInputUri(int position) { + mInputUri.remove(position); + mAdapter.notifyDataSetChanged(); } private void showOutputFileDialog() { + if (mInputUri.size() > 1 || mInputUri.isEmpty()) { + throw new IllegalStateException(); + } + Uri inputUri = mInputUri.get(0); if (!Constants.KITKAT) { - File file = new File(mInputUri.getPath()); + File file = new File(inputUri.getPath()); File parentDir = file.exists() ? file.getParentFile() : Constants.Path.APP_DIR; - String targetName = FileHelper.getFilename( - getActivity(), mInputUri) + (mAsciiArmor.isChecked() ? ".asc" : ".gpg"); + String targetName = FileHelper.getFilename(getActivity(), inputUri) + + (mEncryptInterface.isUseArmor() ? ".asc" : ".gpg"); File targetFile = new File(parentDir, targetName); FileHelper.saveFile(this, getString(R.string.title_encrypt_to_file), getString(R.string.specify_file_to_encrypt_to), targetFile, REQUEST_CODE_OUTPUT); } else { - FileHelper.saveDocument(this, "*/*", FileHelper.getFilename(getActivity(), mInputUri) + - (mAsciiArmor.isChecked() ? ".asc" : ".gpg"), REQUEST_CODE_OUTPUT); + FileHelper.saveDocument(this, "*/*", FileHelper.getFilename(getActivity(), inputUri) + + (mEncryptInterface.isUseArmor() ? ".asc" : ".gpg"), REQUEST_CODE_OUTPUT); } } private void encryptClicked(boolean share) { - if (mInputUri == null) { + if (mInputUri.isEmpty()) { AppMsg.makeText(getActivity(), R.string.no_file_selected, AppMsg.STYLE_ALERT).show(); return; + } else if (mInputUri.size() > 1 && !share) { + AppMsg.makeText(getActivity(), "TODO", AppMsg.STYLE_ALERT).show(); // TODO + return; } if (mEncryptInterface.isModeSymmetric()) { @@ -244,17 +267,20 @@ public class EncryptFileFragment extends Fragment { } if (share) { - String targetName = FileHelper.getFilename(getActivity(), mInputUri) + - (mAsciiArmor.isChecked() ? ".asc" : ".gpg"); - mOutputUri = TemporaryStorageProvider.createFile(getActivity(), targetName); + mOutputUri.clear(); + for (Uri uri : mInputUri) { + String targetName = FileHelper.getFilename(getActivity(), uri) + + (mEncryptInterface.isUseArmor() ? ".asc" : ".gpg"); + mOutputUri.add(TemporaryStorageProvider.createFile(getActivity(), targetName)); + } encryptStart(true); - } else { + } else if (mInputUri.size() == 1) { showOutputFileDialog(); } } private void encryptStart(final boolean share) { - if (mInputUri == null || mOutputUri == null) { + if (mInputUri == null || mOutputUri == null || mInputUri.size() != mOutputUri.size()) { throw new IllegalStateException("Something went terribly wrong if this happens!"); } @@ -268,11 +294,11 @@ public class EncryptFileFragment extends Fragment { Log.d(Constants.TAG, "mInputUri=" + mInputUri + ", mOutputUri=" + mOutputUri); - data.putInt(KeychainIntentService.SOURCE, KeychainIntentService.IO_URI); - data.putParcelable(KeychainIntentService.ENCRYPT_INPUT_URI, mInputUri); + data.putInt(KeychainIntentService.SOURCE, KeychainIntentService.IO_URIS); + data.putParcelableArrayList(KeychainIntentService.ENCRYPT_INPUT_URIS, mInputUri); - data.putInt(KeychainIntentService.TARGET, KeychainIntentService.IO_URI); - data.putParcelable(KeychainIntentService.ENCRYPT_OUTPUT_URI, mOutputUri); + data.putInt(KeychainIntentService.TARGET, KeychainIntentService.IO_URIS); + data.putParcelableArrayList(KeychainIntentService.ENCRYPT_OUTPUT_URIS, mOutputUri); if (mEncryptInterface.isModeSymmetric()) { Log.d(Constants.TAG, "Symmetric encryption enabled!"); @@ -288,8 +314,7 @@ public class EncryptFileFragment extends Fragment { mEncryptInterface.getEncryptionKeys()); } - boolean useAsciiArmor = mAsciiArmor.isChecked(); - data.putBoolean(KeychainIntentService.ENCRYPT_USE_ASCII_ARMOR, useAsciiArmor); + data.putBoolean(KeychainIntentService.ENCRYPT_USE_ASCII_ARMOR, mEncryptInterface.isUseArmor()); int compressionId = ((Choice) mFileCompression.getSelectedItem()).getId(); data.putInt(KeychainIntentService.ENCRYPT_COMPRESSION_ID, compressionId); @@ -307,18 +332,25 @@ public class EncryptFileFragment extends Fragment { AppMsg.makeText(getActivity(), R.string.encrypt_sign_successful, AppMsg.STYLE_INFO).show(); - if (mDeleteAfter.isChecked()) { + if (mEncryptInterface.isDeleteAfterEncrypt()) { // Create and show dialog to delete original file - DeleteFileDialogFragment deleteFileDialog = DeleteFileDialogFragment.newInstance(mInputUri); + /*DeleteFileDialogFragment deleteFileDialog = DeleteFileDialogFragment.newInstance(mInputUri); deleteFileDialog.show(getActivity().getSupportFragmentManager(), "deleteDialog"); - setInputUri(null); + setInputUri(null);*/ } if (share) { // Share encrypted file - Intent sendFileIntent = new Intent(Intent.ACTION_SEND); - sendFileIntent.setType("*/*"); - sendFileIntent.putExtra(Intent.EXTRA_STREAM, mOutputUri); + Intent sendFileIntent; + if (mOutputUri.size() == 1) { + sendFileIntent = new Intent(Intent.ACTION_SEND); + sendFileIntent.setType("*/*"); + sendFileIntent.putExtra(Intent.EXTRA_STREAM, mOutputUri.get(0)); + } else { + sendFileIntent = new Intent(Intent.ACTION_SEND_MULTIPLE); + sendFileIntent.setType("*/*"); + sendFileIntent.putExtra(Intent.EXTRA_STREAM, mOutputUri); + } if (!mEncryptInterface.isModeSymmetric() && mEncryptInterface.getEncryptionUsers() != null) { Set users = new HashSet(); for (String user : mEncryptInterface.getEncryptionUsers()) { @@ -352,14 +384,14 @@ public class EncryptFileFragment extends Fragment { switch (requestCode) { case REQUEST_CODE_INPUT: { if (resultCode == Activity.RESULT_OK && data != null) { - setInputUri(data.getData()); + addInputUri(data.getData()); } return; } case REQUEST_CODE_OUTPUT: { // This happens after output file was selected, so start our operation if (resultCode == Activity.RESULT_OK && data != null) { - mOutputUri = data.getData(); + mOutputUri.add(data.getData()); encryptStart(false); } return; @@ -372,4 +404,52 @@ public class EncryptFileFragment extends Fragment { } } } + + private class SelectedFilesAdapter extends BaseAdapter { + @Override + public int getCount() { + return mInputUri.size(); + } + + @Override + public Object getItem(int position) { + return mInputUri.get(position); + } + + @Override + public long getItemId(int position) { + return getItem(position).hashCode(); + } + + @Override + public View getView(final int position, View convertView, ViewGroup parent) { + View view; + if (convertView == null) { + view = getActivity().getLayoutInflater().inflate(R.layout.file_list_entry, null); + } else { + view = convertView; + } + ((TextView) view.findViewById(R.id.filename)).setText(FileHelper.getFilename(getActivity(), mInputUri.get(position))); + long size = FileHelper.getFileSize(getActivity(), mInputUri.get(position)); + if (size == -1) { + ((TextView) view.findViewById(R.id.filesize)).setText(""); + } else { + ((TextView) view.findViewById(R.id.filesize)).setText(FileHelper.readableFileSize(size)); + } + view.findViewById(R.id.action_remove_file_from_list).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + delInputUri(position); + } + }); + int px = OtherHelper.dpToPx(getActivity(), 48); + Bitmap bitmap = FileHelper.getThumbnail(getActivity(), mInputUri.get(position), new Point(px, px)); + if (bitmap != null) { + ((ImageView) view.findViewById(R.id.thumbnail)).setImageBitmap(bitmap); + } else { + ((ImageView) view.findViewById(R.id.thumbnail)).setImageResource(R.drawable.ic_doc_generic_am); + } + return view; + } + } } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java new file mode 100644 index 000000000..4566e37fd --- /dev/null +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java @@ -0,0 +1,204 @@ +package org.sufficientlysecure.keychain.ui.widget; + +import android.app.Activity; +import android.content.Context; +import android.database.Cursor; +import android.graphics.Bitmap; +import android.util.AttributeSet; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; +import com.tokenautocomplete.FilteredArrayAdapter; +import com.tokenautocomplete.TokenCompleteTextView; +import org.sufficientlysecure.keychain.Constants; +import org.sufficientlysecure.keychain.R; +import org.sufficientlysecure.keychain.helper.ContactHelper; +import org.sufficientlysecure.keychain.pgp.KeyRing; +import org.sufficientlysecure.keychain.pgp.PgpKeyHelper; +import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException; +import org.sufficientlysecure.keychain.provider.CachedPublicKeyRing; +import org.sufficientlysecure.keychain.provider.KeychainContract; +import org.sufficientlysecure.keychain.util.Log; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class EncryptKeyCompletionView extends TokenCompleteTextView { + public EncryptKeyCompletionView(Context context) { + super(context); + initView(); + } + + public EncryptKeyCompletionView(Context context, AttributeSet attrs) { + super(context, attrs); + initView(); + } + + public EncryptKeyCompletionView(Context context, AttributeSet attrs, int defStyle) { + super(context, attrs, defStyle); + initView(); + } + + private void initView() { + fromCursor(null); + setPrefix(getContext().getString(R.string.label_to) + ": "); + allowDuplicates(false); + } + + private EncryptKeyAdapter mAdapter; + + @Override + protected View getViewForObject(Object object) { + if (object instanceof EncryptionKey) { + LayoutInflater l = (LayoutInflater) getContext().getSystemService(Activity.LAYOUT_INFLATER_SERVICE); + View view = l.inflate(R.layout.recipient_box_entry, null); + ((TextView) view.findViewById(android.R.id.text1)).setText(((EncryptionKey) object).getPrimary()); + setImageByKey((ImageView) view.findViewById(android.R.id.icon), (EncryptionKey) object); + return view; + } + return null; + } + + private void setImageByKey(ImageView view, EncryptionKey key) { + Bitmap photo = ContactHelper.photoFromFingerprint(getContext().getContentResolver(), key.getFingerprint()); + + if (photo != null) { + view.setImageBitmap(photo); + } else { + view.setImageResource(R.drawable.ic_generic_man); + } + } + + @Override + protected Object defaultObject(String completionText) { + // TODO: We could try to automagically download the key if it's unknown but a key id + /*if (completionText.startsWith("0x")) { + + }*/ + return null; + } + + public void fromCursor(Cursor cursor) { + if (cursor == null) { + setAdapter(new EncryptKeyAdapter(Collections.emptyList())); + return; + } + ArrayList keys = new ArrayList(); + cursor.moveToFirst(); + while (cursor.moveToNext()) { + try { + if (cursor.getInt(cursor.getColumnIndexOrThrow(KeychainContract.KeyRings.HAS_ENCRYPT)) != 0) { + EncryptionKey key = new EncryptionKey(cursor); + keys.add(key); + } + } catch (Exception e) { + Log.w(Constants.TAG, e); + return; + } + } + setAdapter(new EncryptKeyAdapter(keys)); + } + + public class EncryptionKey { + private String mUserId; + private long mKeyId; + private String mFingerprint; + + public EncryptionKey(String userId, long keyId, String fingerprint) { + this.mUserId = userId; + this.mKeyId = keyId; + this.mFingerprint = fingerprint; + } + + public EncryptionKey(Cursor cursor) { + this(cursor.getString(cursor.getColumnIndexOrThrow(KeychainContract.KeyRings.USER_ID)), + cursor.getLong(cursor.getColumnIndexOrThrow(KeychainContract.KeyRings.KEY_ID)), + PgpKeyHelper.convertFingerprintToHex( + cursor.getBlob(cursor.getColumnIndexOrThrow(KeychainContract.KeyRings.FINGERPRINT)))); + + } + + public EncryptionKey(CachedPublicKeyRing ring) throws PgpGeneralException { + this(ring.getPrimaryUserId(), ring.extractOrGetMasterKeyId(), + PgpKeyHelper.convertFingerprintToHex(ring.getFingerprint())); + } + + public String getUserId() { + return mUserId; + } + + public String getFingerprint() { + return mFingerprint; + } + + public String getPrimary() { + String[] userId = KeyRing.splitUserId(mUserId); + if (userId[0] != null && userId[2] != null) { + return userId[0] + " (" + userId[2] + ")"; + } else if (userId[0] != null) { + return userId[0]; + } else { + return userId[1]; + } + } + + public String getSecondary() { + String[] userId = KeyRing.splitUserId(mUserId); + if (userId[0] != null) { + return userId[1] + " (" + getKeyIdHexShort() + ")"; + } else { + return getKeyIdHex(); + } + } + + public long getKeyId() { + return mKeyId; + } + + public String getKeyIdHex() { + return PgpKeyHelper.convertKeyIdToHex(mKeyId); + } + + public String getKeyIdHexShort() { + return PgpKeyHelper.convertKeyIdToHexShort(mKeyId); + } + + @Override + public String toString() { + return Long.toString(mKeyId); + } + } + + private class EncryptKeyAdapter extends FilteredArrayAdapter { + + public EncryptKeyAdapter(List objs) { + super(EncryptKeyCompletionView.this.getContext(), 0, 0, objs); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + LayoutInflater l = (LayoutInflater) getContext().getSystemService(Activity.LAYOUT_INFLATER_SERVICE); + View view; + if (convertView != null) { + view = convertView; + } else { + view = l.inflate(R.layout.recipient_selection_list_entry, null); + } + ((TextView) view.findViewById(android.R.id.title)).setText(getItem(position).getPrimary()); + ((TextView) view.findViewById(android.R.id.text1)).setText(getItem(position).getSecondary()); + setImageByKey((ImageView) view.findViewById(android.R.id.icon), getItem(position)); + return view; + } + + @Override + protected boolean keepObject(EncryptionKey obj, String mask) { + String m = mask.toLowerCase(); + return obj.getUserId().toLowerCase().contains(m) || + obj.getKeyIdHex().contains(m) || + obj.getKeyIdHexShort().startsWith(m); + } + } +} diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/NoSwipeWrapContentViewPager.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/NoSwipeWrapContentViewPager.java new file mode 100644 index 000000000..08f071fb2 --- /dev/null +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/NoSwipeWrapContentViewPager.java @@ -0,0 +1,44 @@ +package org.sufficientlysecure.keychain.ui.widget; + +import android.content.Context; +import android.util.AttributeSet; +import android.view.MotionEvent; +import android.view.View; + +public class NoSwipeWrapContentViewPager extends android.support.v4.view.ViewPager { + public NoSwipeWrapContentViewPager(Context context) { + super(context); + } + + public NoSwipeWrapContentViewPager(Context context, AttributeSet attrs) { + super(context, attrs); + } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + + int height = 0; + for(int i = 0; i < getChildCount(); i++) { + View child = getChildAt(i); + child.measure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED)); + int h = child.getMeasuredHeight(); + if(h > height) height = h; + } + + heightMeasureSpec = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY); + + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + } + + @Override + public boolean onInterceptTouchEvent(MotionEvent arg0) { + // Never allow swiping to switch between pages + return false; + } + + @Override + public boolean onTouchEvent(MotionEvent event) { + // Never allow swiping to switch between pages + return false; + } +} diff --git a/OpenKeychain/src/main/res/drawable-hdpi/attachment_bg_holo.9.png b/OpenKeychain/src/main/res/drawable-hdpi/attachment_bg_holo.9.png new file mode 100644 index 0000000000000000000000000000000000000000..3cbdd667b73d827ed964c4c520312d84cc0478d0 GIT binary patch literal 282 zcmV+#0pW{L%6AWMkeO%Ib#0k~_1H{m zCPHipK8mnTcMfjAQ2QL%(QjU2Bdv%LQC(;mJ6 zMBo5oa5N-lZNx0Mn;(WEhYwZr!H(_k4GCErFv}TDHUIzs literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_doc_generic_am.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_doc_generic_am.png new file mode 100644 index 0000000000000000000000000000000000000000..55b9b7d3c2560f2cc35c7b0ef24febd9d821671c GIT binary patch literal 694 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UIIA^$sR$z3=CCj3=9n|3=F@3LJcn%7)pVryh>nTu$sZZAYL$MSD+10f-TA0 z-G$*l2rk&Wd@@jkv%n*=7)X17vD?XPJD~Axo-U3d8Ta1KJnMDXLB!3!%RZ!=t4ZmF z@Q%XF(ue1IOP`0uJa9tqUTDIHRQstO4SAA6y+-Sr)K|Jl z&(O7+xr9kbE%YJ59}^^WTjV7IZl51LX?i!ewch@Vu%u3 zqm$4^jwM2}3FqAx^)0`^{=w~^u|1=h;nWJobxDFd7|)%kXUt)0KcKeZp;e_UQ-9g% z#jJ0B`^jClRd8Z;TFkUCu<^nQhl~&f6D@&RGgxXqUDIH7dEM!$;26+4gT)0XrE>p> z_Y8Ye=7TrxM;urpG?lZ*Q1GExfmd0KhAQK;x0Q2}%jFxRAMkx%zD(=a0cN$X!fjo=Ijdcwy zb&U){jEt;I46IDebq&m|3=H9nO2Eg!+FMa%s>s2ARB`7(@M${i&7aJ iQ}UBi6+Ckj(^G>|6H_V+Po{#>4}+(xpUXO@geCwEDgIgj literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_generic_man.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_generic_man.png new file mode 100644 index 0000000000000000000000000000000000000000..b6b3129f54ec5b786af15f74aaeb0170f3219dd0 GIT binary patch literal 2375 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 literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-mdpi/attachment_bg_holo.9.png b/OpenKeychain/src/main/res/drawable-mdpi/attachment_bg_holo.9.png new file mode 100644 index 0000000000000000000000000000000000000000..bb9214b6a960f28a18308aa6b40c462dbb916527 GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rhe$(}BbAr`0aPC3ohpdjF?+bkEd zKhW{Uve3W(%Wt;kIe!U@ayeAEu$Z6A>QvO~a|dQD@0MD5mxWopOers9LE)09mTnC; zQw^DwGpA~+F8C_2^-Pxr>oMn)8KQw~R{Vj-->i3?6DPPbzw=(5`>bwTi31gf4@4ba z^JlAoi%lBeDe0nXZf92I{=RUhrYUawNS%G}U;vjb? zhIQv;UV>C6dj$D1FjT2AFf_CjA5L~c#`DCC7XMsm#F_88EW4Dvpc0l79JzX3_A`ZX3w$bZwfXK0r@!4#mrNV;j zyI;IWs%11Uync0h@x}6jBCSW#8b276Tphc)`1U%ttEp%DaI4Cva6G^B{@>@j%;sC7 zHds04@>@3^=b!h%klP_F;PwI0vde0fQ3sXtKK`4}5ZNU0VBdoGJnEVoXRi{7?3`!* zxZ|^li}>F!ah!{yO*b7_-OrtKPWVAN*Adli&*mOj^1RSXsU?FcK}gAG(HQ}^U&qq@ z-k$i;vCc4y>j59X<UO_QmvAUQh^kMk%6JHu7RblkwJ)&k(G&om8rR|fw`4|!M+%={U{o8^HVa@DsgK# z&$x~ms6i5BLvVgtNqJ&XDuZK6ep0G}XKrG8YEWuoN@d~6R8Z70c)I$ztaD0e0szRU B#7Y1F literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_generic_man.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_generic_man.png new file mode 100644 index 0000000000000000000000000000000000000000..f763dd259c9fc2b4987cf1a04564c31f2679dec8 GIT binary patch literal 1657 zcmZWqdoY z6{gFyEK!r0jCy3dsnXPIw5z()j>jzNIEX{hdUVs>zxM38=ibk`pU?T+``^9Sg3bi! z>zeBV0QBiJYOn^0pHc^dX}+mp_N37wGc-v1 zPx=oglL0`|=~N2q;+sX$c_B7*e^K9(Xz)SNdQq2b#y9G$9{xyDH~)YFEn6|}#+hRZ zbgok@5jLARRY9ZB{NxIq)!ooIM?o_6tc7L%2)_cM0)e5oJe-_dTyMC)UbnU$Sidy+ zH=XmN&v-fY9`7a=S)qS7AdDI8v^$&&j8Ci$TN#EbZQXN$(N&(qNMO5l71TTnI4*SC+>~noLDa@z%y$jDZvQ?wUj}l z%!a|y<5fkv87B=QP)Rj$+u`P73IWWNedlZ3Et_{j@yQIdRIXD}z3Q82OYIE;EM zz$uEnUNGEm5l5n3_$4OoG?hkiy}u2zYxELp*IOA!Lt<;2;vbciXODty{Z>@=+kWOg znd!>LtYDGm(1CWd*hF`D&zi~&FL|mlv4zJZ*q5L+#OguUPU~DwGUravG!z{^J@ny} zg94s{-+D|jqe>05HsBF!h+84dSC?j1+MMn6Pif1!#)jLr z9D>>`INqr68mlwKb~J(U@`=2Z=G84YnDiKN=C5DEDiWEE^txN?GM?(Ux6y(YDdCL! z;K{l&UD-i5U-o;nfZvP+4t1mMaHNcF7td`vaFl!t14xFUK&XZ}X&1g_kIE zzG3L9e3iERD!aX@^xmC;_w_f**qOMprKBSdObmyDCqmV|O&9&3hOf@(ALQM`Y!8{S~jS z)J@+o@EtIC{9+*CURb5=s)Gw2_W-Z9yL;BG->B=D2+n~MreB<q+*N{|( xoz)o3K5Ym|jnB-9N#_DeTxu*AM^A}K;0AMJ;=cHNko)Nc0J`59YMT!y|KGN(#{&QW literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/attachment_bg_holo.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/attachment_bg_holo.9.png new file mode 100644 index 0000000000000000000000000000000000000000..1f4b25d21cb85faecf90fd428f24186ac1d791c9 GIT binary patch literal 344 zcmV-e0jK_nP)Hn#bN3KQ z0wCsw6cYb}7ytl#bU+>jQ|I{0i2$I48{TYxnXJe=fCQj=NlPe4I-xAEJPClj5Glx? z0OS)uavXF7VK_Ha5ylhfs4_d)Y!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YPV z+ueoXKL{?^yL>WGgtNdSvKUBvfU(=jY&!-9CVo#B$B>F!Z*T3+yW+sm`Y_+zn@dmV zItypV305vGEtLfe7qYhAKK+qRBp@i@(jjLB79n0CP8OCodPggcvT-^dOYUDgH@?X7 zp7H+vW8bPYM7Ua=5)&n_NR&%m-x&4S#(3WY)q6>|mNf)E*>QMB_iBqN3dbe1E1JIN zdPQ`}l#7%XEaCbsYp>kDvOv-AVUB9Ta$Uxayff0nSG-?-;^Xsz&8LbuzqhLGx$Gny z#Bt;BYpnvF@Pf6cHnp6tXjxuyc}q*;WcB`(2HiWtw*t!>-_B+DX8tf~vd}KAhWoxZ zj{RJwQWDAVd-jHVEiHN+GeVBvpOJs4^@`9gg@jl4wf_d}aJ8GVgELm(!~Qe(Wha>~ z^k+(|+^!NM{7cQj^ri2^&ce0pTI{%HJiR9}YeQhVT&<|Xj!)8uW^E9&o-Xp9sdVOp z+0FZB@@>>HNtEvYxU-+h?m?u>G~*qrduFZg`V+s1o2l%BR?;1-yeoe{+O22w)L<%N zKjAAl!P+6OtKkk~Q83FBz6rCH6v`X!h%oMCezJ_?gsg(OtHV2notj{!^I3UxUQA#3 z^Uc=J-yeMn+a923Dr#x(4P}1_t|L z#P*|T$jwj5OsmAL;XLCyW}pU1kPX54X(i=}MX3yqDfvmM3ZA)%>8U}fi7AzZCsRQQ OnZeW5&t;ucLK6Vf$U>n2 literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_generic_man.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_generic_man.png new file mode 100644 index 0000000000000000000000000000000000000000..212293db0de7451d2f75efccd5eeb78aa2f157b8 GIT binary patch literal 3149 zcmZWrc{tRI_x_B*j3GneTEZ|IN-|7I|2tpkS%-J*GY?nt~H`h zMF`o+ggctDW(>(Pwy*pB{q=o*&w1YSp7%Y^`<#DIyvY@VLkLL(004)K3<;(OO#T;e z-h=)vJ6Q98xLtKG>jJ>56#g9to&yc>H#N`$DnB2cKM*Jvkzfh#NL%nF%lAvO{g^936-(|EF5x}NbBcQkQGq5& zqpq2+$XGrLL7F+m-U9_0dEoLys1B3gRc~4VULg^|u7Xwqc8oAqUtADJQvCz{7JO6E z=MekqMot(~DOos19o7Har6dVj1lY~%soH4_QJh{Am>$ z4!A(>CDBpTHzeey;5((WNy+43Yo4h@G5k4*w>-{{}U)IYxt zNDxHD6Ut&sg+B&%9;J3iHng=GWRY>4ad3-JALn?agC2S)er@CZl?Jmf;!|^#LrWSW z@)+nH)!7$@Z}RQ|w4vMIb?zIwD``N>K?!htEjB|1Q|@*oBq~%oCWs{In@;w8fPOl9 zdbesn>UhVIxX(sKtGl=+mZ^AnK3yLWnZDemt?-H@V59W6_4{ zs8SM)w08VP2wpnJdvftjd@ERLaj4w|EY2x>or2SV3U>UoK{8+c*P{s}?>`lm@f|B1 zj~mI?`i2tLj?sqaO~NMXg2fq?`&=@DQ&NPVhj#2e(e(&CVq&%sDG7D&l)8O%)4D?K zBPEguPBQI~bSpA*Jkhkc_=Y&6{>SL(Bn$6W2}iH*f^zA!Psu{Ki@o??Qkk38xj%g} zo!0Ir;NOLMF&n#WX>bcFuK;>?Q#s(2&84l+LhMixIa}I>xPxM7Loq>j@t4rw`)_Ak z|7fRoD_{BL!l>(c6rNZUB7?A;$QjzzYA4QFjKq0+&3%muYpjV9mrHo{5@mMbJeLf7 z>K6&BlQ5j={KC9xM?5IZlF#N+sUtP^3QeH08BDJ}Ld3m%~S756iXi zYU=&1PtdiSp4Vq|o9KAuo}uuwNtuV&jvzjDBNYB&y_T8ZJjM#M=PVP12OD1z7Om}` z-q2?kfGI8SHnEe<;$`uL#8fcNK>s4|N=KA;iE&tBLOu6;G#J`>(@CNL5=AkO3{Ioa z?%%7v#}WmRQGaONwSXi)GltWx=2*Y)1TT{oE?hqOiRo_c;rL{KH?H_r2a|q+Csan65Mx za}uJH60n++OnxG0d|OIhDUrM$)>{`SY2{z3XawTES@X{7)MoTO+#G#3k!qUnB)*AY z^Lkf1$huE?3zjIn?n}$pi^`t6p~u%jLB6Grs+;q=YS97CMij+`Mbw(My>;EvPRuf` z46$>DVa2$(@uvrp@pd0|!rMp6FZk(0wM!p_{;t%Je~5cDSZ}XDL8k9$i`1Sw+2)*2 zdNPAxFguyqb*HjNDCMi-j-X6>ItA8mdD<}SK`B75QySo$Ovk2IYez(^hMm43Xi6T> z^?LY14f96edG>5$pXBpnZ$GE(?}_}5woP5#uC{%P8E^tSCO*)!)v{o*kkt9m5QLBD zV6Q&8TgA{R`s&Y$J=ZYRiX&_MjNQ&K7XL?vC{>-?m|eCM6DK^IL2WZ$eGvC@eGD#x ziC@-tVLedbyj2clHd)p7y&LNQRCRS8Cz3*>WUn`-Fcz%!TqI(oULRMOA47*N-?*A@ zPu#YtYil~*N7b(&Y+2;>J8~*Cyn^8>!@;y8m9`2!h;E9$zgojxy`KJJ9XE^okt&Nh zt@n4Hhf6wwxPcjJ(qo@R(~VsNlJQ_TBL$Q-S$hxF&3b>kLFXgm7E{e>i$1uZqmuV__Ht5`%rEsO^~%T%T`zf-)NSNP7w8y}_!t-`SM%|32H${q zf3ZA^TV3@mt@N^nkQuJkc2ARyV_+CCg+~eR*7+=_PqsRX;CIA|2hU}d#O&4xZ8*;U$S5~wn$oUK=eFMc%u36E3xK!gy^^??A96l z7DBt|=4p2K&C&j!J8-|@5#ptQPtnQZ{baL1K7^Lq@oxHfEcTjk_=Yg0_a`xNUFSQL zBkP#3n*t&j^KQQ9p|@hkU>9o2(mq^ljezMyE_6yP;VaKfYCzS^Kl`0_ZV0*OxnbTt zwrvTaSZYmHOD`HUGkvfx*m>+zYs)h)c6ClZu?DL?9n^zQBX@yP8*^UL*j zbj~q^{g$#ce%T6Rl0eVl(m>gUX~Z|9g66idj_Wq%6%Uu|=`gKJI)B6rRFr+V%Tx(G zbzxOiFLBtELp$Xr@I@0@yxXH)8xk;HnVI|DTVL2`Mlc)McE8QpSDo!yo0WZT;^wi; zC-V}ihksN@x_lSESj ziM5Ta9-~H)vG*56Mpr2EqACmi78L^_bIT@H<<(!yzh5V1vbiTy+*rppiJ#8)>%Fdz z9n4#W31pQPkd1c6vAGk8tMEPMl=tR+-(H_CLF4N*Y`X4q9!V*e{0ic<3NEikzg#H; z@-D?)iLfogsSye$VI5l1G5lkniH2s{9wrhSTkc*O{5ah#^i`h@0jy2Tn+G$<<7tO} zUGUVEs*9DR2}7yQMX0T;X20nIsi3R2_L3igZ&7H6)eiC0s@pFXF8 zJ&VU;XYD7e{wLt+O}Xh3^8W)kjsFX{ryOM-1SI~wVCL--5bWUR4Cqq49i34|o(`_g Yrp^wO5Z^B6f8Tn*h(y#FJ#)S01#*{-I{oTx+0pH#ab z9?pv0Fb2hB;n^|Rh+*X^Ii4^RkxiVWW*wqs4)Z<1(k!W;7(BFI8h#PivVVsLpMG0)4Py`?4z zeBQ)N`-p|05|K7MsOk`RIe=XPZh*Tf2jyf~mR*n2fC40-Ns6{pEa#*-0Px~NAa8my z#l?7`=nF|cqQ^8fjwExroFnISsCqX^dA(kXgQo4s!fq54Q_R~HV@-*HhlZrfnklOa zZZV2oYOm=dP^1efWVJ|SkytT`g+e7G^P)yl4nStJR$lYgh8cr*!dTMUh!-?S#-O40 z>JsWlYE21@YIk=>mLZCUds3HCQ^X9fO1)XAm|@;Wpc6+@PIAES0TjhDfTe-kLs1^T zn-4L(074#*KskjH$5Pl3aJ$%m;0Xqu2pIw%#w~a$$}O;NPmm5!C2UwROi__w$*+w3 z7P0JIv0PAxqN(a}Rn3$ppshzWRij7M@L;y4>qr6&y4M$vEz@_a&wXH)}KRf%{^bge+TZYa=ug2lgpC7yD_Nt3pL;F*=MyDEcsV9cb6@g!m zb%!oZRoFVt)psC7pcH+jt$>5jgactzLTzUJ> z1LIHMe9Qmp=O3ItUOTuR>|6W%d($2lcZxpAo9;JK*u?pPhr*7td-35t$EsU?zoKm( z+-lz#9FniSK6~XBMRTefY#n9UH9wRyY*p JPX{{p{tLvyz?}d9 literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_doc_generic_am.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_doc_generic_am.png new file mode 100644 index 0000000000000000000000000000000000000000..c098866320d2d6190598e2058ea405291aae01c2 GIT binary patch literal 585 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 - + diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml index cde92b477..284fdd9ce 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml @@ -9,69 +9,15 @@ android:paddingRight="16dp" android:paddingLeft="16dp"> - - - + android:text="@string/label_sign"/> - - - - - - - - - - - - -