From b5049ebb518946a591920154f4350874881d4901 Mon Sep 17 00:00:00 2001
From: Martin Hibdon <mhibdon@google.com>
Date: Tue, 7 Jan 2014 16:38:26 -0800
Subject: [PATCH 1/9] Fix a crash bringing up settings

Change-Id: If29fc7a4113ed7245cd82e6b26c63f08f4b9db2d
---
 src/com/android/email/activity/setup/AccountSettings.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/email/activity/setup/AccountSettings.java b/src/com/android/email/activity/setup/AccountSettings.java
index 00e4386e2..0a6e28339 100644
--- a/src/com/android/email/activity/setup/AccountSettings.java
+++ b/src/com/android/email/activity/setup/AccountSettings.java
@@ -344,6 +344,7 @@ public class AccountSettings extends PreferenceActivity implements FeedbackEnabl
         // We need to make sure that a fragment about to be attached is valid. This corrects
         // a security vulnerability.
         return (TextUtils.equals(AccountSettingsFragment.class.getName(), fragmentName) ||
+                TextUtils.equals(GeneralPreferences.class.getName(), fragmentName) ||
                 super.isValidFragment(fragmentName));
     }
 

From dd2a3a31725fff14cd67c6994dbdcff3ff27562b Mon Sep 17 00:00:00 2001
From: Martin Hibdon <mhibdon@google.com>
Date: Thu, 20 Feb 2014 14:32:22 -0800
Subject: [PATCH 2/9] Fix temporary setup flow on tablets

b/13105763

Change-Id: I63f6956afbbaceadfc1a77701c6f256705601c09
---
 .../account_setup_basics.xml                  | 22 ++++++++-----------
 .../account_setup_basics.xml                  | 18 ++++++---------
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/res/layout-sw600dp-land/account_setup_basics.xml b/res/layout-sw600dp-land/account_setup_basics.xml
index 76c2e1503..085bd968b 100644
--- a/res/layout-sw600dp-land/account_setup_basics.xml
+++ b/res/layout-sw600dp-land/account_setup_basics.xml
@@ -46,29 +46,25 @@
             android:background="@color/account_setup_divider_color" />
 
         <!-- Buttons on the right -->
-        <Button
+        <TextView
             android:id="@+id/manual_setup"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
             android:layout_below="@+id/top_divider"
             android:layout_alignParentRight="true"
             android:layout_marginTop="@dimen/setup_buttons_padding_top"
             android:layout_marginRight="@dimen/setup_buttons_padding_right"
-            style="@style/accountSetupButton"
+            android:textAppearance="?android:attr/textAppearanceMedium"
             android:text="@string/account_setup_basics_manual_setup_action" />
-        <Button
-            android:id="@+id/oauth_setup"
+        <ImageButton
+            android:id="@+id/next"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
             android:layout_below="@+id/manual_setup"
             android:layout_alignParentRight="true"
             android:layout_marginTop="@dimen/setup_buttons_vertical_spacing"
             android:layout_marginRight="@dimen/setup_buttons_padding_right"
-            style="@style/accountSetupButton"
-            android:text="@string/account_setup_basics_oauth_setup_action" />
-        <Button
-            android:id="@+id/next"
-            android:layout_below="@+id/oauth_setup"
-            android:layout_alignParentRight="true"
-            android:layout_marginTop="@dimen/setup_buttons_vertical_spacing"
-            android:layout_marginRight="@dimen/setup_buttons_padding_right"
-            style="@style/accountSetupButton"
+            android:src="@drawable/ic_nav_arrow_forward"
             android:text="@string/next_action" />
 
         <!-- Frame on the left containing the (common) setup info -->
diff --git a/res/layout-sw600dp-port/account_setup_basics.xml b/res/layout-sw600dp-port/account_setup_basics.xml
index 8d973e650..ab17ea672 100644
--- a/res/layout-sw600dp-port/account_setup_basics.xml
+++ b/res/layout-sw600dp-port/account_setup_basics.xml
@@ -78,26 +78,22 @@
             android:layout_marginBottom="@dimen/setup_buttons_padding_bottom"
             >
             <!-- Buttons below -->
-            <Button
+            <TextView
                 android:id="@+id/manual_setup"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
                 android:layout_alignParentLeft="true"
                 android:layout_marginLeft="@dimen/setup_buttons_padding_left"
-                style="@style/accountSetupButton"
                 android:text="@string/account_setup_basics_manual_setup_action" />
-            <Button
-                android:id="@+id/oauth_setup"
-                android:layout_below="@+id/manual_setup"
-                android:layout_alignParentLeft="true"
-                android:layout_marginLeft="@dimen/setup_buttons_padding_left"
-                style="@style/accountSetupButton"
-                android:text="@string/account_setup_basics_oauth_setup_action" />
-            <Button
+            <ImageButton
                 android:id="@+id/next"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="@dimen/setup_buttons_padding_right"
