From 5cba6c62d7b4628dfaf482dd883e333f93d323d4 Mon Sep 17 00:00:00 2001
From: Felix Bechstein <f@ub0r.de>
Date: Sat, 22 Jul 2017 12:09:34 +0200
Subject: Parse username from password entry, refs #192 (#318)

This is a first step of letting APS handle usernames from password
entries. It shows the username in PgpHandler and allows to copy it to
the clipboard.
---
 app/src/main/res/drawable-hdpi/ic_content_copy.png | Bin 0 -> 422 bytes
 app/src/main/res/drawable-mdpi/ic_content_copy.png | Bin 0 -> 286 bytes
 .../main/res/drawable-xhdpi/ic_content_copy.png    | Bin 0 -> 561 bytes
 .../main/res/drawable-xxhdpi/ic_content_copy.png   | Bin 0 -> 821 bytes
 .../main/res/drawable-xxxhdpi/ic_content_copy.png  | Bin 0 -> 1327 bytes
 app/src/main/res/layout/activity_pgp_handler.xml   |   2 +-
 app/src/main/res/layout/decrypt_layout.xml         |  61 ++++++++++++++++++---
 app/src/main/res/layout/encrypt_layout.xml         |   2 +-
 app/src/main/res/layout/key_id.xml                 |   2 +-
 app/src/main/res/menu/pgp_handler.xml              |   6 +-
 app/src/main/res/values-cs/strings.xml             |   2 +-
 app/src/main/res/values-de/strings.xml             |   8 ++-
 app/src/main/res/values-fr/strings.xml             |   2 +-
 app/src/main/res/values-ja/strings.xml             |   2 +-
 app/src/main/res/values-ru/strings.xml             |   2 +-
 app/src/main/res/values-zh-rCH/strings.xml         |   2 +-
 app/src/main/res/values-zh-rTW/strings.xml         |   2 +-
 app/src/main/res/values/colors.xml                 |   1 +
 app/src/main/res/values/strings.xml                |   8 ++-
 19 files changed, 80 insertions(+), 22 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_content_copy.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_content_copy.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_content_copy.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_content_copy.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_content_copy.png

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable-hdpi/ic_content_copy.png b/app/src/main/res/drawable-hdpi/ic_content_copy.png
new file mode 100644
index 00000000..92cdb3ef
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_content_copy.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_content_copy.png b/app/src/main/res/drawable-mdpi/ic_content_copy.png
new file mode 100644
index 00000000..ce7782b1
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_content_copy.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_content_copy.png b/app/src/main/res/drawable-xhdpi/ic_content_copy.png
new file mode 100644
index 00000000..7d208997
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_content_copy.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_content_copy.png b/app/src/main/res/drawable-xxhdpi/ic_content_copy.png
new file mode 100644
index 00000000..6d24f434
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_content_copy.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_content_copy.png b/app/src/main/res/drawable-xxxhdpi/ic_content_copy.png
new file mode 100644
index 00000000..0949977c
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_content_copy.png differ
diff --git a/app/src/main/res/layout/activity_pgp_handler.xml b/app/src/main/res/layout/activity_pgp_handler.xml
index 3c79b37d..71dcff3e 100644
--- a/app/src/main/res/layout/activity_pgp_handler.xml
+++ b/app/src/main/res/layout/activity_pgp_handler.xml
@@ -8,7 +8,7 @@
     android:paddingBottom="@dimen/activity_vertical_margin"
     tools:context="com.zeapo.pwdstore.crypto.PgpHandler"
     android:orientation="vertical"
-    android:background="#eee">
+    android:background="@color/background">
 
     <GridLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml
index e04e8ea2..2a94dfee 100644
--- a/app/src/main/res/layout/decrypt_layout.xml
+++ b/app/src/main/res/layout/decrypt_layout.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     tools:context="com.zeapo.pwdstore.crypto.PgpHandler"
     android:orientation="vertical"
-    android:background="#eee">
+    android:background="@color/background">
 
     <LinearLayout
         android:layout_width="fill_parent"
@@ -99,28 +99,73 @@
                     android:layout_columnSpan="3"/>
             </GridLayout>
 
