Add Exchange fallback and support diverting to Gmail

b/16679701

Change-Id: I59d7cb4a803f0ad8e782614d0c6cc635318d2375
(cherry picked from commit d039322f7402ef402eb66c92b899510dd6649e2d)

1 files changed, 20 insertions, 2 deletions

diff --git a/emailcommon/src/com/android/emailcommon/VendorPolicyLoader.java b/emailcommon/src/com/android/emailcommon/VendorPolicyLoader.java
index d42aa14c3..6d0de97d6 100644
--- a/emailcommon/src/com/android/emailcommon/VendorPolicyLoader.java
+++ b/emailcommon/src/com/android/emailcommon/VendorPolicyLoader.java
@@ -218,6 +218,10 @@ public class VendorPolicyLoader {
         public String incomingUsernameTemplate;
         public String outgoingUriTemplate;
         public String outgoingUsernameTemplate;
+        public String altIncomingUriTemplate;
+        public String altIncomingUsernameTemplate;
+        public String altOutgoingUriTemplate;
+        public String altOutgoingUsernameTemplate;
         public String incomingUri;
         public String incomingUsername;
         public String outgoingUri;
@@ -231,8 +235,8 @@ public class VendorPolicyLoader {
          * @param email user-specified data used to replace template values
          */
         public void expandTemplates(String email) {
-            String[] emailParts = email.split("@");
-            String user = emailParts[0];
+            final String[] emailParts = email.split("@");
+            final String user = emailParts[0];
 
             incomingUri = expandTemplate(incomingUriTemplate, email, user);
             incomingUsername = expandTemplate(incomingUsernameTemplate, email, user);
@@ -241,6 +245,20 @@ public class VendorPolicyLoader {
         }
 
         /**
+         * Like the above, but expands the alternate templates instead
+         * @param email user-specified data used to replace template values
+         */
+        public void expandAlternateTemplates(String email) {
+            final String[] emailParts = email.split("@");
+            final String user = emailParts[0];
+
+            incomingUri = expandTemplate(altIncomingUriTemplate, email, user);
+            incomingUsername = expandTemplate(altIncomingUsernameTemplate, email, user);
+            outgoingUri = expandTemplate(altOutgoingUriTemplate, email, user);
+            outgoingUsername = expandTemplate(altOutgoingUsernameTemplate, email, user);
+        }
+
+        /**
          * Replaces all parameterized values in the given template. The values replaced are
          * $domain, $user and $email.
          */