-                style="@style/accountSetupButton"
+                android:src="@drawable/ic_nav_arrow_forward"
                 android:text="@string/next_action" />
         </RelativeLayout>
     </LinearLayout>

From b4175c0b2adb58a8e5778d4d49fc26c8454c91ee Mon Sep 17 00:00:00 2001
From: Martin Hibdon <mhibdon@google.com>
Date: Mon, 24 Mar 2014 12:52:41 -0700
Subject: [PATCH 3/9] Update version

Change-Id: I0b23c282e7816029ccc95ea0d4fa58ba4fa1cb8b

Conflicts:
	AndroidManifest.xml
---
 AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ab21b96ae..1d513d56b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -23,7 +23,7 @@
           on the same date. This should start at zero. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.email"
-    android:versionCode="6303240" >
+    android:versionCode="6203240" >
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

From 8fb01a6031d3470c282ed84c3168986eb1bf7a69 Mon Sep 17 00:00:00 2001
From: Martin Hibdon <mhibdon@google.com>
Date: Mon, 24 Mar 2014 15:29:35 -0700
Subject: [PATCH 4/9] Update Email major version number to 6.3 so that it
 matches EmailGoogle

Change-Id: If49106af7769933515d4baa432a024dd3631aa4a
---
 AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1d513d56b..ab21b96ae 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -23,7 +23,7 @@
           on the same date. This should start at zero. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.email"
-    android:versionCode="6203240" >
+    android:versionCode="6303240" >
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

From 0f61caac97f633a68b7d77399d1daa56fbcf28f0 Mon Sep 17 00:00:00 2001
From: Tony Mantler <nicoya@google.com>
Date: Tue, 25 Mar 2014 15:51:06 -0700
Subject: [PATCH 5/9] Actually install the correct views when credentials
 fragment is in standalone mode

b/13638835

Change-Id: I7800cf0638097ae70c0b22384e2effc09c6ab2e3
---
 res/layout/account_credentials_fragment.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/layout/account_credentials_fragment.xml b/res/layout/account_credentials_fragment.xml
index 4d80e7a6f..e7861d9e3 100644
--- a/res/layout/account_credentials_fragment.xml
+++ b/res/layout/account_credentials_fragment.xml
@@ -23,8 +23,8 @@
         android:paddingLeft="@dimen/setup_fragment_padding_side"
         android:paddingRight="@dimen/setup_fragment_padding_side" >
 
-    <FrameLayout
-            android:id="@+id/account_credentials_fragment_container"
+    <include
+            layout="@layout/account_setup_credentials_fragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 

From c71ef9e2c78c777dc49ea79a498b6b8ee1df4870 Mon Sep 17 00:00:00 2001
From: Martin Hibdon <mhibdon@google.com>
Date: Wed, 26 Mar 2014 10:38:51 -0700
Subject: [PATCH 6/9] Fix a NPE trying to download an attachment

b/13642247

Change-Id: I4cfb7e4a3be12fdc8b8c345c1aeabd85a729d16a
---
 src/com/android/email/service/EmailServiceStub.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/email/service/EmailServiceStub.java b/src/com/android/email/service/EmailServiceStub.java
index cb13a0f29..cd9dbdf6e 100644
--- a/src/com/android/email/service/EmailServiceStub.java
+++ b/src/com/android/email/service/EmailServiceStub.java
@@ -155,8 +155,10 @@ public abstract class EmailServiceStub extends IEmailService.Stub implements IEm
             // 2. Open the remote folder.
             final Account account = Account.restoreAccountWithId(mContext, message.mAccountKey);
             Mailbox mailbox = Mailbox.restoreMailboxWithId(mContext, message.mMailboxKey);
