commit eee630749e7d57d409ac2e28a8381681b88bdee2
author Mindy Pereira <mindyp@google.com> Fri Apr 06 08:32:02 2012 -0700
committer Mindy Pereira <mindyp@google.com> Fri Apr 06 08:42:12 2012 -0700
tree 9d6f7345d47d34bb0b646156c86381ecbd895806
parent f913894d3f1fa80b7174477999074b813e1deb12

Create setting for reply from default.

For custom from.

Change-Id: I1d25112dbad0a2b68f6d5c8e5e4127a277b19882

src/com/android/mail/providers/Settings.java

diff --git a/src/com/android/mail/providers/Settings.java b/src/com/android/mail/providers/Settings.java
index 2b581c8..c7f42c6 100644
--- a/src/com/android/mail/providers/Settings.java
+++ b/src/com/android/mail/providers/Settings.java
@@ -36,6 +36,7 @@
     public boolean confirmArchive;
     public boolean confirmSend;
     public Uri defaultInbox;
+    public boolean forceReplyFromDefault;
 
     public Settings(Parcel inParcel) {
         signature = inParcel.readString();
@@ -49,6 +50,7 @@
         confirmSend = inParcel.readInt() != 0;
         final String inbox = inParcel.readString();
         defaultInbox = !TextUtils.isEmpty(inbox) ? Uri.parse(inbox) : null;
+        forceReplyFromDefault = inParcel.readInt() != 0;
     }
 
     public Settings(Cursor cursor) {
@@ -63,6 +65,8 @@
         confirmSend = cursor.getInt(UIProvider.SETTINGS_CONFIRM_SEND_COLUMN) != 0;
         final String inbox = cursor.getString(UIProvider.SETTINGS_DEFAULT_INBOX_COLUMN);
         defaultInbox = !TextUtils.isEmpty(inbox) ? Uri.parse(inbox) : null;
+        forceReplyFromDefault = cursor.getInt(
+                UIProvider.SETTINGS_FORCE_REPLY_FROM_DEFAULT_COLUMN) != 0;
     }
 
     @Override
@@ -82,6 +86,7 @@
         dest.writeInt(confirmArchive? 1 : 0);
         dest.writeInt(confirmSend? 1 : 0);
         dest.writeString(defaultInbox.toString());
+        dest.writeInt(forceReplyFromDefault ? 1 : 0);
     }
 
     @SuppressWarnings("hiding")

src/com/android/mail/providers/UIProvider.java

diff --git a/src/com/android/mail/providers/UIProvider.java b/src/com/android/mail/providers/UIProvider.java
index 97c27bc..d9131bd 100644
--- a/src/com/android/mail/providers/UIProvider.java
+++ b/src/com/android/mail/providers/UIProvider.java
@@ -1226,7 +1226,8 @@
             SettingsColumns.CONFIRM_DELETE,
             SettingsColumns.CONFIRM_ARCHIVE,
             SettingsColumns.CONFIRM_SEND,
-            SettingsColumns.DEFAULT_INBOX
+            SettingsColumns.DEFAULT_INBOX,
+            SettingsColumns.FORCE_REPLY_FROM_DEFAULT
     };
 
     public static final int SETTINGS_SIGNATURE_COLUMN = 0;
@@ -1239,6 +1240,7 @@
     public static final int SETTINGS_CONFIRM_ARCHIVE_COLUMN = 7;
     public static final int SETTINGS_CONFIRM_SEND_COLUMN = 8;
     public static final int SETTINGS_DEFAULT_INBOX_COLUMN = 9;
+    public static final int SETTINGS_FORCE_REPLY_FROM_DEFAULT_COLUMN = 10;
 
     public static final class AutoAdvance {
         public static final int UNSET = 0;
@@ -1327,6 +1329,11 @@
          * String folder containing the serialized default inbox folder for an account.
          */
         public static final String DEFAULT_INBOX = "default_inbox";
+        /**
+         * Integer column containing a non zero value if replies should always be sent from
+         * a default address instead of a recipient.
+         */
+        public static String FORCE_REPLY_FROM_DEFAULT = "force_reply_from_default";
     }
 
     /**