From d097131a3dcdf806608f43e49e0be96cf34f5c64 Mon Sep 17 00:00:00 2001
From: Daniel Ramos <hiperzone@gmail.com>
Date: Tue, 14 Apr 2015 03:40:59 +0100
Subject: -Improved email sanity verifications when adding emails when creating
 a new Key -fixed a few NFC crashes -fixed a few instances when showing the
 keyboard would crash the Activity -fixed a case where adding new emails would
 crash the app if the user went back and forth between the Add Email fragment
 and the Add Name fragment.

---
 OpenKeychain/src/main/res/layout/add_email_dialog.xml          | 1 +
 OpenKeychain/src/main/res/layout/create_key_email_fragment.xml | 1 +
 OpenKeychain/src/main/res/values/strings.xml                   | 1 +
 3 files changed, 3 insertions(+)

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

diff --git a/OpenKeychain/src/main/res/layout/add_email_dialog.xml b/OpenKeychain/src/main/res/layout/add_email_dialog.xml
index 68d895145..2de657a40 100644
--- a/OpenKeychain/src/main/res/layout/add_email_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/add_email_dialog.xml
@@ -21,6 +21,7 @@
         android:layout_marginTop="16dp"
         android:hint="@string/label_email"
         android:imeOptions="actionNext"
+        android:inputType="textEmailAddress"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
 </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml
index 17cfe54ac..7b9cffec4 100644
--- a/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml
@@ -32,6 +32,7 @@
                 android:layout_marginTop="16dp"
                 android:layout_marginBottom="8dp"
                 android:imeOptions="actionNext"
+                android:inputType="textEmailAddress"
                 android:hint="@string/label_email"
                 android:ems="10" />
 
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index c1e3b51f9..c1ff5a1d1 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -631,6 +631,7 @@
     <string name="create_key_add_email">"Add email address"</string>
     <string name="create_key_add_email_text">"Additional email addresses are also associated to this key and can be used for secure communication."</string>
     <string name="create_key_email_already_exists_text">"Email address has already been added"</string>
+    <string name="create_key_email_invalid_email">"Email address format is invalid"</string>
 
     <!-- View key -->
     <string name="view_key_revoked">"Revoked: Key must not be used anymore!"</string>
-- 
cgit v1.2.3


From e159e619d299c0e91f3f9527186e50649657dd73 Mon Sep 17 00:00:00 2001
From: Daniel Ramos <hiperzone@gmail.com>
Date: Thu, 30 Apr 2015 00:44:01 +0100
Subject: -removed unneeded inputType attribute from xml files (+1 squashed
 commits)

Squashed commits:

[ef54e68] -code style fixing
---
 OpenKeychain/src/main/res/layout/add_email_dialog.xml          | 1 -
 OpenKeychain/src/main/res/layout/create_key_email_fragment.xml | 1 -
 2 files changed, 2 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/add_email_dialog.xml b/OpenKeychain/src/main/res/layout/add_email_dialog.xml
index 2de657a40..68d895145 100644
--- a/OpenKeychain/src/main/res/layout/add_email_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/add_email_dialog.xml
@@ -21,7 +21,6 @@
         android:layout_marginTop="16dp"
         android:hint="@string/label_email"
         android:imeOptions="actionNext"
-        android:inputType="textEmailAddress"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
 </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml
index 7b9cffec4..17cfe54ac 100644
--- a/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml
@@ -32,7 +32,6 @@
                 android:layout_marginTop="16dp"
                 android:layout_marginBottom="8dp"
                 android:imeOptions="actionNext"
-                android:inputType="textEmailAddress"
                 android:hint="@string/label_email"
                 android:ems="10" />
 
-- 
cgit v1.2.3