-            <LinearLayout
+
+            <RelativeLayout
                 android:id="@+id/crypto_extra_show_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
                 android:visibility="invisible">
 
+                <ImageButton
+                    android:id="@+id/crypto_copy_username"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentTop="true"
+                    android:contentDescription="@string/copy_username"
+                    android:background="@color/background"
+                    android:src="@drawable/ic_content_copy"/>
+
                 <TextView
+                    android:id="@+id/crypto_username_show_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textStyle="bold"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentTop="true"
+                    android:layout_toLeftOf="@id/crypto_copy_username"
+                    android:layout_toEndOf="@id/crypto_copy_username"
+                    android:text="@string/username"
                     android:textColor="@android:color/black"
-                    android:text="@string/extra_content"/>
+                    android:textStyle="bold" />
+
                 <TextView
-                    android:id="@+id/crypto_extra_show"
+                    android:id="@+id/crypto_username_show"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_below="@id/crypto_username_show_label"
+                    android:layout_toLeftOf="@id/crypto_copy_username"
+                    android:layout_toEndOf="@id/crypto_copy_username"
+                    android:textColor="@android:color/black"
                     android:textIsSelectable="true"
+                    android:typeface="monospace" />
+
+                <TextView
+                    android:id="@+id/crypto_extra_show_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_below="@id/crypto_username_show"
+                    android:text="@string/extra_content"
+                    android:textColor="@android:color/black"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/crypto_extra_show"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_below="@id/crypto_extra_show_label"
                     android:textColor="@android:color/black"
-                    android:typeface="monospace"/>
+                    android:textIsSelectable="true"
+                    android:typeface="monospace" />
 
-            </LinearLayout>
+            </RelativeLayout>
         </LinearLayout>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/encrypt_layout.xml b/app/src/main/res/layout/encrypt_layout.xml
index 98a6b04d..30ccfba4 100644
--- a/app/src/main/res/layout/encrypt_layout.xml
+++ b/app/src/main/res/layout/encrypt_layout.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:context="com.zeapo.pwdstore.crypto.PgpHandler"
-    android:background="#eee"
+    android:background="@color/background"
     android:padding="@dimen/activity_horizontal_margin">
 
     <LinearLayout
diff --git a/app/src/main/res/layout/key_id.xml b/app/src/main/res/layout/key_id.xml
index ffeb7a0d..2c95ce8d 100644
--- a/app/src/main/res/layout/key_id.xml
+++ b/app/src/main/res/layout/key_id.xml
@@ -7,7 +7,7 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
-    android:background="#eee">
+    android:background="@color/background">
 
     <GridLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/menu/pgp_handler.xml b/app/src/main/res/menu/pgp_handler.xml
index 10cb42fd..4e497215 100644
--- a/app/src/main/res/menu/pgp_handler.xml
+++ b/app/src/main/res/menu/pgp_handler.xml
@@ -2,17 +2,17 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:pwstore="http://schemas.android.com/apk/res-auto"
     tools:context="com.zeapo.pwdstore.crypto.PgpHandler" >
-    <item android:title="Share as plaintext"
+    <item android:title="@string/share_as_plaintext"
         android:icon="@drawable/ic_share_white_24dp"
         pwstore:showAsAction="ifRoom"
         android:id="@+id/share_password_as_plaintext"
         />
-    <item android:title="Copy password"
+    <item android:title="@string/copy_password"
         android:icon="@drawable/ic_content_copy_white_24dp"
         pwstore:showAsAction="ifRoom"
         android:id="@+id/copy_password"
         />
-    <item android:title="Edit password"
+    <item android:title="@string/edit_password"
         android:icon="@drawable/ic_edit_white_24dp"
         pwstore:showAsAction="ifRoom"
         android:id="@+id/edit_password"
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 3b53ed1e..0f9ef325 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -31,7 +31,7 @@
     <!-- PGPHandler -->
     <string name="provider_toast_text">Nebyl vybrán poskytovatel OpenPGP!</string>
     <string name="okc_progress_text">Čekání na OpenKeychain…</string>
