Show which email address a user is logged in as

astrid/plugin-src/com/todoroo/astrid/actfm/ActFmPreferences.java

@@ -16,11 +16,13 @@ import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
+import android.text.TextUtils;
 import android.widget.Toast;
 
 import com.timsu.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.utility.DialogUtilities;
+import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.actfm.sync.ActFmSyncV2Provider;
 import com.todoroo.astrid.billing.BillingActivity;
@@ -133,8 +135,16 @@ public class ActFmPreferences extends SyncProviderPreferences {
         boolean loggedIn = getUtilities().isLoggedIn();
         PreferenceCategory status = (PreferenceCategory) findPreference(r.getString(R.string.sync_SPr_group_status));
 
-        if (loggedIn)
+        if (loggedIn) {
-            status.setTitle(getString(R.string.actfm_status_title_logged_in, actFmPreferenceService.getLoggedInUserName()));
+            String title = actFmPreferenceService.getLoggedInUserName();
+            String email = Preferences.getStringValue(ActFmPreferenceService.PREF_EMAIL);
+            if (!TextUtils.isEmpty(email)) {
+                if (!TextUtils.isEmpty(title))
+                    title += "\n"; //$NON-NLS-1$
+                title += email;
+            }
+            status.setTitle(getString(R.string.actfm_status_title_logged_in, title));
+        }
         else
             status.setTitle(R.string.sync_SPr_group_status);
 

astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java

@@ -163,7 +163,23 @@ public class ActFmPreferenceService extends SyncProviderUtilities {
 
     @Override
     public String getLoggedInUserName() {
-        return Preferences.getStringValue(PREF_NAME);
+        String name = Preferences.getStringValue(PREF_NAME);
+        if (TextUtils.isEmpty(name)) {
+            String firstName = Preferences.getStringValue(PREF_FIRST_NAME);
+            if (!TextUtils.isEmpty(firstName))
+                name = firstName;
+
+            String lastName = Preferences.getStringValue(PREF_FIRST_NAME);
+            if (!TextUtils.isEmpty(lastName)) {
+                if (!TextUtils.isEmpty(name))
+                    name += " "; //$NON-NLS-1$
+                name += lastName;
+            }
+
+            if (name == null)
+                name = ""; //$NON-NLS-1$
+        }
+        return name;
     }
 
     @SuppressWarnings("nls")

astrid/res/values/strings-actfm.xml

@@ -303,7 +303,7 @@
   <!-- ================================================ Synchronization == -->
       
   <!-- Indicates the logged in user name. %s -> user's name -->
-  <string name="actfm_status_title_logged_in">Status - Logged in as %s</string>    
+  <string name="actfm_status_title_logged_in">Logged in as %s</string>    
       
   <!-- Preferences Title: Act.fm -->    
   <string name="actfm_APr_header">Astrid.com</string>