From dde124857359bef68cb02066abfa0176367f264d Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Fri, 6 Apr 2012 17:29:46 -0700
Subject: [PATCH] Use the onOkClick hook in assignment picker to validate email
 before dismissing dialog

---
 .../astrid/actfm/EditPeopleControlSet.java        | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
index 5d081320c..0eb7153ca 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
@@ -961,6 +961,21 @@ public class EditPeopleControlSet extends PopupControlSet {
         }
     }
 
+    @Override
+    protected boolean onOkClick() {
+        if (!TextUtils.isEmpty(assignedCustom.getText())) {
+            JSONObject assigned = PeopleContainer.createUserJson(assignedCustom);
+            String email = assigned.optString("email"); //$NON-NLS-1$
+            if (!TextUtils.isEmpty(email) && email.indexOf('@') == -1) {
+                assignedCustom.requestFocus();
+                DialogUtilities.okDialog(activity, activity.getString(R.string.actfm_EPA_invalid_email,
+                        assigned.optString("email")), null); //$NON-NLS-1$
+                return false;
+            }
+        }
+        return super.onOkClick();
+    }
+
     @Override
     protected void additionalDialogSetup() {
         super.additionalDialogSetup();