aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-10-04 13:44:34 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-10-04 13:44:34 +0200
commitf0ee7ed4cf91427a12fa7dd55dc67b7f6c5c4833 (patch)
tree2a778734d50f7470f9b1cf9b31a50f8209b597df
parentc30c36fb2ac5ab1711bca21f0ba14d9f3ef6e074 (diff)
downloadopen-keychain-f0ee7ed4cf91427a12fa7dd55dc67b7f6c5c4833.tar.gz
open-keychain-f0ee7ed4cf91427a12fa7dd55dc67b7f6c5c4833.tar.bz2
open-keychain-f0ee7ed4cf91427a12fa7dd55dc67b7f6c5c4833.zip
New add keys activity
-rw-r--r--OpenKeychain/src/main/AndroidManifest.xml26
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java188
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java2
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java6
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/ExchangeKeySpinner.java97
-rw-r--r--OpenKeychain/src/main/res/layout/add_key_activity.xml137
-rw-r--r--OpenKeychain/src/main/res/menu/key_list.xml2
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml2
8 files changed, 447 insertions, 13 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index a00b6f01c..68153af34 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -615,6 +615,16 @@
android:value=".ui.KeyListActivity" />
</activity>
<activity
+ android:name=".ui.AddKeysActivity"
+ android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
+ android:label="@string/title_add_keys"
+ android:windowSoftInputMode="stateHidden"
+ android:parentActivityName=".ui.KeyListActivity">
+ <meta-data
+ android:name="android.support.PARENT_ACTIVITY"
+ android:value=".ui.KeyListActivity" />
+ </activity>
+ <activity
android:name=".ui.ConsolidateDialogActivity"
android:theme="@android:style/Theme.NoDisplay" />
<activity
@@ -634,14 +644,14 @@
android:allowTaskReparenting="true" />
<!--<activity-->
- <!--android:name=".ui.NfcIntentActivity"-->
- <!--android:launchMode="singleTop">-->
- <!--<intent-filter>-->
- <!--<action android:name="android.nfc.action.NDEF_DISCOVERED" />-->
-
- <!--<category android:name="android.intent.category.DEFAULT" />-->
- <!--<data android:host="my.yubico.com" android:scheme="https"/>-->
- <!--</intent-filter>-->
+ <!--android:name=".ui.NfcIntentActivity"-->
+ <!--android:launchMode="singleTop">-->
+ <!--<intent-filter>-->
+ <!--<action android:name="android.nfc.action.NDEF_DISCOVERED" />-->
+
+ <!--<category android:name="android.intent.category.DEFAULT" />-->
+ <!--<data android:host="my.yubico.com" android:scheme="https"/>-->
+ <!--</intent-filter>-->
<!--</activity>-->
<activity
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java
new file mode 100644
index 000000000..05d6c2779
--- /dev/null
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java
@@ -0,0 +1,188 @@
+/*
+ * 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;
+
+import android.content.Intent;
+import android.graphics.PorterDuff;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
+import android.view.View;
+import android.widget.ImageView;
+
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.pgp.CanonicalizedPublicKeyRing;
+import org.sufficientlysecure.keychain.provider.CachedPublicKeyRing;
+import org.sufficientlysecure.keychain.provider.KeychainContract;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.service.results.OperationResult;
+import org.sufficientlysecure.keychain.ui.util.Notify;
+import org.sufficientlysecure.keychain.ui.widget.ExchangeKeySpinner;
+import org.sufficientlysecure.keychain.ui.widget.KeySpinner;
+import org.sufficientlysecure.keychain.util.Log;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import edu.cmu.cylab.starslinger.exchange.ExchangeActivity;
+import edu.cmu.cylab.starslinger.exchange.ExchangeConfig;
+
+public class AddKeysActivity extends ActionBarActivity {
+
+ ExchangeKeySpinner mSafeSlingerKeySpinner;
+ View mActionSafeSlinger;
+ ImageView mActionSafeSlingerIcon;
+ View mActionQrCode;
+ View mActionSearchCloud;
+
+ ProviderHelper mProviderHelper;
+
+ long mExchangeMasterKeyId = Constants.key.none;
+
+ private static final int REQUEST_CODE_SAFESLINGER = 1;
+
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ mProviderHelper = new ProviderHelper(this);
+
+ setContentView(R.layout.add_key_activity);
+
+ mSafeSlingerKeySpinner = (ExchangeKeySpinner) findViewById(R.id.add_keys_safeslinger_key_spinner);
+ mActionSafeSlinger = findViewById(R.id.add_keys_safeslinger);
+ mActionSafeSlingerIcon = (ImageView) findViewById(R.id.add_keys_safeslinger_icon);
+ // make certify image gray, like action icons
+ mActionSafeSlingerIcon.setColorFilter(getResources().getColor(R.color.tertiary_text_light),
+ PorterDuff.Mode.SRC_IN);
+ mActionQrCode = findViewById(R.id.add_keys_qr_code);
+ mActionSearchCloud = findViewById(R.id.add_keys_search_cloud);
+
+ mSafeSlingerKeySpinner.setOnKeyChangedListener(new KeySpinner.OnKeyChangedListener() {
+ @Override
+ public void onKeyChanged(long masterKeyId) {
+ mExchangeMasterKeyId = masterKeyId;
+ }
+ });
+
+ mActionSafeSlinger.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ startExchange();
+ }
+ });
+
+ mActionQrCode.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ startQrCode();
+ }
+ });
+
+ mActionSearchCloud.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ searchCloud();
+ }
+ });
+
+ }
+
+ private void startExchange() {
+ if (mExchangeMasterKeyId == 0) {
+ Notify.showNotify(this, getString(R.string.select_key_for_exchange),
+ Notify.Style.ERROR);
+ } else {
+ // retrieve public key blob and start SafeSlinger
+ Uri uri = KeychainContract.KeyRingData.buildPublicKeyRingUri(mExchangeMasterKeyId);
+ try {
+ byte[] keyBlob = (byte[]) mProviderHelper.getGenericData(
+ uri, KeychainContract.KeyRingData.KEY_RING_DATA, ProviderHelper.FIELD_TYPE_BLOB);
+
+ Intent slingerIntent = new Intent(this, ExchangeActivity.class);
+ slingerIntent.putExtra(ExchangeConfig.extra.USER_DATA, keyBlob);
+ slingerIntent.putExtra(ExchangeConfig.extra.HOST_NAME, Constants.SAFESLINGER_SERVER);
+ startActivityForResult(slingerIntent, REQUEST_CODE_SAFESLINGER);
+ } catch (ProviderHelper.NotFoundException e) {
+ Log.e(Constants.TAG, "personal key not found", e);
+ }
+ }
+ }
+
+ private void startQrCode() {
+
+ }
+
+ private void searchCloud() {
+ Intent importIntent = new Intent(this, ImportKeysActivity.class);
+ startActivity(importIntent);
+ }
+
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+ // if a result has been returned, display a notify
+ if (data != null && data.hasExtra(OperationResult.EXTRA_RESULT)) {
+ OperationResult result = data.getParcelableExtra(OperationResult.EXTRA_RESULT);
+ result.createNotify(this).show();
+ } else {
+ switch (requestCode) {
+ case REQUEST_CODE_SAFESLINGER:
+ switch (resultCode) {
+ case ExchangeActivity.RESULT_EXCHANGE_OK:
+ // import exchanged keys
+ Intent importIntent = new Intent(this, ImportKeysActivity.class);
+ importIntent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY);
+ importIntent.putExtra(ImportKeysActivity.EXTRA_KEY_BYTES, getSlingedKeys(data));
+ startActivity(importIntent);
+ break;
+ case ExchangeActivity.RESULT_EXCHANGE_CANCELED:
+ // handle canceled result
+ // ...
+ break;
+ }
+ break;
+ }
+ super.onActivityResult(requestCode, resultCode, data);
+ }
+ }
+
+ private static byte[] getSlingedKeys(Intent data) {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+ Bundle extras = data.getExtras();
+ if (extras != null) {
+ byte[] d;
+ int i = 0;
+ do {
+ d = extras.getByteArray(ExchangeConfig.extra.MEMBER_DATA + i);
+ if (d != null) {
+ try {
+ out.write(d);
+ } catch (IOException e) {
+ Log.e(Constants.TAG, "IOException", e);
+ }
+ i++;
+ }
+ } while (d != null);
+ }
+
+ return out.toByteArray();
+ }
+}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java
index 7132518ae..da46de486 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java
@@ -82,7 +82,7 @@ public class DrawerActivity extends ActionBarActivity {
}
NavItem mItemIconTexts[] = new NavItem[]{
- new NavItem(R.drawable.ic_action_person, getString(R.string.nav_keys)),
+ new NavItem(R.drawable.ic_action_accounts, getString(R.string.nav_keys)),
new NavItem(R.drawable.ic_action_secure, getString(R.string.nav_encrypt_text)),
new NavItem(R.drawable.ic_action_secure, getString(R.string.nav_encrypt_files)),
new NavItem(R.drawable.ic_action_not_secure, getString(R.string.nav_decrypt)),
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
index f06531b01..5eef319c0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
@@ -84,7 +84,7 @@ public class KeyListActivity extends DrawerActivity {
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_key_list_add:
- importKeys();
+ addKeys();
return true;
case R.id.menu_key_list_create:
@@ -139,8 +139,8 @@ public class KeyListActivity extends DrawerActivity {
}
}
- private void importKeys() {
- Intent intent = new Intent(this, ImportKeysActivity.class);
+ private void addKeys() {
+ Intent intent = new Intent(this, AddKeysActivity.class);
startActivityForResult(intent, 0);
}
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
new file mode 100644
index 000000000..3da11f9f3
--- /dev/null
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/ExchangeKeySpinner.java
@@ -0,0 +1,97 @@
+/*
+ * 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 mIndexHasSign, mIndexIsRevoked, mIndexIsExpired;
+
+ @Override
+ public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
+ super.onLoadFinished(loader, data);
+ // 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;
+ }
+
+}
diff --git a/OpenKeychain/src/main/res/layout/add_key_activity.xml b/OpenKeychain/src/main/res/layout/add_key_activity.xml
new file mode 100644
index 000000000..ca0baecdb
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/add_key_activity.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/content_frame"
+ android:layout_marginLeft="@dimen/drawer_content_padding"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <include layout="@layout/notify_area" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingTop="4dp"
+ android:paddingLeft="16dp"
+ android:paddingRight="16dp"
+ android:orientation="vertical">
+
+ <TextView
+ style="@style/SectionHeader"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="16dp"
+ android:text="Secure Exchange" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:padding="0dp"
+ android:layout_margin="0dp">
+
+ <TextView
+ android:paddingLeft="8dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:text="My key:"
+ android:paddingRight="8dp" />
+
+ <org.sufficientlysecure.keychain.ui.widget.ExchangeKeySpinner
+ android:id="@+id/add_keys_safeslinger_key_spinner"
+ android:minHeight="56dip"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical" />
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/add_keys_safeslinger"
+ android:layout_width="match_parent"
+ android:layout_height="?android:attr/listPreferredItemHeight"
+ android:clickable="true"
+ android:paddingRight="4dp"
+ style="@style/SelectableItem"
+ android:orientation="horizontal">
+
+ <TextView
+ android:paddingLeft="8dp"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_width="0dip"
+ android:layout_height="match_parent"
+ android:text="Start exchange"
+ android:layout_weight="1"
+ android:gravity="center_vertical" />
+
+ <ImageView
+ android:id="@+id/add_keys_safeslinger_icon"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:padding="8dp"
+ android:src="@drawable/ic_action_safeslinger"
+ android:layout_gravity="center_vertical" />
+
+ </LinearLayout>
+
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dip"
+ android:background="?android:attr/listDivider"
+ android:layout_marginBottom="8dp" />
+
+ <TextView
+ style="@style/SectionHeader"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="32dp"
+ android:text="Add" />
+
+ <TextView
+ android:id="@+id/add_keys_qr_code"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:clickable="true"
+ style="@style/SelectableItem"
+ android:text="QR Code"
+ android:drawableRight="@drawable/ic_action_qr_code"
+ android:drawablePadding="8dp"
+ android:gravity="center_vertical" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dip"
+ android:background="?android:attr/listDivider"
+ android:layout_marginBottom="8dp" />
+
+ <TextView
+ style="@style/SectionHeader"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="32dp"
+ android:text="Import (untrusted)" />
+
+ <TextView
+ android:id="@+id/add_keys_search_cloud"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:clickable="true"
+ style="@style/SelectableItem"
+ android:text="Search cloud"
+ android:drawableRight="@drawable/ic_action_search"
+ android:drawablePadding="8dp"
+ android:gravity="center_vertical" />
+
+ </LinearLayout>
+
+</LinearLayout> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml
index 6e571243d..27d96d7d7 100644
--- a/OpenKeychain/src/main/res/menu/key_list.xml
+++ b/OpenKeychain/src/main/res/menu/key_list.xml
@@ -12,7 +12,7 @@
<item
android:id="@+id/menu_key_list_add"
app:showAsAction="ifRoom|withText"
- android:icon="@drawable/ic_action_add_person"
+ android:icon="@drawable/ic_action_new_account"
android:title="@string/menu_add_keys" />
<item
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 9f5d3f535..f694d1140 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -29,6 +29,7 @@
<string name="title_encrypt_to_file">"Encrypt To File"</string>
<string name="title_decrypt_to_file">"Decrypt To File"</string>
<string name="title_import_keys">"Import Keys"</string>
+ <string name="title_add_keys">"Add Keys"</string>
<string name="title_export_key">"Export Key"</string>
<string name="title_export_keys">"Export Keys"</string>
<string name="title_key_not_found">"Key Not Found"</string>
@@ -234,6 +235,7 @@
<string name="select_key_to_certify">"Please select a key to be used for certification!"</string>
<string name="key_too_big_for_sharing">"Key is too big to be shared this way!"</string>
<string name="text_copied_to_clipboard">"Text has been copied to the clipboard!"</string>
+ <string name="select_key_for_exchange">"Please select a key to be used for secure exchange!"</string>
<!--
errors