diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java index 71e5423bb..6c0b23ced 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java @@ -41,6 +41,7 @@ import android.widget.EditText; import android.widget.LinearLayout; import android.widget.ScrollView; import android.widget.TextView; +import android.widget.Toast; import com.actionbarsherlock.app.SherlockFragmentActivity; import com.facebook.Request; @@ -845,6 +846,9 @@ public class ActFmLoginActivity extends SherlockFragmentActivity { Preferences.setString(ActFmPreferenceService.PREF_PICTURE, result.optString("picture")); + if (!result.optBoolean("new")) + Toast.makeText(this, R.string.actfm_ALA_user_exists_sync_alert, Toast.LENGTH_LONG).show(); + ActFmPreferenceService.reloadThisUser(); GCMIntentService.register(this); diff --git a/astrid/res/values/strings-actfm.xml b/astrid/res/values/strings-actfm.xml index 00fcef0ea..7352a3b49 100644 --- a/astrid/res/values/strings-actfm.xml +++ b/astrid/res/values/strings-actfm.xml @@ -282,6 +282,9 @@ Password reset sent to %s + + The first sync may take a bit--thanks for your patience! + User not found by that email. Try signing up instead!