some visual update (fragment list is kept at position) and a preparation for decrypt activity

12 files changed, 279 insertions, 16 deletions

diff --git a/app/src/main/res/layout/activity_pgp_handler.xml b/app/src/main/res/layout/activity_pgp_handler.xml
new file mode 100644
index 00000000..5a876766
--- /dev/null
+++ b/app/src/main/res/layout/activity_pgp_handler.xml
@@ -0,0 +1,17 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    tools:context="com.zeapo.pwdstore.PgpHandler">
+
+    <TextView
+        android:id="@+id/hhh"
+        android:text="@string/hello_world"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/openpgp_provider.xml b/app/src/main/res/layout/openpgp_provider.xml
new file mode 100644
index 00000000..f7c46b5f
--- /dev/null
+++ b/app/src/main/res/layout/openpgp_provider.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+android:id="@+id/parent_scroll"
+android:fillViewport="true"
+android:layout_width="match_parent"
+android:layout_height="match_parent">
+
+<LinearLayout
+    android:padding="8dp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Encrypt UserIds (split with &apos;,&apos;)"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+
+    <EditText
+        android:id="@+id/crypto_provider_demo_encrypt_user_id"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="dominik@dominikschuermann.de"
+        android:textAppearance="@android:style/TextAppearance.Small" />
+
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Message"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+
+    <ScrollView
+        android:id="@+id/child_scroll1"
+        android:fillViewport="true"
+        android:layout_width="match_parent"
+        android:layout_height="120dp">
+
+        <EditText
+            android:id="@+id/crypto_provider_demo_message"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scrollHorizontally="true"
+            android:scrollbars="vertical"
+            android:text="message"
+            android:hint="cleartext message"
+            android:textAppearance="@android:style/TextAppearance.Small" />
+    </ScrollView>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Ciphertext"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <ScrollView
+        android:id="@+id/child_scroll2"
+        android:fillViewport="true"
+        android:layout_width="match_parent"
+        android:layout_height="120dp">
+
+        <EditText
+            android:id="@+id/crypto_provider_demo_ciphertext"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="ciphertext"
+            android:hint="ciphertext"
+            android:textAppearance="@android:style/TextAppearance.Small" />
+    </ScrollView>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <Button
+            android:id="@+id/crypto_provider_demo_sign"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Sign"
+            android:layout_gravity="center_vertical" />
+
+        <Button
+            android:id="@+id/crypto_provider_demo_encrypt"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Encrypt"
+            android:layout_gravity="center_vertical" />
+
+        <Button
+            android:id="@+id/crypto_provider_demo_sign_and_encrypt"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Sign and Encrypt"
+            android:layout_gravity="center_vertical" />
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/crypto_provider_demo_decrypt_and_verify"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Decrypt and Verify" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Account ID:"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Alice &lt;alice@example.com&gt;"
+        android:id="@+id/crypto_provider_demo_account" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Get key:"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="0x718c070100012282"
+        android:id="@+id/crypto_provider_demo_get_key_edit" />
+
+    <Button
+        android:id="@+id/crypto_provider_demo_get_key"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Get key" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Get key ids:"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="dominik@dominikschuermann.de"
+        android:id="@+id/crypto_provider_demo_get_key_ids_edit" />
+
+    <Button
+        android:id="@+id/crypto_provider_demo_get_key_ids"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Get key ids" />
+
+</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/menu/agp_intents.xml b/app/src/main/res/menu/agp_intents.xml
new file mode 100644
index 00000000..591b9525
--- /dev/null
+++ b/app/src/main/res/menu/agp_intents.xml
@@ -0,0 +1,8 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.zeapo.pwdstore.AgpIntentsActivity" >
+    <item android:id="@+id/action_settings"
+        android:title="@string/action_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never" />
+</menu>
diff --git a/app/src/main/res/menu/pgp_handler.xml b/app/src/main/res/menu/pgp_handler.xml
new file mode 100644
index 00000000..bf981e24
--- /dev/null
+++ b/app/src/main/res/menu/pgp_handler.xml
@@ -0,0 +1,8 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.zeapo.pwdstore.PgpHandler" >
+    <item android:id="@+id/action_settings"
+        android:title="@string/action_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never" />
+</menu>
diff --git a/app/src/main/res/menu/pwdstore.xml b/app/src/main/res/menu/pwdstore.xml
index 7dc96cff..a9c41638 100644
--- a/app/src/main/res/menu/pwdstore.xml
+++ b/app/src/main/res/menu/pwdstore.xml
@@ -1,4 +1,10 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context=".pwdstore" >
+
+    <item android:id="@+id/user_pref"
+        android:title="Settings"
+        android:orderInCategory="100"
+        android:showAsAction="ifRoom"
+        android:icon="@android:drawable/ic_menu_manage"/>
 </menu>