-    <string name="clipboard_toast_text">Heslo zkopírováno do schránky, máte %d sekund na jeho zkopírování.</string>
+    <string name="clipboard_password_toast_text">Heslo zkopírováno do schránky, máte %d sekund na jeho zkopírování.</string>
     <string name="name_settings_toast_text">Až to bude možné, tak si zadejte jméno účtu v nastavení</string>
     <string name="account_settings_dialog_text">Zadejte si v nastavení svůj OpenKeychain účet (email)</string>
     <string name="account_settings_dialog_title">Jméno účtu je prázdné!</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6b1161d1..cfb2d2d2 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -30,7 +30,8 @@
     <!-- PGPHandler -->
     <string name="provider_toast_text">Kein OpenPGP-Provider ausgewählt!</string>
     <string name="okc_progress_text">Warte auf OpenKeychain…</string>
-    <string name="clipboard_toast_text">Passwort ist in der Zwischen ablage, du hast %d Sekunden, um es einzufügen.</string>
+    <string name="clipboard_password_toast_text">Passwort ist in der Zwischenablage, du hast %d Sekunden, um es einzufügen.</string>
+    <string name="clipboard_username_toast_text">Benutzername ist in der Zwischenablage</string>
     <string name="name_settings_toast_text">Bitte setze deinen Accountnamen in den Einstellungen.</string>
     <string name="account_settings_dialog_text">Bitte setze deinen OpenKeychain Account (E-Mail) in den Einstellungen</string>
     <string name="account_settings_dialog_title">Accountname ist leer!</string>
@@ -88,6 +89,11 @@
     <string name="action_search">Suche</string>
     <string name="password">Passwort:</string>
     <string name="extra_content">Weiterer Inhalt:</string>
+    <string name="username">Benutzername:</string>
+    <string name="edit_password">Passwort bearbeiten</string>
+    <string name="copy_password">Passwort kopieren</string>
+    <string name="copy_username">Benutzername kopieren</string>
+    <string name="share_as_plaintext">Als Klartext teilen</string>
 
     <!-- Preferences -->
     <string name="pref_git_title">Git</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 6fd7ab11..d496f79a 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -31,7 +31,7 @@
     <!-- PGPHandler -->
     <string name="provider_toast_text">Aucun prestataire OpenPGP sélectionné!</string>
     <string name="okc_progress_text">Attente de OpenKeychain…</string>
-    <string name="clipboard_toast_text">Mot de passe copié dans le presse papier, vous avez %d secondes pour coller celui-ci.</string>
+    <string name="clipboard_password_toast_text">Mot de passe copié dans le presse papier, vous avez %d secondes pour coller celui-ci.</string>
     <string name="name_settings_toast_text">Renseignez le nom de votre compte dans les paramètres dès que vous pouvez</string>
     <string name="account_settings_dialog_text">Renseignez votre compte OpenKeychain (email) dans les préférences</string>
     <string name="account_settings_dialog_title">Nom du compte absent!</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 764dc004..5c15f3eb 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -31,7 +31,7 @@
     <!-- PGPHandler -->
     <string name="provider_toast_text">OpenPGP プロバイダが選択されていません!</string>
     <string name="okc_progress_text">OpenKeychain の待機中…</string>
-    <string name="clipboard_toast_text">パスワードをクリップボードにコピーしました %d 秒以内に張り付けしてください。</string>
+    <string name="clipboard_password_toast_text">パスワードをクリップボードにコピーしました %d 秒以内に張り付けしてください。</string>
     <string name="name_settings_toast_text">できるだけ設定に毎回アカウント名を設定してください</string>
     <string name="account_settings_dialog_text">プリファレンスに OpenKeychain アカウント (メールアドレス) を設定してください</string>
     <string name="account_settings_dialog_title">アカウント名が空です!</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 4c8510e6..e2711cc3 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -31,7 +31,7 @@
     <!-- PGPHandler -->
     <string name="provider_toast_text">Не выбран поставщик OpenPGP!</string>
     <string name="okc_progress_text">Ожидание OpenKeychain…</string>