-
-            if (mailbox.mType == Mailbox.TYPE_OUTBOX) {
+            if (mailbox == null) {
+                // This could be null if the account is deleted at just the wrong time.
+                return;
+            } else if (mailbox.mType == Mailbox.TYPE_OUTBOX) {
                 long sourceId = Utility.getFirstRowLong(mContext, Body.CONTENT_URI,
                         new String[] {BodyColumns.SOURCE_MESSAGE_KEY},
                         BodyColumns.MESSAGE_KEY + "=?",

From 7ebbb973f8d641250bbf374a18b5ecef5891a0cc Mon Sep 17 00:00:00 2001
From: Martin Hibdon <mhibdon@google.com>
Date: Wed, 26 Mar 2014 11:35:42 -0700
Subject: [PATCH 7/9] Increase touch target for adding authentication

b/13642313

Change-Id: I9681cd6ad21e4da76cac3202dc61bdc49b978c71
---
 res/layout-w600dp/authentication_view.xml | 14 ++++----------
 res/layout/authentication_view.xml        | 14 ++++----------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/res/layout-w600dp/authentication_view.xml b/res/layout-w600dp/authentication_view.xml
index 03be41078..d505b5cd9 100644
--- a/res/layout-w600dp/authentication_view.xml
+++ b/res/layout-w600dp/authentication_view.xml
@@ -23,21 +23,15 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
-        <ImageView
-            android:id="@+id/add_authentication"
-            android:contentDescription="@string/add_authentication_label"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:clickable="true"
-            android:src="@drawable/ic_setup_add_authentication"/>
-
         <TextView
-            android:id="@+id/add_authentication_label"
+            android:id="@+id/add_authentication"
             android:text="@string/add_authentication_label"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:layout_weight="1"
-            android:paddingRight="16dip"
+            android:padding="16dip"
+            android:drawablePadding="16dip"
+            android:drawableStart="@drawable/ic_setup_add_authentication"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?android:attr/textColorPrimary"/>
     </LinearLayout>
diff --git a/res/layout/authentication_view.xml b/res/layout/authentication_view.xml
index e3be57d36..cd8695065 100644
--- a/res/layout/authentication_view.xml
+++ b/res/layout/authentication_view.xml
@@ -32,21 +32,15 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
-        <ImageView
-            android:id="@+id/add_authentication"
-            android:contentDescription="@string/add_authentication_label"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:clickable="true"
-            android:paddingRight="16dip"
-            android:src="@drawable/ic_setup_add_authentication"/>
-
         <TextView
-            android:id="@+id/add_authentication_label"
+            android:id="@+id/add_authentication"
             android:text="@string/add_authentication_label"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:layout_weight="1"
+            android:padding="16dip"
+            android:drawablePadding="16dip"
+            android:drawableStart="@drawable/ic_setup_add_authentication"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?android:attr/textColorPrimary"/>
     </LinearLayout>

From 60da1e4eedc9c99d29933692d471770f4ad9f1e3 Mon Sep 17 00:00:00 2001
From: Martin Hibdon <mhibdon@google.com>
Date: Thu, 27 Mar 2014 12:59:10 -0700
Subject: [PATCH 8/9] Add logging to help track down a bug causing invalid
 credentials

b/13640564

Change-Id: I1161764e1278375eb786689a11e6899e8363fc8b
---
 .../src/com/android/emailcommon/provider/Credential.java     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/emailcommon/src/com/android/emailcommon/provider/Credential.java b/emailcommon/src/com/android/emailcommon/provider/Credential.java
index 21d25282d..faeada6c2 100644
--- a/emailcommon/src/com/android/emailcommon/provider/Credential.java
+++ b/emailcommon/src/com/android/emailcommon/provider/Credential.java
@@ -6,8 +6,10 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.text.TextUtils;
 
 import com.android.emailcommon.utility.Utility;
+import com.android.mail.utils.LogUtils;
 import com.google.common.base.Objects;
 
 public class Credential extends EmailContent implements Parcelable {
@@ -154,6 +156,9 @@ public class Credential extends EmailContent implements Parcelable {
    @Override
    public ContentValues toContentValues() {
        ContentValues values = new ContentValues();
+       if (TextUtils.isEmpty(mProviderId)) {
+           LogUtils.e(LogUtils.TAG, new Throwable(), "Credential being saved with no provider");
+       }
        values.put(PROVIDER_COLUMN, mProviderId);
        values.put(ACCESS_TOKEN_COLUMN, mAccessToken);
        values.put(REFRESH_TOKEN_COLUMN, mRefreshToken);

From 41ba894b7bd7e310e635698e3e2487f095132bf8 Mon Sep 17 00:00:00 2001
From: Martin Hibdon <mhibdon@google.com>
Date: Thu, 27 Mar 2014 13:06:55 -0700
Subject: [PATCH 9/9] Upgrade my logging from .e to .wtf

b/13640564

Change-Id: I360aa6bab99cc1c414b4f89fcfe3c82eb6e282c3
---
 .../src/com/android/emailcommon/provider/Credential.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emailcommon/src/com/android/emailcommon/provider/Credential.java b/emailcommon/src/com/android/emailcommon/provider/Credential.java
index faeada6c2..b0027c07e 100644
--- a/emailcommon/src/com/android/emailcommon/provider/Credential.java
+++ b/emailcommon/src/com/android/emailcommon/provider/Credential.java
@@ -157,7 +157,7 @@ public class Credential extends EmailContent implements Parcelable {
    public ContentValues toContentValues() {
        ContentValues values = new ContentValues();
        if (TextUtils.isEmpty(mProviderId)) {
-           LogUtils.e(LogUtils.TAG, new Throwable(), "Credential being saved with no provider");
+           LogUtils.wtf(LogUtils.TAG, "Credential being saved with no provider");
        }
        values.put(PROVIDER_COLUMN, mProviderId);
        values.put(ACCESS_TOKEN_COLUMN, mAccessToken);