diff --git a/app/src/main/res/values-large/refs.xml b/app/src/main/res/values-large/refs.xml
new file mode 100644
index 00000000..975e10fa
--- /dev/null
+++ b/app/src/main/res/values-large/refs.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!--
+    Layout alias to replace the single-pane version of the layout with a
+    two-pane version on Large screens.
+
+    For more on layout aliases, see:
+    http://developer.android.com/training/multiscreen/screensizes.html#TaskUseAliasFilters
+    -->
+
+    <item name="fragment_password" type="layout">@layout/fragment_password_grid</item>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw600dp/refs.xml b/app/src/main/res/values-sw600dp/refs.xml
new file mode 100644
index 00000000..975e10fa
--- /dev/null
+++ b/app/src/main/res/values-sw600dp/refs.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!--
+    Layout alias to replace the single-pane version of the layout with a
+    two-pane version on Large screens.
+
+    For more on layout aliases, see:
+    http://developer.android.com/training/multiscreen/screensizes.html#TaskUseAliasFilters
+    -->
+
+    <item name="fragment_password" type="layout">@layout/fragment_password_grid</item>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 1e27627b..b0a3dc7c 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -9,4 +9,30 @@
         <item>https://</item>
         <item>http://</item>
     </string-array>
+
+    <string-array name="updateInterval">
+
+        <item name="1000">Every 1 second</item>
+
+        <item name="5000">Every 5 seconds</item>
+
+        <item name="30000">Every 30 seconds</item>
+
+        <item name="60000">Every 1 minute</item>
+
+        <item name="300000">Every 5 minutes</item>
+    </string-array>
+
+    <string-array name="updateIntervalValues">
+
+        <item name="1000">1000</item>
+
+        <item name="5000">5000</item>
+
+        <item name="30000">30000</item>
+
+        <item name="60000">60000</item>
+
+        <item name="300000">300000</item>
+    </string-array>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/refs.xml b/app/src/main/res/values/refs.xml
new file mode 100644
index 00000000..46592ab7
--- /dev/null
+++ b/app/src/main/res/values/refs.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!--
+    Layout alias to replace the single-pane version of the layout with a
+    two-pane version on Large screens.
+
+    For more on layout aliases, see:
+    http://developer.android.com/training/multiscreen/screensizes.html#TaskUseAliasFilters
+    -->
+
+    <item name="fragment_password" type="layout">@layout/fragment_password_list</item>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3ff38c1c..c7e63c85 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -9,7 +9,7 @@
     <string name="dialog_delete_msg">Target directory already exist. Current version support only a single store. Do you want to delete the current password store directory?</string>
     <string name="dialog_delete">Delete directory</string>
     <string name="dialog_do_not_delete">Cancel</string>
-
+    <string name="title_activity_git_clone">Clone repository</string>
 
     <!-- Clone fragment -->
     <string name="clone_fragment_text">Password store empty</string>
@@ -22,5 +22,6 @@
     <string name="error_apg_version_not_supported">The installed APG version is not supported.</string>
     <string name="insufficient_apg_permissions">Password Store doesn\'t have permission to access APG fully, please reinstall Password Store to fix that.</string>
     <string name="title_activity_agp_intents">AgpIntentsActivity</string>
+    <string name="title_activity_pgp_handler">PgpHandler</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings_activity_git_clone.xml b/app/src/main/res/values/strings_activity_git_clone.xml
deleted file mode 100644
index bde00dba..00000000
--- a/app/src/main/res/values/strings_activity_git_clone.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<resources>
-        <string name="title_activity_git_clone">Clone Repository</string>
-
-    <!-- Strings related to login -->
-    <string name="prompt_email">Email</string>
-    <string name="prompt_password">Password (optional)</string>
-    <string name="action_sign_in">Sign in or register</string>
-    <string name="action_sign_in_short">Sign in</string>
-    <string name="plus_sign_out">Switch Google+ account</string>
-    <string name="plus_disconnect">Disconnect from Google+</string>
-    <string name="error_invalid_email">This email address is invalid</string>
-    <string name="error_invalid_password">This password is too short</string>
-    <string name="error_incorrect_password">This password is incorrect</string>
-    <string name="error_field_required">This field is required</string>
-</resources>
diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml
new file mode 100644
index 00000000..402a1bd3
--- /dev/null
+++ b/app/src/main/res/xml/preference.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceCategory android:title="Crypto">
+        <org.openintents.openpgp.util.OpenPgpListPreference
+            android:key="openpgp_provider_list"
+            android:title="Select OpenPGP Provider!" />
+        <Preference
+            android:key="openpgp_provider_demo"
+            android:title="OpenPGP Provider Demo" />
+    </PreferenceCategory>
+</PreferenceScreen>
\ No newline at end of file