-    <string name="clipboard_toast_text">Пароль скопирован в буфер обмена, у вас есть %d секунд чтобы вставить его.</string>
+    <string name="clipboard_password_toast_text">Пароль скопирован в буфер обмена, у вас есть %d секунд чтобы вставить его.</string>
     <string name="name_settings_toast_text">Пожалуйста, задайте имя пользователя в настройках</string>
     <string name="account_settings_dialog_text">Пожалуйста, задайте почту для OpenKeychain в настройках</string>
     <string name="account_settings_dialog_title">Пустое имя пользователя!</string>
diff --git a/app/src/main/res/values-zh-rCH/strings.xml b/app/src/main/res/values-zh-rCH/strings.xml
index d5cad54f..997914a4 100644
--- a/app/src/main/res/values-zh-rCH/strings.xml
+++ b/app/src/main/res/values-zh-rCH/strings.xml
@@ -15,7 +15,7 @@
     <string name="autofill_description">在app中自动输入密码. 此功能只在 Andorid 4.3 及以上版本中可用. 在 Andorid 5.0 及以上版本中不依赖剪贴板</string>
     <string name="autofill_fill">输入</string>
     <string name="category_string">“类别:\"</string>
-    <string name="clipboard_toast_text">密码已复制到剪贴板, 你有 %d 秒的时间将其粘贴到其他地方.</string>
+    <string name="clipboard_password_toast_text">密码已复制到剪贴板, 你有 %d 秒的时间将其粘贴到其他地方.</string>
     <string name="clone">从服务器Clone</string>
     <string name="clone_fragment_text">欢迎使用 Password Store 你可以选择创建新的版本库或将你已有的 git 版本库克隆到你的设备上</string>
     <string name="clone_settings">Clone</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 1e6db97e..088ab0be 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -15,7 +15,7 @@
     <string name="autofill_description">在app中自動填入密碼. 此功能只能在 Andorid 4.3 及以上版本中使用. 在 Andorid 5.0 及以上版本中不需要剪貼簿</string>
     <string name="autofill_fill">輸入</string>
     <string name="category_string">“分類:\"</string>
-    <string name="clipboard_toast_text">密碼已複製到剪貼簿, 你有 %d 秒的時間將其貼上到其他地方.</string>
+    <string name="clipboard_password_toast_text">密碼已複製到剪貼簿, 你有 %d 秒的時間將其貼上到其他地方.</string>
     <string name="clone">從伺服器 Clone</string>
     <string name="clone_fragment_text">歡迎使用 Password Store 你可以選擇建立新的 Repo 或將你已有的 git repo clone 到你的裝置上</string>
     <string name="clone_settings">Clone</string>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 96ebf1bb..7e1e3814 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="accent">#ff7043</color>
+    <color name="background">#eee</color>
 
     <color name="red_50">#fde0dc</color>
     <color name="red_100">#f9bdbb</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 444bbf08..51b23002 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,7 +32,8 @@
     <!-- PGPHandler -->
     <string name="provider_toast_text">No OpenPGP Provider selected!</string>
     <string name="okc_progress_text">Waiting for OpenKeychain…</string>
-    <string name="clipboard_toast_text">Password copied to clipboard, you have %d seconds to paste it somewhere.</string>
+    <string name="clipboard_password_toast_text">Password copied to clipboard, you have %d seconds to paste it somewhere.</string>
+    <string name="clipboard_username_toast_text">Username copied to clipboard</string>
     <string name="name_settings_toast_text">Please set your account name in settings whenever you can</string>
     <string name="account_settings_dialog_text">Please set your OpenKeychain account (email) in the preferences</string>
     <string name="account_settings_dialog_title">Account name empty!</string>
@@ -97,6 +98,11 @@
     <string name="action_search">Search</string>
     <string name="password">Password:</string>
     <string name="extra_content">Extra content:</string>
+    <string name="username">Username:</string>
+    <string name="edit_password">Edit password</string>
+    <string name="copy_password">Copy password</string>
+    <string name="copy_username">Copy username</string>
+    <string name="share_as_plaintext">Share as plaintext</string>
 
     <!-- Preferences -->
     <string name="pref_git_title">Git</string>
-- 
cgit v1.2.3