From 91443c2f43615f25cd412007d89fe5a8ccc082bb Mon Sep 17 00:00:00 2001 From: Adithya Abraham Philip Date: Sun, 19 Apr 2015 13:31:37 +0530 Subject: support for handling keyserver urls from browser, added documentation --- OpenKeychain/src/main/res/values/strings.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'OpenKeychain/src/main/res') diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index c1e3b51f9..d4c67aa23 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -404,6 +404,9 @@ "Scan QR Code" "Place your camera over the QR Code!" + + "No search parameter found. You may still attempt manually searching the keyserver." + "Details" ", with warnings" -- cgit v1.2.3 From 2571d25058706ae2725e0a70db4fa1c7eacfc153 Mon Sep 17 00:00:00 2001 From: Adithya Abraham Philip Date: Wed, 22 Apr 2015 06:15:14 +0530 Subject: keyserver verification on addition --- .../src/main/res/layout/add_keyserver_dialog.xml | 29 ++++++++++++++++++++++ OpenKeychain/src/main/res/values/strings.xml | 12 +++++++++ 2 files changed, 41 insertions(+) create mode 100644 OpenKeychain/src/main/res/layout/add_keyserver_dialog.xml (limited to 'OpenKeychain/src/main/res') diff --git a/OpenKeychain/src/main/res/layout/add_keyserver_dialog.xml b/OpenKeychain/src/main/res/layout/add_keyserver_dialog.xml new file mode 100644 index 000000000..78e9247ea --- /dev/null +++ b/OpenKeychain/src/main/res/layout/add_keyserver_dialog.xml @@ -0,0 +1,29 @@ + + + + + + + + \ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index d4c67aa23..fa8bd16b9 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -86,6 +86,7 @@ "Encrypt text" "Add additional email address" "Unlock" + "Add" "Settings" @@ -152,6 +153,8 @@ "Enable compression" "Encrypt filenames" "Hide recipients" + "Verify Keyserver" + "Enter Keyserver URL" "Search Keyserver" "Search HKP keyserver" @@ -353,6 +356,8 @@ "consolidate: saving to cache…" "consolidate: reimporting…" + "verifying keyserver…" + "Search via Name, Email…" @@ -645,6 +650,13 @@ "<none>" + + "Add Keyserver" + "Keyserver verified!" + "Keyserver added without verification." + "Invalid URL!" + "Failed to connect to keyserver. Please check the URL and your internet connection." + "Keys" "Encrypt/Decrypt" -- cgit v1.2.3 From aecebd2ac012804477ab3ec59ca6cf0417a56c5f Mon Sep 17 00:00:00 2001 From: Manoj Khanna Date: Wed, 22 Apr 2015 18:30:35 +0530 Subject: Fixed Snackbar behind layout Surrounded string with quotes --- .../src/main/res/layout/encrypt_files_fragment.xml | 4 ++-- .../src/main/res/layout/encrypt_text_fragment.xml | 27 +++++++++++----------- OpenKeychain/src/main/res/values/strings.xml | 1 + 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'OpenKeychain/src/main/res') diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml index b75ec5022..8fd2c79fc 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml @@ -1,5 +1,5 @@ - @@ -12,4 +12,4 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - \ No newline at end of file + \ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml index 3c21291cd..7645918f4 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml @@ -1,25 +1,24 @@ - + android:layout_height="match_parent"> - + android:layout_height="match_parent" + android:fillViewport="true"> + android:hint="@string/encrypt_content_edit_text_hint" /> - - + + + diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index fa8bd16b9..df88336a1 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1238,6 +1238,7 @@ "Swipe down to update from keyserver" "Select at least one file to encrypt!" "Saving of multiple files not supported. This is a limitation on current Android." + "Type some text to encrypt!" "Key:" "To start a key exchange, choose the number of participants on the right side, then hit the “Start exchange” button.\n\nYou will be asked two more questions to make sure only the right participants are in the exchange and their fingerprints are correct." "Start exchange" -- cgit v1.2.3 From a4e871030d80a14fd0bc34b6ceb2e2f2d00bbabf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Wed, 22 Apr 2015 19:00:18 +0200 Subject: Update changelog --- OpenKeychain/src/main/res/raw/help_changelog.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'OpenKeychain/src/main/res') diff --git a/OpenKeychain/src/main/res/raw/help_changelog.md b/OpenKeychain/src/main/res/raw/help_changelog.md index 104454f39..98639de71 100644 --- a/OpenKeychain/src/main/res/raw/help_changelog.md +++ b/OpenKeychain/src/main/res/raw/help_changelog.md @@ -2,8 +2,9 @@ ## 3.2beta2 + * First version with full YubiKey support available from the user interface: Edit keys, bind YubiKey to keys,... * Material design - * Integration of QR Scanner (New permissions required) + * Integration of QR Code Scanning (New permissions required) * Improved key creation wizard * Fix missing contacts after sync * Requires Android 4 @@ -13,6 +14,7 @@ * Fix: Some valid keys were shown revoked or expired * Don't accept signatures by expired or revoked subkeys * Keybase.io support in advanced view + * Method to update all keys at once ## 3.1.2 @@ -35,7 +37,7 @@ * Redesigned decrypt screen * New icon usage and colors * Fix import of secret keys from Symantec Encryption Desktop - * Subkey IDs on YubiKeys are now checked correctly + * Experimental YubiKey support: Subkey IDs are now checked correctly ## 3.0.1 @@ -46,7 +48,6 @@ ## 3.0 - * Full support for YubiKey signature generation and decryption! * Propose installable compatible apps in apps list * New design for decryption screens * Many fixes for key import, also fixes stripped keys @@ -55,12 +56,13 @@ * Fixing user id revocation certificates * New cloud search (searches over traditional keyservers and keybase.io) * Support for stripping keys inside OpenKeychain + * Experimental YubiKey support: Support for signature generation and decryption ## 2.9.2 * Fix keys broken in 2.9.1 - * YubiKey decryption now working via API + * Experimental YubiKey support: Decryption now working via API ## 2.9.1 @@ -69,7 +71,7 @@ * Fix key flags handling (now supporting Mailvelope 0.7 keys) * Improved passphrase handling * Key sharing via SafeSlinger - * YubiKey: preference to allow other PINs, currently only signing via the OpenPGP API works, not inside of OpenKeychain + * Experimental YubiKey support: Preference to allow other PINs, currently only signing via the OpenPGP API works, not inside of OpenKeychain * Fix usage of stripped keys * SHA256 as default for compatibility * Intent API has changed, see https://github.com/open-keychain/open-keychain/wiki/Intent-API @@ -80,7 +82,7 @@ * Fixing crashes introduced in v2.8 * Experimental ECC support - * Experimental YubiKey support (signing-only with imported keys) + * Experimental YubiKey support: Only signing with imported keys ## 2.8 -- cgit v1.2.3 From 3ee2c6fc6a2a5e18e333bb82f16d0efe365df2b8 Mon Sep 17 00:00:00 2001 From: vectorijk Date: Fri, 24 Apr 2015 00:00:58 -0700 Subject: Introduce and Switch to mikepenz/MaterialDrawer --- OpenKeychain/src/main/res/layout/main_activity.xml | 17 +++++++++++++++++ OpenKeychain/src/main/res/layout/main_drawer_header.xml | 9 +++++++++ 2 files changed, 26 insertions(+) create mode 100644 OpenKeychain/src/main/res/layout/main_activity.xml create mode 100644 OpenKeychain/src/main/res/layout/main_drawer_header.xml (limited to 'OpenKeychain/src/main/res') diff --git a/OpenKeychain/src/main/res/layout/main_activity.xml b/OpenKeychain/src/main/res/layout/main_activity.xml new file mode 100644 index 000000000..a85c8047e --- /dev/null +++ b/OpenKeychain/src/main/res/layout/main_activity.xml @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/main_drawer_header.xml b/OpenKeychain/src/main/res/layout/main_drawer_header.xml new file mode 100644 index 000000000..bac52efb3 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/main_drawer_header.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file -- cgit v1.2.3 From b323fc29c29ec2a7cba87ed19c7809b843a1fd60 Mon Sep 17 00:00:00 2001 From: vectorijk Date: Fri, 24 Apr 2015 03:21:54 -0700 Subject: Fix #1197 Switch to MaterialDrawer library --- OpenKeychain/src/main/res/layout/main_activity.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'OpenKeychain/src/main/res') diff --git a/OpenKeychain/src/main/res/layout/main_activity.xml b/OpenKeychain/src/main/res/layout/main_activity.xml index a85c8047e..4a07053ea 100644 --- a/OpenKeychain/src/main/res/layout/main_activity.xml +++ b/OpenKeychain/src/main/res/layout/main_activity.xml @@ -7,11 +7,13 @@ android:id="@+id/activity_main_toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" + android:elevation="4dp" android:background="?attr/colorPrimary"/> - + \ No newline at end of file -- cgit v1.2.3 From 96853a15ee535860fd789bc5be4979f2205e959c Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Fri, 24 Apr 2015 19:00:33 +0200 Subject: revamp decrypt ui --- .../src/main/res/layout/decrypt_result_include.xml | 44 +++++++++---------- .../src/main/res/layout/decrypt_text_fragment.xml | 49 ---------------------- OpenKeychain/src/main/res/menu/decrypt_menu.xml | 17 ++++++++ OpenKeychain/src/main/res/values/strings.xml | 15 +++---- 4 files changed, 44 insertions(+), 81 deletions(-) create mode 100644 OpenKeychain/src/main/res/menu/decrypt_menu.xml (limited to 'OpenKeychain/src/main/res') diff --git a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml index debc1106f..f64d72987 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml @@ -1,10 +1,12 @@ + android:background="@color/holo_gray_bright" + tools:showIn="@layout/decrypt_text_fragment"> + android:paddingBottom="4dp" + android:animateLayoutChanges="true"> + android:layout_marginBottom="8dp" + tools:text="Encryption status text" + /> + android:layout_marginBottom="8dp" + tools:text="Signature status text" + /> - - @@ -83,6 +81,7 @@ android:layout_height="match_parent" android:layout_weight="1" android:paddingRight="4dp" + android:paddingLeft="4dp" android:gravity="center_vertical" android:orientation="vertical"> @@ -91,15 +90,16 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="Alice (set in-code)" /> + tools:text="Alice" /> + android:gravity="center_vertical" + tools:text="alice@example.com" + /> @@ -114,6 +114,7 @@ + /> - - - - - - - - - - - - - - + + + + + + + \ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index df88336a1..4d92dac20 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -78,7 +78,8 @@ "View certification key" "Create key" "Add file(s)" - "Share decrypted text" + "Share decrypted text" + "Copy decrypted text" "Decrypt text from clipboard" "and verify signatures" "Decrypt files" @@ -285,16 +286,16 @@ "Not Signed" "Invalid signature!" - "Signed by (not certified!)" - "Signed by" - "Key is expired!" - "Key has been revoked!" - "Unknown public key" + "Signed by unconfirmed key" + "Signed by confirmed key" + "Signed by expired key!" + "Signed by revoked key!" + "Signed by unknown public key" "Encrypted" "Not Encrypted" "Show" "Lookup" - "Either the signature is invalid or the key has been revoked/is expired. You cannot be sure who wrote the text. Do you still want to display it?" + "Either the signature is invalid or the key has been revoked. You cannot be sure who wrote the text. Do you still want to display it?" "I understand the risks, display it!" -- cgit v1.2.3 From 9c174ff71dd5cf0bfdb1ae22d41abeda25eef913 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Fri, 24 Apr 2015 19:16:15 +0200 Subject: fix encrypt activity layout --- OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'OpenKeychain/src/main/res') diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml index 51891155c..aa295050a 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml @@ -11,6 +11,8 @@ android:id="@+id/recipient_list" android:layout_width="match_parent" android:minHeight="56dip" + android:paddingLeft="8dp" + android:paddingRight="8dp" android:layout_height="wrap_content" /> Date: Sat, 25 Apr 2015 14:06:53 +0200 Subject: Remove old navigation drawer dependency --- OpenKeychain/src/main/res/values/colors.xml | 1 + OpenKeychain/src/main/res/values/themes.xml | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'OpenKeychain/src/main/res') diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml index 8c5358fd0..ead006a63 100644 --- a/OpenKeychain/src/main/res/values/colors.xml +++ b/OpenKeychain/src/main/res/values/colors.xml @@ -22,6 +22,7 @@ #727272 #FFFFFF #B6B6B6 + #00FFFFFF #212121 diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml index c87895c01..a1644707e 100644 --- a/OpenKeychain/src/main/res/values/themes.xml +++ b/OpenKeychain/src/main/res/values/themes.xml @@ -15,19 +15,10 @@ true @style/MySearchViewStyle - - @integer/DRAWERTYPE_IMAGE @style/ThemeOverlay.AppCompat.Dark @style/ThemeOverlay.AppCompat.Light - #fafafa - false - @style/MaterialSectionTheme.Light - @style/MaterialSubheaderTheme.Light - false - false - false -- cgit v1.2.3 From f8af6e3387b46bf0be3dbef799de483e090ad850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sat, 25 Apr 2015 14:09:55 +0200 Subject: Update lib section in about --- OpenKeychain/src/main/res/raw/help_about.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'OpenKeychain/src/main/res') diff --git a/OpenKeychain/src/main/res/raw/help_about.md b/OpenKeychain/src/main/res/raw/help_about.md index 4b51c1695..41e8d9542 100644 --- a/OpenKeychain/src/main/res/raw/help_about.md +++ b/OpenKeychain/src/main/res/raw/help_about.md @@ -39,8 +39,8 @@ License: GPLv3+ * [ZXing](https://github.com/zxing/zxing) (Apache License v2) * [ZXing Android Minimal](https://github.com/journeyapps/zxing-android-embedded) (Apache License v2) * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design) (Apache License v2) - * [MaterialNavigationDrawer](https://github.com/neokree/MaterialNavigationDrawer) (Apache License v2) + * [MaterialDrawer](https://github.com/mikepenz/MaterialDrawer) (Apache License v2) * [Snackbar](https://github.com/nispok/snackbar) (MIT License) * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Apache License v2) - * [HtmlTextView](https://github.com/dschuermann/html-textview) (Apache License v2) + * [HtmlTextView](https://github.com/sufficientlysecure/html-textview) (Apache License v2) * [Markdown4J](https://github.com/jdcasey/markdown4j) (Apache License v2) -- cgit v1.2.3 From 5d6eb2930cc785b7f1c88fa687cd5bc844c065d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sat, 25 Apr 2015 15:10:15 +0200 Subject: Update in-app contributor list --- OpenKeychain/src/main/res/raw/help_about.md | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'OpenKeychain/src/main/res') diff --git a/OpenKeychain/src/main/res/raw/help_about.md b/OpenKeychain/src/main/res/raw/help_about.md index 41e8d9542..65a04e56e 100644 --- a/OpenKeychain/src/main/res/raw/help_about.md +++ b/OpenKeychain/src/main/res/raw/help_about.md @@ -6,8 +6,12 @@ License: GPLv3+ -## Developers +## Main Developers * Dominik Schürmann (Maintainer) + * Vincent Breitmoser + +## Contributors + * Adithya Abraham Philip * Art O Cathain * Ash Hughes * Brian C. Barnes @@ -15,18 +19,33 @@ License: GPLv3+ * Daniel Albert * Daniel Hammann * Daniel Haß + * Daniel Nelz + * Daniel Ramos * Greg Witczak + * 'iseki' + * Ishan Khanna + * 'jellysheep' + * 'Jesperbk' + * 'jkolo' + * Joey Castillo + * Kai Jiang + * Kartik Arora + * 'Kent' + * 'ligi' + * Lukas Zorich + * Manoj Khanna * 'mar-v-in' * Markus Doits * Miroojin Bakshi + * Morgan Gangwere * Nikhil Peter Raj * Paul Sarbinowski * 'Senecaso' * Signe Rüsch * Sreeram Boyapati - * Thialfihar (APG 1.x) + * 'steelman' + * 'Thialfihar' (APG developer) * Tim Bray - * Vincent Breitmoser ## Libraries * [SpongyCastle](http://rtyley.github.com/spongycastle/) (MIT X11 License) -- cgit v1.2.3 From f1f0126048a66b3e649f35f2e2768bd43fe1fad1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sat, 25 Apr 2015 23:40:26 +0200 Subject: Switch to new support lib version 22.1 --- OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml | 2 +- OpenKeychain/src/main/res/values/themes.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'OpenKeychain/src/main/res') diff --git a/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml index 5f323716c..ffc5266b5 100644 --- a/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml +++ b/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml @@ -33,7 +33,7 @@ android:ems="10" android:layout_gravity="center_horizontal" /> - @color/primary_dark @color/accent - true + true false -- cgit v1.2.3 From c442d3bd0d3bac96614d3d5c0e833a42cab4706e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sun, 26 Apr 2015 00:33:26 +0200 Subject: Put decrypt result in toolbar, some ui fixes for decrypt --- .../drawable-hdpi/ic_content_copy_black_24dp.png | Bin 0 -> 284 bytes .../main/res/drawable-hdpi/ic_share_black_24dp.png | Bin 0 -> 499 bytes .../drawable-mdpi/ic_content_copy_black_24dp.png | Bin 0 -> 214 bytes .../main/res/drawable-mdpi/ic_share_black_24dp.png | Bin 0 -> 355 bytes .../drawable-xhdpi/ic_content_copy_black_24dp.png | Bin 0 -> 304 bytes .../res/drawable-xhdpi/ic_share_black_24dp.png | Bin 0 -> 614 bytes .../drawable-xxhdpi/ic_content_copy_black_24dp.png | Bin 0 -> 397 bytes .../res/drawable-xxhdpi/ic_share_black_24dp.png | Bin 0 -> 804 bytes .../ic_content_copy_black_24dp.png | Bin 0 -> 480 bytes .../res/drawable-xxxhdpi/ic_share_black_24dp.png | Bin 0 -> 1052 bytes .../src/main/res/layout/decrypt_text_activity.xml | 2 +- .../src/main/res/layout/decrypt_text_fragment.xml | 2 +- .../src/main/res/layout/toolbar_result_decrypt.xml | 145 +++++++++++++++++++++ OpenKeychain/src/main/res/menu/decrypt_menu.xml | 4 +- 14 files changed, 149 insertions(+), 4 deletions(-) create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_share_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_share_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_share_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png create mode 100644 OpenKeychain/src/main/res/layout/toolbar_result_decrypt.xml (limited to 'OpenKeychain/src/main/res') diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png new file mode 100644 index 000000000..dc8c85cce Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_share_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_share_black_24dp.png new file mode 100644 index 000000000..2839b1352 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_share_black_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png new file mode 100644 index 000000000..4ad9e552d Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_share_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_share_black_24dp.png new file mode 100644 index 000000000..f0ff945b8 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_share_black_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png new file mode 100644 index 000000000..c6f0e6b85 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_share_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_share_black_24dp.png new file mode 100644 index 000000000..4b3675766 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_share_black_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png new file mode 100644 index 000000000..081fbec5b Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png new file mode 100644 index 000000000..09d4df6af Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png new file mode 100644 index 000000000..04c07fb56 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png new file mode 100644 index 000000000..0fe15fc05 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png differ diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml index a6099e25e..41d7c5c95 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml @@ -5,7 +5,7 @@ + layout="@layout/toolbar_result_decrypt" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OpenKeychain/src/main/res/menu/decrypt_menu.xml b/OpenKeychain/src/main/res/menu/decrypt_menu.xml index c0d7a519f..9e90fc9c7 100644 --- a/OpenKeychain/src/main/res/menu/decrypt_menu.xml +++ b/OpenKeychain/src/main/res/menu/decrypt_menu.xml @@ -5,13 +5,13 @@ \ No newline at end of file -- cgit v1.2.3