diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index 97148bc03..837f2cb0a 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -644,11 +644,7 @@
-
-
-
+
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/SyncUpgradePrompt.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/SyncUpgradePrompt.java
deleted file mode 100644
index ebe3549f3..000000000
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/SyncUpgradePrompt.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package com.todoroo.astrid.actfm.sync;
-
-import android.app.Activity;
-import android.app.Dialog;
-import android.content.Intent;
-import android.util.TypedValue;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.timsu.astrid.R;
-import com.todoroo.andlib.utility.DateUtilities;
-import com.todoroo.andlib.utility.Preferences;
-import com.todoroo.astrid.actfm.ActFmLoginActivity;
-import com.todoroo.astrid.core.PluginServices;
-
-public class SyncUpgradePrompt {
-
- private static final String P_SYNC_UPGRADE_PROMPT = "p_sync_upgr_prompt"; //$NON-NLS-1$
- private static long lastPromptDate = -1;
-
- public static void showSyncUpgradePrompt(final Activity activity) {
- if (lastPromptDate == -1) {
- lastPromptDate = Preferences.getLong(P_SYNC_UPGRADE_PROMPT, 0L);
- }
-
- Dialog d = null;
- if (DateUtilities.now() - lastPromptDate > DateUtilities.ONE_WEEK * 3) {
- if (!PluginServices.getActFmPreferenceService().isLoggedIn()) {
- if (PluginServices.getGtasksPreferenceService().isLoggedIn()) {
- // Logged into google but not astrid
- d = getDialog(activity, R.string.sync_upgr_gtasks_only_title, R.string.sync_upgr_gtasks_only_body,
- R.string.sync_upgr_gtasks_only_btn1, new Runnable() {
- @Override
- public void run() {
- activity.startActivity(new Intent(activity, ActFmLoginActivity.class));
- }
- },
- R.string.sync_upgr_gtasks_only_btn2,
- null);
- } else {
- // Logged into neither
- d = getDialog(activity, R.string.sync_upgr_neither_title, R.string.sync_upgr_neither_body,
- R.string.sync_upgr_neither_btn1, new Runnable() {
- @Override
- public void run() {
- activity.startActivity(new Intent(activity, ActFmLoginActivity.class));
- }
- });
- }
- setLastPromptDate(DateUtilities.now());
- } else if (PluginServices.getGtasksPreferenceService().isLoggedIn()) {
- // Logged into both
- d = getDialog(activity, R.string.sync_upgr_both_title, R.string.sync_upgr_both_body,
- R.string.sync_upgr_both_btn1,
- null,
- R.string.sync_upgr_both_btn2, new Runnable() {
- @Override
- public void run() {
- new ActFmSyncV2Provider().signOut(activity);
- Toast.makeText(activity, R.string.sync_upgr_logged_out, Toast.LENGTH_LONG).show();
- }
- });
- setLastPromptDate(Long.MAX_VALUE);
- } else {
- // Logged into just astrid--don't need to show prompts anymore
- setLastPromptDate(Long.MAX_VALUE);
- }
- }
-
- if (d != null) {
- d.show();
- }
- }
-
- private static void setLastPromptDate(long date) {
- lastPromptDate = date;
- Preferences.setLong(P_SYNC_UPGRADE_PROMPT, lastPromptDate);
- }
-
- private static Dialog getDialog(Activity activity, int title, int body, Object... buttonsAndListeners) {
- final Dialog d = new Dialog(activity, R.style.ReminderDialog);
- d.setContentView(R.layout.astrid_reminder_view_portrait);
- ((TextView) d.findViewById(R.id.reminder_title)).setText(title);
- ((TextView) d.findViewById(R.id.reminder_message)).setText(body);
-
- d.findViewById(R.id.dismiss).setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- d.dismiss();
- }
- });
-
- d.findViewById(R.id.reminder_complete).setVisibility(View.GONE);
- TypedValue tv = new TypedValue();
- activity.getTheme().resolveAttribute(R.attr.asThemeTextColor, tv, false);
-
- int button1 = (Integer) buttonsAndListeners[0];
- final Runnable listener1 = (Runnable) buttonsAndListeners[1];
- Button b1 = (Button) d.findViewById(R.id.reminder_edit);
- b1.setText(button1);
- b1.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- d.dismiss();
- if (listener1 != null) {
- listener1.run();
- }
- }
- });
- b1.setBackgroundColor(activity.getResources().getColor(tv.data));
-
- if (buttonsAndListeners.length < 3) {
- d.findViewById(R.id.reminder_snooze).setVisibility(View.GONE);
- } else {
- int button2 = (Integer) buttonsAndListeners[2];
- final Runnable listener2 = (Runnable) buttonsAndListeners[3];
- Button b2 = (Button) d.findViewById(R.id.reminder_snooze);
- b2.setText(button2);
- b2.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- d.dismiss();
- if (listener2 != null) {
- listener2.run();
- }
- }
- });
- b2.setBackgroundColor(activity.getResources().getColor(tv.data));
- }
-
- return d;
- }
-
-}
diff --git a/astrid/res/drawable/welcome_walkthrough_2.png b/astrid/res/drawable/welcome_walkthrough_2.png
deleted file mode 100644
index 673d3e661..000000000
Binary files a/astrid/res/drawable/welcome_walkthrough_2.png and /dev/null differ
diff --git a/astrid/res/drawable/welcome_walkthrough_3.png b/astrid/res/drawable/welcome_walkthrough_3.png
deleted file mode 100644
index 7b1c20667..000000000
Binary files a/astrid/res/drawable/welcome_walkthrough_3.png and /dev/null differ
diff --git a/astrid/res/drawable/welcome_walkthrough_4.png b/astrid/res/drawable/welcome_walkthrough_4.png
deleted file mode 100644
index fad9e4b60..000000000
Binary files a/astrid/res/drawable/welcome_walkthrough_4.png and /dev/null differ
diff --git a/astrid/res/drawable/welcome_walkthrough_5.png b/astrid/res/drawable/welcome_walkthrough_5.png
deleted file mode 100644
index bbc0b736a..000000000
Binary files a/astrid/res/drawable/welcome_walkthrough_5.png and /dev/null differ
diff --git a/astrid/res/drawable/welcome_walkthrough_6.png b/astrid/res/drawable/welcome_walkthrough_6.png
deleted file mode 100644
index c52027997..000000000
Binary files a/astrid/res/drawable/welcome_walkthrough_6.png and /dev/null differ
diff --git a/astrid/res/layout/welcome_walkthrough.xml b/astrid/res/layout/welcome_walkthrough.xml
deleted file mode 100644
index fa829e881..000000000
--- a/astrid/res/layout/welcome_walkthrough.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/astrid/res/layout/welcome_walkthrough_login_page.xml b/astrid/res/layout/welcome_walkthrough_login_page.xml
deleted file mode 100644
index 0c81978bf..000000000
--- a/astrid/res/layout/welcome_walkthrough_login_page.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/astrid/res/layout/welcome_walkthrough_page.xml b/astrid/res/layout/welcome_walkthrough_page.xml
deleted file mode 100644
index ef703b99c..000000000
--- a/astrid/res/layout/welcome_walkthrough_page.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/astrid/res/layout/welcome_walkthrough_simple_login.xml b/astrid/res/layout/welcome_walkthrough_simple_login.xml
deleted file mode 100644
index ecd69cc33..000000000
--- a/astrid/res/layout/welcome_walkthrough_simple_login.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
index c16e8b96e..f7c75e19d 100644
--- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
+++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
@@ -67,7 +67,6 @@ import com.todoroo.astrid.utility.Flags;
import com.todoroo.astrid.voice.VoiceInputAssistant;
import com.todoroo.astrid.voice.VoiceOutputService;
import com.todoroo.astrid.voice.VoiceRecognizer;
-import com.todoroo.astrid.welcome.tutorial.WelcomeWalkthrough;
import com.todoroo.astrid.widget.TasksWidget;
/**
@@ -172,18 +171,6 @@ public class EditPreferences extends TodorooPreferenceActivity {
}
});
- preference = screen.findPreference(getString(R.string.p_tutorial));
- preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
- @Override
- public boolean onPreferenceClick(Preference p) {
- Intent showWelcomeLogin = new Intent(EditPreferences.this, WelcomeWalkthrough.class);
- showWelcomeLogin.putExtra(ActFmLoginActivity.SHOW_TOAST, false);
- showWelcomeLogin.putExtra(WelcomeWalkthrough.TOKEN_MANUAL_SHOW, true);
- startActivity(showWelcomeLogin);
- return true;
- }
- });
-
preference = screen.findPreference(getString(R.string.p_help));
preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 0dc2a2d47..255825028 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -43,7 +43,6 @@ import com.todoroo.andlib.utility.Preferences;
import com.todoroo.astrid.actfm.CommentsFragment;
import com.todoroo.astrid.actfm.TagSettingsActivity;
import com.todoroo.astrid.actfm.TagViewFragment;
-import com.todoroo.astrid.actfm.sync.SyncUpgradePrompt;
import com.todoroo.astrid.adapter.FilterAdapter;
import com.todoroo.astrid.adapter.TaskListFragmentPagerAdapter;
import com.todoroo.astrid.api.AstridApiConstants;
@@ -58,7 +57,6 @@ import com.todoroo.astrid.data.TagData;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.people.PeopleFilterMode;
import com.todoroo.astrid.people.PersonViewFragment;
-import com.todoroo.astrid.service.StatisticsConstants;
import com.todoroo.astrid.service.ThemeService;
import com.todoroo.astrid.service.abtesting.ABTestEventReportingService;
import com.todoroo.astrid.tags.TagFilterExposer;
@@ -73,7 +71,6 @@ import com.todoroo.astrid.ui.TaskListFragmentPager;
import com.todoroo.astrid.utility.AstridPreferences;
import com.todoroo.astrid.utility.Constants;
import com.todoroo.astrid.utility.Flags;
-import com.todoroo.astrid.welcome.tutorial.WelcomeWalkthrough;
public class TaskListActivity extends AstridActivity implements MainMenuListener, OnPageChangeListener {
@@ -541,10 +538,6 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
@Override
protected void onResume() {
super.onResume();
-
- if (Preferences.getBoolean(WelcomeWalkthrough.KEY_SHOWED_WELCOME_LOGIN, false)) {
- SyncUpgradePrompt.showSyncUpgradePrompt(this);
- }
}
@Override
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
index 9ae480249..705ee9529 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
@@ -112,7 +112,6 @@ import com.todoroo.astrid.ui.QuickAddBar;
import com.todoroo.astrid.utility.AstridPreferences;
import com.todoroo.astrid.utility.Flags;
import com.todoroo.astrid.welcome.HelpInfoPopover;
-import com.todoroo.astrid.welcome.tutorial.WelcomeWalkthrough;
import com.todoroo.astrid.widget.TasksWidget;
/**
@@ -691,17 +690,6 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
setUpBackgroundJobs();
- if (!Preferences.getBoolean(
- WelcomeWalkthrough.KEY_SHOWED_WELCOME_LOGIN, false)) {
- Preferences.setBoolean(WelcomeWalkthrough.KEY_SHOWED_WELCOME_LOGIN,
- true);
- Intent showWelcomeLogin = new Intent(getActivity(),
- WelcomeWalkthrough.class);
- showWelcomeLogin.putExtra(ActFmLoginActivity.SHOW_TOAST, false);
- startActivity(showWelcomeLogin);
- return;
- }
-
if (!Preferences.getBoolean(R.string.p_showed_add_task_help, false)) {
showTaskCreateHelpPopover();
} else if (!Preferences.getBoolean(R.string.p_showed_tap_task_help, false)) {
diff --git a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java
deleted file mode 100644
index b5eb183c4..000000000
--- a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/**
- * Copyright (c) 2012 Todoroo Inc
- *
- * See the file "LICENSE" for the full license governing this code.
- */
-package com.todoroo.astrid.welcome.tutorial;
-
-
-import android.accounts.Account;
-import android.content.Context;
-import android.os.Parcelable;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.google.api.client.googleapis.extensions.android2.auth.GoogleAccountManager;
-import com.timsu.astrid.R;
-import com.todoroo.andlib.service.Autowired;
-import com.todoroo.andlib.service.DependencyInjectionService;
-import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
-import com.todoroo.astrid.utility.Constants;
-import com.viewpagerindicator.TitleProvider;
-
-public class WelcomePagerAdapter extends PagerAdapter implements TitleProvider
-{
- private int[] images = new int[] {
- R.drawable.welcome_walkthrough_1,
- R.drawable.welcome_walkthrough_2,
- R.drawable.welcome_walkthrough_3,
- R.drawable.welcome_walkthrough_4,
- R.drawable.welcome_walkthrough_5,
- R.drawable.welcome_walkthrough_6,
- 0
- };
- private int[] title = new int[] {
- R.string.welcome_title_1,
- R.string.welcome_title_2,
- R.string.welcome_title_3,
- R.string.welcome_title_4,
- R.string.welcome_title_5,
- R.string.welcome_title_6,
- R.string.welcome_title_7,
- };
- private int[] body = new int[] {
- R.string.welcome_body_1,
- R.string.welcome_body_2,
- R.string.welcome_body_3,
- R.string.welcome_body_4,
- R.string.welcome_body_5,
- R.string.welcome_body_6,
- R.string.welcome_body_7,
- };
- public int[] layouts = new int[] {
- R.layout.welcome_walkthrough_page,
- R.layout.welcome_walkthrough_page,
- R.layout.welcome_walkthrough_page,
- R.layout.welcome_walkthrough_page,
- R.layout.welcome_walkthrough_page,
- R.layout.welcome_walkthrough_page,
- R.layout.actfm_login_activity,
- };
-
- public int fallbackLoginPage;
-
- private final Context context;
- public Account[] accounts;
- public WelcomeWalkthrough parent;
- @Autowired ActFmPreferenceService actFmPreferenceService;
-
- public WelcomePagerAdapter(Context context, boolean manual) {
- this.context = context;
- DependencyInjectionService.getInstance().inject(this);
-
- accounts = null;
- try {
- GoogleAccountManager am = new GoogleAccountManager(context);
- accounts = am.getAccounts();
- } catch (Exception e) {
- //
- }
-
- if (manual) {
- layouts[layouts.length - 1] = R.layout.welcome_walkthrough_page;
- title[title.length - 1] = R.string.welcome_title_7_return;
- images[images.length - 1] = R.drawable.welcome_walkthrough_1;
- body[body.length - 1] = R.string.welcome_body_7_return;
- fallbackLoginPage = R.layout.actfm_login_activity;
- } else {
- if (Constants.ASTRID_LITE) {
- adjustResourcesForLite();
- }
-
- // Setup login page from AB tests
- fallbackLoginPage = layouts[layouts.length - 1];
- if (accounts != null && accounts.length > 0) { // If has google account
- layouts[layouts.length - 1] = R.layout.welcome_walkthrough_simple_login;
- fallbackLoginPage = R.layout.actfm_login_activity;
- } else { // If no google account
- fallbackLoginPage = layouts[layouts.length - 1] = R.layout.actfm_login_activity;
- }
- }
- }
-
- private void adjustResourcesForLite() {
- images = new int[] { 0 };
- title = new int[] { R.string.welcome_title_7 };
- body = new int[] { R.string.welcome_body_7 };
- layouts = new int[] { R.layout.actfm_login_activity };
- }
-
- @Override
- public void setPrimaryItem(ViewGroup container, int position, Object object) {
- super.setPrimaryItem(container, position, object);
-
- parent.onPageChanged(container, position);
- }
-
-
- @Override
- public int getCount() {
- return layouts.length;
- }
-
- public void changeLoginPage(int newLayout) {
- layouts[layouts.length - 1] = newLayout;
- notifyDataSetChanged();
- }
-
- @Override
- public Object instantiateItem(final View pager, final int position) {
- LayoutInflater inflater = LayoutInflater.from(context);
-
- View pageView = inflater.inflate(layouts[position], null, true);
- pageView.setLayoutParams(new ViewGroup.LayoutParams(
- WindowManager.LayoutParams.MATCH_PARENT,
- WindowManager.LayoutParams.MATCH_PARENT));
-
- if (pageView.findViewById(R.id.welcome_walkthrough_image) != null) {
- ImageView imageView = (ImageView) pageView.findViewById(R.id.welcome_walkthrough_image);
- imageView.setImageResource(images[position]);
-
- TextView titleView = (TextView) pageView.findViewById(R.id.welcome_walkthrough_title);
- titleView.setText(title[position]);
-
- TextView bodyView = (TextView) pageView.findViewById(R.id.welcome_walkthrough_body);
- bodyView.setText(body[position]);
- }
-
- ((ViewPager) pager).addView(pageView, 0);
- parent.instantiatePage(position);
- return pageView;
- }
-
- @Override
- public void destroyItem(View pager, int position, Object view) {
- ((ViewPager) pager).removeView((View) view);
- }
-
- @Override
- public boolean isViewFromObject(View view, Object object) {
- return view.equals(object);
- }
-
- @Override
- public void finishUpdate(View view) {
- //
- }
-
- @Override
- public void restoreState(Parcelable p, ClassLoader c) {
- //
- }
-
- @Override
- public Parcelable saveState() {
- return null;
- }
-
- @Override
- public void startUpdate(View view) {
- //
- }
-
- @Override
- public String getTitle(int position) {
- return context.getString(title[position]);
- }
-
-}
diff --git a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
deleted file mode 100644
index 2028d39d9..000000000
--- a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/**
- * Copyright (c) 2012 Todoroo Inc
- *
- * See the file "LICENSE" for the full license governing this code.
- */
-
-package com.todoroo.astrid.welcome.tutorial;
-
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.accounts.AccountManagerCallback;
-import android.accounts.AccountManagerFuture;
-import android.app.ProgressDialog;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.support.v4.view.ViewPager;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.Window;
-import android.widget.Button;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.google.api.client.googleapis.extensions.android2.auth.GoogleAccountManager;
-import com.timsu.astrid.R;
-import com.todoroo.andlib.utility.DialogUtilities;
-import com.todoroo.astrid.actfm.ActFmGoogleAuthActivity;
-import com.todoroo.astrid.actfm.ActFmLoginActivity;
-import com.todoroo.astrid.service.StatisticsConstants;
-import com.viewpagerindicator.CirclePageIndicator;
-
-public class WelcomeWalkthrough extends ActFmLoginActivity {
- private ViewPager mPager;
- private WelcomePagerAdapter mAdapter;
- private Account[] accounts;
- private CirclePageIndicator mIndicator;
- private View currentView;
- private int currentPage;
-
- private String authToken;
- private boolean onSuccess = false;
- private boolean dismissDialog = false;
-
- public static final String KEY_SHOWED_WELCOME_LOGIN = "key_showed_welcome_login"; //$NON-NLS-1$
-
- public static final String TOKEN_MANUAL_SHOW = "manual"; //$NON-NLS-1$
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- requestWindowFeature(Window.FEATURE_NO_TITLE);
- super.onCreate(savedInstanceState);
-
- mAdapter = new WelcomePagerAdapter(this, getIntent().hasExtra(TOKEN_MANUAL_SHOW));
- mAdapter.parent = this;
- accounts = mAdapter.accounts;
-
- mPager = (ViewPager)findViewById(R.id.pager);
- mPager.setAdapter(mAdapter);
-
- mIndicator = (CirclePageIndicator)findViewById(R.id.indicator);
- mIndicator.setViewPager(mPager);
- if (mAdapter.getCount() <= 1) {
- mIndicator.setVisibility(View.GONE);
- }
-
- }
- @Override
- protected int getContentViewResource() {
- return R.layout.welcome_walkthrough;
- }
-
- @Override
- protected int getTitleResource() {
- return 0;
- }
-
- public void instantiatePage(int position){
- if (position == mAdapter.getCount()-1) {
- initializeUI();
- }
- }
-
- private int getLoginPageLayout() {
- return mAdapter.fallbackLoginPage;
- }
-
- @Override
- protected void initializeUI() {
- String email = null;
- if (accounts != null && accounts.length > 0 && !TextUtils.isEmpty(accounts[0].name)) {
- email = accounts[0].name;
- }
- Button simpleLogin = (Button) findViewById(R.id.quick_login_google);
- if (simpleLogin != null && !TextUtils.isEmpty(email)) {
- initializeSimpleUI(email);
- } else {
- if (mAdapter != null && mAdapter.layouts[mAdapter.layouts.length - 1] != getLoginPageLayout()) {
- mAdapter.changeLoginPage(getLoginPageLayout());
- }
- super.initializeUI();
- }
- }
-
- private void initializeSimpleUI(final String email) {
- Button simpleLogin = (Button) findViewById(R.id.quick_login_google);
- simpleLogin.setText(getString(R.string.actfm_quick_login, email));
- simpleLogin.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- final ProgressDialog pd = DialogUtilities.progressDialog(WelcomeWalkthrough.this, getString(R.string.gtasks_GLA_authenticating));
- pd.show();
- getAuthToken(email, pd);
- }
-
- private void getAuthToken(final String e,
- final ProgressDialog pd) {
- final GoogleAccountManager accountManager = new GoogleAccountManager(WelcomeWalkthrough.this);
- Account a = accountManager.getAccountByName(e);
- AccountManagerCallback callback = new AccountManagerCallback() {
- @Override
- public void run(final AccountManagerFuture future) {
- new Thread() {
- @Override
- public void run() {
- try {
- Bundle bundle = future.getResult(30, TimeUnit.SECONDS);
- if (bundle.containsKey(AccountManager.KEY_AUTHTOKEN)) {
- authToken = bundle.getString(AccountManager.KEY_AUTHTOKEN);
- if (!onSuccess) {
- accountManager.manager.invalidateAuthToken(ActFmGoogleAuthActivity.AUTH_TOKEN_TYPE, authToken);
- getAuthToken(e, pd);
- onSuccess = true;
- } else {
- onAuthTokenSuccess(e, authToken);
- dismissDialog = true;
- }
- } else {
- dismissDialog = true;
- }
- } catch (final Exception e) {
- Log.e("actfm-google-auth", "Login Error", e); //$NON-NLS-1$ //$NON-NLS-2$
- runOnUiThread(new Runnable() {
- @Override
- public void run() {
- int error = e instanceof IOException ? R.string.gtasks_GLA_errorIOAuth :
- R.string.gtasks_GLA_errorAuth;
- Toast.makeText(WelcomeWalkthrough.this,
- error,
- Toast.LENGTH_LONG).show();
- onAuthError();
- }
- });
- } finally {
- if (dismissDialog) {
- DialogUtilities.dismissDialog(WelcomeWalkthrough.this, pd);
- }
- }
- }
- }.start();
- }
- };
- accountManager.manager.getAuthToken(a, ActFmGoogleAuthActivity.AUTH_TOKEN_TYPE, null, WelcomeWalkthrough.this, callback, null);
- }
- });
-
- TextView rejectQuickLogin = (TextView) findViewById(R.id.quick_login_reject);
- rejectQuickLogin.setText(getString(R.string.actfm_quick_login_reject, email));
- rejectQuickLogin.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- switchToLoginPage();
- }
- });
-
- errors = (TextView) findViewById(R.id.error);
- }
-
- private void onAuthTokenSuccess(final String email, final String authToken) {
- runOnUiThread(new Runnable() {
- @Override
- public void run() {
- authenticate(email, email, "", "google", authToken); //$NON-NLS-1$ //$NON-NLS-2$
- }
- });
- }
-
- private void onAuthError() {
- runOnUiThread(new Runnable() {
- @Override
- public void run() {
- switchToLoginPage();
- }
- });
- }
-
- private void switchToLoginPage() {
- mAdapter.changeLoginPage(getLoginPageLayout());
- mPager.setAdapter(mAdapter);
- mPager.setCurrentItem(mAdapter.layouts.length - 1, false);
- initializeUI();
- }
-
- public void onPageChanged(View view, int position) {
- currentPage = position;
- currentView = view;
- findViewById(R.id.next).setVisibility(
- position == mAdapter.getCount() - 1 ? View.GONE : View.VISIBLE);
-
- if(currentPage == mAdapter.getCount() - 1) {
- if(findViewById(R.id.fb_login) != null) {
- setupLoginLater();
- } else {
- OnClickListener done = new OnClickListener() {
- @Override
- public void onClick(View arg0) {
- finish();
- }
- };
- View title = currentView.findViewById(R.id.welcome_walkthrough_title);
- if (title != null) {
- title.setOnClickListener(done);
- }
- View image = currentView.findViewById(R.id.welcome_walkthrough_image);
- if (image != null) {
- image.setOnClickListener(done);
- }
- }
- }
- ((CirclePageIndicator) mIndicator).setVisibility(currentPage == mAdapter.getCount()-1 ? View.GONE : View.VISIBLE);
- }
-
- protected void setupPWLogin() {
- Button pwLogin = (Button) findViewById(R.id.pw_signup);
- pwLogin.setOnClickListener(signUpListener);
- }
-
- protected void setupLoginLater() {
- TextView loginLater = (TextView)currentView.findViewById(R.id.login_later);
- loginLater.setOnClickListener(loginLaterListener);
- loginLater.setVisibility(View.VISIBLE);
- }
-
-
- protected final OnClickListener loginLaterListener = new OnClickListener() {
- @Override
- public void onClick(View arg0) {
- String title = getString(R.string.welcome_login_confirm_later_title);
- String confirmLater = getString(R.string.welcome_login_confirm_later_dialog);
- DialogUtilities.okCancelCustomDialog(WelcomeWalkthrough.this, title, confirmLater,
- R.string.welcome_login_confirm_later_ok,
- R.string.welcome_login_confirm_later_cancel,
- android.R.drawable.ic_dialog_alert,
- null, confirmLaterListener);
- }
-
- private final DialogInterface.OnClickListener confirmLaterListener = new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- finish();
- }
- };
- };
-
-}