From 5d93747b13b76a02efe8dbf8604d6ae1c2ac5b39 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Wed, 8 May 2013 16:37:40 -0700
Subject: [PATCH] clear google_account_key before enabling drive sync in
 startup sequence

---
 .../apps/mytracks/fragments/EnableSyncDialogFragment.java  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/EnableSyncDialogFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/EnableSyncDialogFragment.java
index 90c817970..43fbee5c9 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/EnableSyncDialogFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/EnableSyncDialogFragment.java
@@ -87,6 +87,13 @@ public class EnableSyncDialogFragment extends DialogFragment {
         }).setPositiveButton(R.string.generic_yes, new OnClickListener() {
             @Override
           public void onClick(DialogInterface dialog, int which) {
+            /*
+             * google_account_key can be set from the android backup service. If
+             * the user wants to enable sync, make sure google_account_key is
+             * cleared so the user can choose an account.
+             */
+            PreferencesUtils.setString(fragmentActivity, R.string.google_account_key,
+                PreferencesUtils.GOOGLE_ACCOUNT_DEFAULT);
             caller.onEnableSyncDone(true);
           }
         }).setTitle(R.string.enable_sync_title).create();