Use AccountManager.newChooseAccountIntent

7 years ago · f301ef92c8
parent 840361237c
commit f301ef92c8
36 changed files with 45 additions and 211 deletions
--- a/app/src/amazon/java/org/tasks/dialogs/AccountSelectionDialog.java
+++ b/app/src/amazon/java/org/tasks/dialogs/AccountSelectionDialog.java
@ -1,10 +0,0 @@
-package org.tasks.dialogs;
-
-import javax.inject.Inject;
-
-public class AccountSelectionDialog {
-    @Inject
-    public AccountSelectionDialog() {
-
-    }
-}
--- a/app/src/amazon/java/org/tasks/injection/DialogFragmentComponent.java
+++ b/app/src/amazon/java/org/tasks/injection/DialogFragmentComponent.java
@ -1,7 +1,6 @@
 package org.tasks.injection;

 import org.tasks.activities.CalendarSelectionDialog;
-import org.tasks.dialogs.AccountSelectionDialog;
 import org.tasks.dialogs.AddAttachmentDialog;
 import org.tasks.dialogs.ColorPickerDialog;
 import org.tasks.dialogs.RecordAudioDialog;
@ -22,8 +21,6 @@ public interface DialogFragmentComponent {

    void inject(AddAttachmentDialog addAttachmentDialog);

-    void inject(AccountSelectionDialog accountSelectionDialog);
-
    void inject(SnoozeDialog snoozeDialog);

    void inject(SortDialog sortDialog);
--- a/app/src/generic/java/org/tasks/dialogs/AccountSelectionDialog.java
+++ b/app/src/generic/java/org/tasks/dialogs/AccountSelectionDialog.java
@ -1,10 +0,0 @@
-package org.tasks.dialogs;
-
-import javax.inject.Inject;
-
-public class AccountSelectionDialog {
-    @Inject
-    public AccountSelectionDialog() {
-
-    }
-}
--- a/app/src/generic/java/org/tasks/injection/DialogFragmentComponent.java
+++ b/app/src/generic/java/org/tasks/injection/DialogFragmentComponent.java
@ -1,7 +1,6 @@
 package org.tasks.injection;

 import org.tasks.activities.CalendarSelectionDialog;
-import org.tasks.dialogs.AccountSelectionDialog;
 import org.tasks.dialogs.AddAttachmentDialog;
 import org.tasks.dialogs.ColorPickerDialog;
 import org.tasks.dialogs.RecordAudioDialog;
@ -22,8 +21,6 @@ public interface DialogFragmentComponent {

    void inject(AddAttachmentDialog addAttachmentDialog);

-    void inject(AccountSelectionDialog accountSelectionDialog);
-
    void inject(SnoozeDialog snoozeDialog);

    void inject(SortDialog sortDialog);
--- a/app/src/googleplay/java/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java
+++ b/app/src/googleplay/java/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java
@ -5,25 +5,33 @@
 */
 package com.todoroo.astrid.gtasks.auth;

-import android.support.v4.app.FragmentManager;
+import android.accounts.Account;
+import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.os.Bundle;
 import android.widget.Toast;

+import com.google.android.gms.auth.GoogleAuthException;
+import com.google.android.gms.auth.GoogleAuthUtil;
+import com.google.android.gms.auth.UserRecoverableAuthException;
+import com.google.api.services.tasks.TasksScopes;
 import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.astrid.gtasks.GtasksPreferenceService;
 import com.todoroo.astrid.gtasks.api.GtasksInvoker;

 import org.tasks.AccountManager;
 import org.tasks.R;
-import org.tasks.dialogs.AccountSelectionDialog;
 import org.tasks.dialogs.DialogBuilder;
 import org.tasks.injection.ActivityComponent;
 import org.tasks.injection.InjectingAppCompatActivity;

+import java.io.IOException;
+
 import javax.inject.Inject;

+import timber.log.Timber;
+
 /**
 * This activity allows users to sign in or log in to Google Tasks
 * through the Android account manager
@ -31,9 +39,15 @@ import javax.inject.Inject;
 * @author Sam Bosley
 *
 */
-public class GtasksLoginActivity extends InjectingAppCompatActivity implements AccountSelectionDialog.AccountSelectionHandler {
+public class GtasksLoginActivity extends InjectingAppCompatActivity {
+
+    public interface AuthResultHandler {
+        void authenticationSuccessful(String accountName);
+        void authenticationFailed(String message);
+    }

-    private static final String FRAG_TAG_ACCOUNT_SELECTION_DIALOG = "frag_tag_account_selection_dialog";
+    private static final int RC_REQUEST_OAUTH = 10987;
+    private static final int RC_CHOOSE_ACCOUNT = 10988;

    @Inject GtasksPreferenceService gtasksPreferenceService;
    @Inject DialogBuilder dialogBuilder;
@ -49,17 +63,10 @@ public class GtasksLoginActivity extends InjectingAppCompatActivity implements A
        final String existingUsername = gtasksPreferenceService.getUserName();
        if (existingUsername != null && accountManager.hasAccount(existingUsername)) {
            getAuthToken(existingUsername);
-        } else if (accountManager.isEmpty()) {
-            Toast.makeText(this, R.string.gtasks_GLA_noaccounts, Toast.LENGTH_LONG).show();
-            finish();
        } else {
-            FragmentManager fragmentManager = getSupportFragmentManager();
-            AccountSelectionDialog fragmentByTag = (AccountSelectionDialog) fragmentManager.findFragmentByTag(FRAG_TAG_ACCOUNT_SELECTION_DIALOG);
-            if (fragmentByTag == null) {
-                fragmentByTag = new AccountSelectionDialog();
-                fragmentByTag.show(fragmentManager, FRAG_TAG_ACCOUNT_SELECTION_DIALOG);
-            }
-            fragmentByTag.setAccountSelectionHandler(this);
+            Intent chooseAccountIntent = android.accounts.AccountManager.newChooseAccountIntent(
+                    null, null, new String[]{"com.google"}, false, null, null, null, null);
+            startActivityForResult(chooseAccountIntent, RC_CHOOSE_ACCOUNT);
        }
    }

@ -76,7 +83,7 @@ public class GtasksLoginActivity extends InjectingAppCompatActivity implements A
    }

    private void getAuthToken(String a, final ProgressDialog pd) {
-        accountManager.getAuthToken(this, a, new AccountManager.AuthResultHandler() {
+        getAuthToken(this, a, new AuthResultHandler() {
            @Override
            public void authenticationSuccessful(String accountName) {
                gtasksPreferenceService.setUserName(accountName);
@ -97,23 +104,36 @@ public class GtasksLoginActivity extends InjectingAppCompatActivity implements A
    @Override
    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
        super.onActivityResult(requestCode, resultCode, data);
-        if(requestCode == AccountManager.REQUEST_AUTHORIZATION && resultCode == RESULT_OK){
+        if (requestCode == RC_CHOOSE_ACCOUNT && resultCode == RESULT_OK) {
+            String account = data.getStringExtra(android.accounts.AccountManager.KEY_ACCOUNT_NAME);
+            getAuthToken(account);
+        } else if (requestCode == RC_REQUEST_OAUTH && resultCode == RESULT_OK) {
            final ProgressDialog pd = dialogBuilder.newProgressDialog(R.string.gtasks_GLA_authenticating);
            pd.show();
            getAuthToken(accountName, pd);
        } else {
            //User didn't give permission--cancel
-            onCancel();
+            finish();
        }
    }

-    @Override
-    public void accountSelected(String account) {
-        getAuthToken(account);
-    }
-
-    @Override
-    public void onCancel() {
-        finish();
+    private void getAuthToken(final Activity activity, final String accountName, final AuthResultHandler handler) {
+        final Account account = accountManager.getAccount(accountName);
+        if (account == null) {
+            handler.authenticationFailed(activity.getString(R.string.gtasks_error_accountNotFound, accountName));
+        } else {
+            new Thread(() -> {
+                try {
+                    GoogleAuthUtil.getToken(activity, account, "oauth2:" + TasksScopes.TASKS, null);
+                    handler.authenticationSuccessful(accountName);
+                } catch(UserRecoverableAuthException e) {
+                    Timber.e(e, e.getMessage());
+                    activity.startActivityForResult(e.getIntent(), RC_REQUEST_OAUTH);
+                } catch(GoogleAuthException | IOException e) {
+                    Timber.e(e, e.getMessage());
+                    handler.authenticationFailed(getString(R.string.gtasks_GLA_errorIOAuth));
+                }
+            }).start();
+        }
    }
 }
--- a/app/src/googleplay/java/org/tasks/AccountManager.java
+++ b/app/src/googleplay/java/org/tasks/AccountManager.java
@ -1,47 +1,30 @@
 package org.tasks;

 import android.accounts.Account;
-import android.app.Activity;
 import android.content.Context;

-import com.google.android.gms.auth.GoogleAuthException;
-import com.google.android.gms.auth.GoogleAuthUtil;
-import com.google.android.gms.auth.UserRecoverableAuthException;
 import com.google.api.client.googleapis.extensions.android.accounts.GoogleAccountManager;
-import com.google.api.services.tasks.TasksScopes;
 import com.google.common.base.Strings;

 import org.tasks.injection.ForApplication;
 import org.tasks.preferences.PermissionChecker;

-import java.io.IOException;
 import java.util.Collections;
 import java.util.List;

 import javax.inject.Inject;

-import timber.log.Timber;
-
 import static com.google.common.collect.Iterables.tryFind;
 import static com.google.common.collect.Lists.transform;
 import static java.util.Arrays.asList;

 public class AccountManager {

-    public interface AuthResultHandler {
-        void authenticationSuccessful(String accountName);
-        void authenticationFailed(String message);
-    }
-
-    public static final int REQUEST_AUTHORIZATION = 10987;
-
-    private final Context context;
    private final PermissionChecker permissionChecker;
    private final GoogleAccountManager googleAccountManager;

    @Inject
    public AccountManager(@ForApplication Context context, PermissionChecker permissionChecker) {
-        this.context = context;
        this.permissionChecker = permissionChecker;

        googleAccountManager = new GoogleAccountManager(context);
@ -59,26 +42,6 @@ public class AccountManager {
        return getAccounts().isEmpty();
    }

-    public void getAuthToken(final Activity activity, final String accountName, final AuthResultHandler handler) {
-        final Account account = getAccount(accountName);
-        if (account == null) {
-            handler.authenticationFailed(activity.getString(R.string.gtasks_error_accountNotFound, accountName));
-        } else {
-                new Thread(() -> {
-                    try {
-                        GoogleAuthUtil.getToken(activity, account, "oauth2:" + TasksScopes.TASKS, null);
-                        handler.authenticationSuccessful(accountName);
-                    } catch(UserRecoverableAuthException e) {
-                        Timber.e(e, e.getMessage());
-                        activity.startActivityForResult(e.getIntent(), REQUEST_AUTHORIZATION);
-                    } catch(GoogleAuthException | IOException e) {
-                        Timber.e(e, e.getMessage());
-                        handler.authenticationFailed(context.getString(R.string.gtasks_GLA_errorIOAuth));
-                    }
-                }).start();
-        }
-    }
-
    private List<Account> getAccountList() {
        return permissionChecker.canAccessAccounts()
                ? asList(googleAccountManager.getAccounts())
--- a/app/src/googleplay/java/org/tasks/dialogs/AccountSelectionDialog.java
+++ b/app/src/googleplay/java/org/tasks/dialogs/AccountSelectionDialog.java
@ -1,66 +0,0 @@
-package org.tasks.dialogs;
-
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-
-import org.tasks.AccountManager;
-import org.tasks.R;
-import org.tasks.injection.DialogFragmentComponent;
-import org.tasks.injection.InjectingDialogFragment;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-public class AccountSelectionDialog extends InjectingDialogFragment {
-
-    private AccountSelectionHandler handler;
-
-    @Override
-    protected void inject(DialogFragmentComponent component) {
-        component.inject(this);
-    }
-
-    public interface AccountSelectionHandler {
-        void accountSelected(String account);
-
-        void onCancel();
-    }
-
-    @Inject DialogBuilder dialogBuilder;
-    @Inject AccountManager accountManager;
-
-    @NonNull
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        final List<String> accounts = accountManager.getAccounts();
-
-        return dialogBuilder.newDialog()
-                .setTitle(R.string.choose_google_account)
-                .setItems(accounts, (dialog, which) -> {
-                    handler.accountSelected(accounts.get(which));
-                    dialog.dismiss();
-                })
-                .setNegativeButton(android.R.string.cancel, (dialog, which) -> {
-                    if (handler != null) {
-                        handler.onCancel();
-                    }
-                })
-                .show();
-    }
-
-    public void setAccountSelectionHandler(AccountSelectionHandler handler) {
-        this.handler = handler;
-    }
-
-    @Override
-    public void onCancel(DialogInterface dialog) {
-        super.onCancel(dialog);
-
-        if (handler != null) {
-            handler.onCancel();
-        }
-    }
-}
--- a/app/src/googleplay/java/org/tasks/injection/DialogFragmentComponent.java
+++ b/app/src/googleplay/java/org/tasks/injection/DialogFragmentComponent.java
@ -2,7 +2,6 @@ package org.tasks.injection;

 import org.tasks.activities.CalendarSelectionDialog;
 import org.tasks.activities.SupportGoogleTaskListPicker;
-import org.tasks.dialogs.AccountSelectionDialog;
 import org.tasks.dialogs.AddAttachmentDialog;
 import org.tasks.dialogs.ColorPickerDialog;
 import org.tasks.dialogs.RecordAudioDialog;
@ -29,8 +28,6 @@ public interface DialogFragmentComponent {

    void inject(AddAttachmentDialog addAttachmentDialog);

-    void inject(AccountSelectionDialog accountSelectionDialog);
-
    void inject(SnoozeDialog snoozeDialog);

    void inject(SortDialog sortDialog);
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@ -89,7 +89,6 @@
 	<string name="gcal_TEA_showCalendar_label">إفتح أحداث التقويم</string>
 	<string name="CFC_gtasks_list_text">في القائمة :?</string>
 	<string name="gtasks_GTA_clear_completed">انتهاء الحذف</string>
-	<string name="gtasks_GLA_noaccounts">لا يوجد حساب قوقل للتزامن مع.</string>
 	<string name="gtasks_GLA_errorIOAuth">عذرا، لم نتمكن من الاتصال مع خادم قوقل. أعد المحاولة مرة أخرى لاحقا.</string>
 	<string name="gtasks_GPr_header">مهام قوقل</string>
 	<string name="premium_record_audio">تسجيل ملاحظة</string>
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@ -10,7 +10,6 @@
 	<string name="TVA_add_comment">Добави коментар...</string>
 	<string name="name">Име</string>
 	<string name="enter_filter_name">Въведете име на филтъра</string>
-	<string name="choose_google_account">Изберете Google Account</string>
 	<string name="backup_BPr_header">Резервни копия</string>
 	<string name="backup_BAc_import">Импортиране на задачи</string>
 	<string name="backup_BAc_export">Експортиране на задачи</string>
@ -165,7 +164,6 @@
 	<string name="CFC_gtasks_list_text">В списък: ?</string>
 	<string name="CFC_gtasks_list_name">В списък GTasks...</string>
 	<string name="gtasks_GTA_clear_completed">Изчисти Завършени</string>
-	<string name="gtasks_GLA_noaccounts">Няма налични Google акаунти за синхронизация.</string>
 	<string name="gtasks_GLA_authenticating">Удостоверява се...</string>
 	<string name="gtasks_GLA_errorIOAuth">Съжаляваме, ние имахме проблем с комуникацията със сървърите на Google. Моля, опитайте отново по-късно.</string>
 	<string name="gtasks_error_accountNotFound">Акаунт %s не е намерен-моля да излезнете и да влязнете отново от настройките на Google Tasks.</string>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@ -152,7 +152,6 @@
 	<string name="CFC_gtasks_list_text">V seznamu: ?</string>
 	<string name="CFC_gtasks_list_name">V seznamu Google úkolů</string>
 	<string name="gtasks_GTA_clear_completed">Smazat hotové</string>
-	<string name="gtasks_GLA_noaccounts">Žádný dostupný účet Google pro synchronizaci</string>
 	<string name="gtasks_GLA_authenticating">Ověřuje se...</string>
 	<string name="gtasks_GLA_errorIOAuth">Nastali problémy při komunikaci se servery Google. Zkuste to prosím později.</string>
 	<string name="gtasks_GPr_header">Google Úkoly (Beta!)</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -9,7 +9,6 @@
 	<string name="actfm_picture_clear">Bild entfernen</string>
 	<string name="TVA_add_comment">Kommentar hinzufügen …</string>
 	<string name="enter_filter_name">Filtername eingeben</string>
-	<string name="choose_google_account">Google-Account auswählen</string>
 	<string name="backup_BAc_import">Aufgaben importieren</string>
 	<string name="backup_BAc_export">Aufgaben exportieren</string>
 	<string name="export_toast">%1$s bis %2$s gesichert.</string>
@ -159,7 +158,6 @@
 	<string name="CFC_gtasks_list_text">In der Liste: ?</string>
 	<string name="CFC_gtasks_list_name">In GTasks-Liste …</string>
 	<string name="gtasks_GTA_clear_completed">Entferne erledigte Aufgaben</string>
-	<string name="gtasks_GLA_noaccounts">Keine Google-Accounts zum synchronisieren verfügbar.</string>
 	<string name="gtasks_GLA_authenticating">Authentifizierung ...</string>
 	<string name="gtasks_GLA_errorIOAuth">Entschuldigung, während der Kommunikation mit den Google-Servern ist ein Problem aufgetreten. Bitte versuchen Sie es später noch einmal.</string>
 	<string name="gtasks_error_accountNotFound">Konto %s nicht gefunden. Bitte ausloggen und erneut über die Einstellungen von Google Tasks einloggen .</string>
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@ -132,7 +132,6 @@
 	<string name="CFC_gtasks_list_text">Στην λίστα: ?</string>
 	<string name="CFC_gtasks_list_name">Στην λίστα του GTasks...</string>
 	<string name="gtasks_GTA_clear_completed">Καθαρισμός ολοκληρωμένων</string>
-	<string name="gtasks_GLA_noaccounts">Δεν υπάρχουν λογαριασμοί Google για συγχρονισμο.</string>
 	<string name="gtasks_GLA_authenticating">Αυθεντικοποίηση...</string>
 	<string name="gtasks_GLA_errorIOAuth">Συγγνώμη, υπήρξε σφάλμα επικοινωνίας με τους διακομιστές της Google. Παρακαλουμε δοκιμάστε πάλι μετά</string>
 	<string name="gtasks_GPr_header">Εργασίες Google</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -10,7 +10,6 @@
 	<string name="TVA_add_comment">Añadir un comentario...</string>
 	<string name="name">Nombre</string>
 	<string name="enter_filter_name">Introduzca el nombre del filtro</string>
-	<string name="choose_google_account">Elegir cuenta de Google</string>
 	<string name="backup_BPr_header">Copias de seguridad</string>
 	<string name="backup_BAc_import">Importar tareas</string>
 	<string name="backup_BAc_export">Exportar tareas</string>
@ -161,7 +160,6 @@
 	<string name="CFC_gtasks_list_text">En la Lista: ?</string>
 	<string name="CFC_gtasks_list_name">en la Lista GTasks...</string>
 	<string name="gtasks_GTA_clear_completed">Quitar finalizadas</string>
-	<string name="gtasks_GLA_noaccounts">No hay disponible una cuenta de Google con la cual sincronizarse.</string>
 	<string name="gtasks_GLA_authenticating">Autenticando...</string>
 	<string name="gtasks_GLA_errorIOAuth">Perdón, hubo un problema al comunicarse con los servidores de Google. Por favor inténtalo mas tarde.</string>
 	<string name="gtasks_error_accountNotFound">No se ha encontrado la cuenta %s --por favor, cierra sesión y vuelve a iniciarla desde la configuración de Google Tasks</string>
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@ -10,7 +10,6 @@
 	<string name="TVA_add_comment">اضافه کردن نظر</string>
 	<string name="name">نام</string>
 	<string name="enter_filter_name">نام فیلتر را وارد نمایید</string>
-	<string name="choose_google_account">انتخاب حساب کاربری گوگل</string>
 	<string name="backup_BPr_header">پشتیبان ها</string>
 	<string name="backup_BAc_import">واردکردن وظایف</string>
 	<string name="backup_BAc_export">خرجی از وظایف</string>
@ -114,7 +113,6 @@
 	<string name="gcal_TEA_showCalendar_label">بازکردن رویداد تقویم</string>
 	<string name="gcal_completed_title">%s (کامل‌شده)</string>
 	<string name="gtasks_GTA_clear_completed">حذف انجام شد</string>
-	<string name="gtasks_GLA_noaccounts">اکانت گوگلی برای همگام سازی موجود نیست</string>
 	<string name="gtasks_GLA_authenticating">اعتبارسنجی...</string>
 	<string name="gtasks_GLA_errorIOAuth">پوزش، ارتباط با سرورهای گوگل میسر نشد. لطفا دوباره تلاش نمایید.</string>
 	<string name="gtasks_GPr_header">وظایف گوگل</string>
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@ -10,7 +10,6 @@
 	<string name="TVA_add_comment">Lisää kommentti...</string>
 	<string name="name">Nimi</string>
 	<string name="enter_filter_name">Syötä suodattimen nimi</string>
-	<string name="choose_google_account">Valitse Google tili</string>
 	<string name="backup_BPr_header">Varmuuskopiot</string>
 	<string name="backup_BAc_import">Tuo tehtävät</string>
 	<string name="backup_BAc_export">Vie tehtävät</string>
@ -165,7 +164,6 @@
 	<string name="CFC_gtasks_list_text">Listalla: ?</string>
 	<string name="CFC_gtasks_list_name">Gtask lista...</string>
 	<string name="gtasks_GTA_clear_completed">Poista valmiit</string>
-	<string name="gtasks_GLA_noaccounts">Google tiliä ei ole saatavissa synkronointia varten.</string>
 	<string name="gtasks_GLA_authenticating">Todennetaan...</string>
 	<string name="gtasks_GLA_errorIOAuth">Valitettavasti meillä on yhteysongelmia Google palvelimiin.  Ole hyvä ja yritä myöhemmin uudestaa.</string>
 	<string name="gtasks_GPr_header">Google tehtävät</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -10,7 +10,6 @@
 	<string name="TVA_add_comment">Ajouter un commentaire</string>
 	<string name="name">Nom</string>
 	<string name="enter_filter_name">Entrer le nom du filtre</string>
-	<string name="choose_google_account">Choisir un compte Google</string>
 	<string name="backup_BPr_header">Sauvegardes</string>
 	<string name="backup_BAc_import">Importer des tâches</string>
 	<string name="backup_BAc_export">Exporter des tâches</string>
@ -159,7 +158,6 @@
 	<string name="CFC_gtasks_list_text">Dans la liste : ?</string>
 	<string name="CFC_gtasks_list_name">Dans la liste GTasks...</string>
 	<string name="gtasks_GTA_clear_completed">Effacer les tâches terminés</string>
-	<string name="gtasks_GLA_noaccounts">Aucun compte Google trouvé pour la synchronisation.</string>
 	<string name="gtasks_GLA_authenticating">Authentification en cours...</string>
 	<string name="gtasks_GLA_errorIOAuth">Erreur de communication avec les serveurs Google. Veuillez essayer plus tard.</string>
 	<string name="gtasks_error_accountNotFound">Le compte %s est introuvable--veuillez vous déconnecter puis vous reconnecter depuis les préférences Google Tasks.</string>
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@ -10,7 +10,6 @@
 	<string name="TVA_add_comment">Añadir un comentario...</string>
 	<string name="name">Nombre</string>
 	<string name="enter_filter_name">Introduzca el nombre del filtro</string>
-	<string name="choose_google_account">Elegir cuenta de Google</string>
 	<string name="backup_BPr_header">Copias de seguridad</string>
 	<string name="backup_BAc_import">Importar tareas</string>
 	<string name="backup_BAc_export">Exportar tareas</string>
@ -162,7 +161,6 @@
 	<string name="CFC_gtasks_list_text">En la Lista: ?</string>
 	<string name="CFC_gtasks_list_name">en la Lista GTasks...</string>
 	<string name="gtasks_GTA_clear_completed">Quitar finalizadas</string>
-	<string name="gtasks_GLA_noaccounts">No hay disponible una cuenta de Google con la cual sincronizarse.</string>
 	<string name="gtasks_GLA_authenticating">Autenticando...</string>
 	<string name="gtasks_GLA_errorIOAuth">Perdón, hubo un problema al comunicarse con los servidores de Google. Por favor inténtalo mas tarde.</string>
 	<string name="gtasks_error_accountNotFound">No se ha encontrado la cuenta %s --por favor, cierra sesión y vuelve a iniciarla desde la configuración de Google Tasks</string>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@ -10,7 +10,6 @@
 	<string name="TVA_add_comment">Hozzászólás írása...</string>
 	<string name="name">Cím</string>
 	<string name="enter_filter_name">Kérem a szűrő nevét</string>
-	<string name="choose_google_account">Google Fiók kiválasztása</string>
 	<string name="backup_BPr_header">Mentések</string>
 	<string name="backup_BAc_import">Feladatok importálása</string>
 	<string name="backup_BAc_export">Feladatok exportálása</string>
@ -165,7 +164,6 @@
 	<string name="CFC_gtasks_list_text">Listában: ?</string>
 	<string name="CFC_gtasks_list_name">Ebben a GTasks listában...</string>
 	<string name="gtasks_GTA_clear_completed">Elvégzettek törlése</string>
-	<string name="gtasks_GLA_noaccounts">Nincs elérhető Google fiók a szinkronizáláshoz.</string>
 	<string name="gtasks_GLA_authenticating">Azonosítás...</string>
 	<string name="gtasks_GLA_errorIOAuth">Sajnáljuk, de hiba történt a Google szervereival való kommunikálás során. Próbáld újra később.</string>
 	<string name="gtasks_error_accountNotFound">%s fiók nem található -- kérlek, jelentkezz ki, és vissza a Google Tasks beállításokban.</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -10,7 +10,6 @@
 	<string name="TVA_add_comment">Aggiungi un commento...</string>
 	<string name="name">Nome</string>
 	<string name="enter_filter_name">Introduci il nome filtro</string>
-	<string name="choose_google_account">Scegli l\'account Google</string>
 	<string name="backup_BPr_header">Salvataggi</string>
 	<string name="backup_BAc_import">Importa attività</string>
 	<string name="backup_BAc_export">Esporta attività</string>
@ -162,7 +161,6 @@
 	<string name="CFC_gtasks_list_text">Nella lista: ?</string>
 	<string name="CFC_gtasks_list_name">Nella lista GTasks...</string>
 	<string name="gtasks_GTA_clear_completed">Elimina attività completate</string>
-	<string name="gtasks_GLA_noaccounts">Non è disponibile nessun Google account con cui sincronizzarsi.</string>
 	<string name="gtasks_GLA_authenticating">Autenticazione...</string>
 	<string name="gtasks_GLA_errorIOAuth">Ci scusiamo per il disagio, abbiamo dei problemi a comunicare con i server di Google. Per favore riprovare più tardi.</string>
 	<string name="gtasks_GPr_header">Attività Google</string>
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@ -10,7 +10,6 @@
 	<string name="TVA_add_comment">הוסף הערה</string>
 	<string name="name">שם</string>
 	<string name="enter_filter_name">הזן שם מסנן</string>
-	<string name="choose_google_account">בחר חשבון גוגל</string>
 	<string name="backup_BPr_header">גיבויים</string>
 	<string name="backup_BAc_import">ייבוא משימות</string>
 	<string name="backup_BAc_export">ייצוא משימות</string>
@ -162,7 +161,6 @@
 	<string name="CFC_gtasks_list_text">ברשימה: ?</string>
 	<string name="CFC_gtasks_list_name">ברשימה של ״משימות גוגל״</string>
 	<string name="gtasks_GTA_clear_completed">נקה משימות שבוצעו</string>
-	<string name="gtasks_GLA_noaccounts">לא נמצאו חשבונות גוגל לסינכרון</string>
 	<string name="gtasks_GLA_authenticating">מאמת...</string>
 	<string name="gtasks_GLA_errorIOAuth">בעיה בהתחברות לשרתי גוגל. נא נסה שוב מאוחר יותר.</string>
 	<string name="gtasks_GPr_header">״משימות גוגל״</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -10,7 +10,6 @@
 	<string name="TVA_add_comment">コメントする</string>
 	<string name="name">名前</string>
 	<string name="enter_filter_name">フィルター名を入力</string>
-	<string name="choose_google_account">Google アカウントを選択</string>
 	<string name="backup_BPr_header">バックアップ</string>
 	<string name="backup_BAc_import">タスクのインポート</string>
 	<string name="backup_BAc_export">タスクのエクスポート</string>
@ -162,7 +161,6 @@
 	<string name="CFC_gtasks_list_text">リストにありますか ?</string>
 	<string name="CFC_gtasks_list_name">GTasks リストに...</string>
 	<string name="gtasks_GTA_clear_completed">クリアが完了しました</string>
-	<string name="gtasks_GLA_noaccounts">同期するために有効な Google アカウントがありません.</string>
 	<string name="gtasks_GLA_authenticating">認証中...</string>
 	<string name="gtasks_GLA_errorIOAuth">すみません、Googleのサーバとの通信で問題が発生しました。しばらくしてから再度やり直してください。</string>
 	<string name="gtasks_GPr_header">Google Tasks (ベータ版!)</string>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -10,7 +10,6 @@
 	<string name="TVA_add_comment">댓글 쓰기...</string>
 	<string name="name">이름</string>
 	<string name="enter_filter_name">필터 이름 입력</string>
-	<string name="choose_google_account">구글 계정 선택</string>
 	<string name="backup_BPr_header">백업</string>
 	<string name="backup_BAc_import">할일 가져오기</string>
 	<string name="backup_BAc_export">할일 내보내기</string>
@ -166,7 +165,6 @@
 	<string name="CFC_gtasks_list_text">목록에: ?</string>
 	<string name="CFC_gtasks_list_name">GTasks 목록에...</string>
 	<string name="gtasks_GTA_clear_completed">삭제 완료</string>
-	<string name="gtasks_GLA_noaccounts">동기화 가능한 구글 계정이 없음</string>
 	<string name="gtasks_GLA_authenticating">인증 중...</string>
 	<string name="gtasks_GLA_errorIOAuth">죄송합니다, 구글 서버와 통신하는 데 문제가 있습니다. 잠시 후 다시 시도하세요.</string>
 	<string name="gtasks_GPr_header">구글 할일 목록 (Google Tasks)</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -10,7 +10,6 @@
 	<string name="TVA_add_comment">Voeg een opmerking toe</string>
 	<string name="name">Naam</string>
 	<string name="enter_filter_name">Vul een filter naam in</string>
-	<string name="choose_google_account">Kies Google Account</string>
 	<string name="backup_BPr_header">Back-ups</string>
 	<string name="backup_BAc_import">Taken importeren</string>
 	<string name="backup_BAc_export">Taken exporteren</string>
@ -161,7 +160,6 @@
 	<string name="CFC_gtasks_list_text">In lijst: ?</string>
 	<string name="CFC_gtasks_list_name">In GTasks lijst...</string>
 	<string name="gtasks_GTA_clear_completed">Verwijderen Voltooid</string>
-	<string name="gtasks_GLA_noaccounts">Geen Google account beschikbaar voor synchronisatie</string>
 	<string name="gtasks_GLA_authenticating">Verifiëren...</string>
 	<string name="gtasks_GLA_errorIOAuth">Sorry, we konden geen verbinding maken met de servers van Google. Probeer het later opnieuw.</string>
 	<string name="gtasks_GPr_header">Google Taken (Beta!)</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -10,7 +10,6 @@
 	<string name="TVA_add_comment">Dodaj komentarz...</string>
 	<string name="name">Nazwa</string>
 	<string name="enter_filter_name">Podaj nazwę filtra</string>
-	<string name="choose_google_account">Wybierz konto Google</string>
 	<string name="backup_BPr_header">Kopie zapasowe</string>
 	<string name="backup_BAc_import">Importuj zadania</string>
 	<string name="backup_BAc_export">Eksportuj zadania</string>
@ -161,7 +160,6 @@
 	<string name="CFC_gtasks_list_text">Na liście: ?</string>
 	<string name="CFC_gtasks_list_name">Na liście GTasks...</string>
 	<string name="gtasks_GTA_clear_completed">Wyczyść zakończone</string>
-	<string name="gtasks_GLA_noaccounts">Brak dostępnych kont Google do synchronizacji.</string>
 	<string name="gtasks_GLA_authenticating">Uwierzytelnianie...</string>
 	<string name="gtasks_GLA_errorIOAuth">Przepraszamy, mieliśmy problem z porozumieniem się z serwerami Google. Prosimy spróbować ponownie.</string>
 	<string name="gtasks_GPr_header">Zadania Google</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -10,7 +10,6 @@
 	<string name="TVA_add_comment">Comentar...</string>
 	<string name="name">Nome</string>
 	<string name="enter_filter_name">Digite o nome do filtro</string>
-	<string name="choose_google_account">Selecione a Conta do Google</string>
 	<string name="backup_BAc_import">Importar tarefas</string>
 	<string name="backup_BAc_export">Exportar tarefas</string>
 	<string name="export_toast">Backups feitos: de %1$s para %2$s.</string>
@ -158,7 +157,6 @@
 	<string name="CFC_gtasks_list_text">Na lista: ?</string>
 	<string name="CFC_gtasks_list_name">No Google Tasks...</string>
 	<string name="gtasks_GTA_clear_completed">Limpeza concluída</string>
-	<string name="gtasks_GLA_noaccounts">Google não está disponível para sincronização com contas.</string>
 	<string name="gtasks_GLA_authenticating">Autenticando ...</string>
 	<string name="gtasks_GLA_errorIOAuth">Desculpe-nos, tivemos problemas de comunicação com os servidores do Google. Tente mais tarde.</string>
 	<string name="gtasks_GPr_header">Google Tarefas</string>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@ -147,7 +147,6 @@
 	<string name="CFC_gtasks_list_text">Na lista: ?</string>
 	<string name="CFC_gtasks_list_name">Na lista GTasks</string>
 	<string name="gtasks_GTA_clear_completed">Remoção terminada</string>
-	<string name="gtasks_GLA_noaccounts">Não possui qualquer conta Google para sincronização.</string>
 	<string name="gtasks_GLA_authenticating">Autenticação...</string>
 	<string name="gtasks_GLA_errorIOAuth">Ocorreu um erro ao comunicar com os servidores Google. Tente mais tarde.</string>
 	<string name="gtasks_GPr_header">Tarefas Google</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -10,7 +10,6 @@
 	<string name="TVA_add_comment">Добавить комментарий...</string>
 	<string name="name">Тег:</string>
 	<string name="enter_filter_name">Введите имя фильтра</string>
-	<string name="choose_google_account">Выберите аккаунт Google</string>
 	<string name="backup_BPr_header">Резервные копии</string>
 	<string name="backup_BAc_import">Импортировать задачи</string>
 	<string name="backup_BAc_export">Экспортировать задачи</string>
@ -162,7 +161,6 @@
 	<string name="CFC_gtasks_list_text">В Списке: ?</string>
 	<string name="CFC_gtasks_list_name">В GTask Список...</string>
 	<string name="gtasks_GTA_clear_completed">Очистить завершенные</string>
-	<string name="gtasks_GLA_noaccounts">Нет доступных аккаунтов Google для синхронизации</string>
 	<string name="gtasks_GLA_authenticating">Авторизация...</string>
 	<string name="gtasks_GLA_errorIOAuth">При обращении к серверам Google возникли проблемы. Пожалуйста, попробуйте позже.</string>
 	<string name="gtasks_error_accountNotFound">Учетная запись %s не найдена -- пожалуйста, выйдите и войдите снова через настройки Google Tasks.</string>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@ -141,7 +141,6 @@
 	<string name="CFC_gtasks_list_text">V zozname: ?</string>
 	<string name="CFC_gtasks_list_name">V GTasks zozname...</string>
 	<string name="gtasks_GTA_clear_completed">Vymazať dokončené</string>
-	<string name="gtasks_GLA_noaccounts">Nieje k dispozícii synchronizácia Google účtu.</string>
 	<string name="gtasks_GLA_authenticating">Overovanie...</string>
 	<string name="gtasks_GLA_errorIOAuth">Prepáč, nastal problém v komunikácii s Google serverom. Prosím, skús to znovu neskôr.</string>
 	<string name="gtasks_GPr_header">Úlohy Google</string>
--- a/app/src/main/res/values-sl-rSI/strings.xml
+++ b/app/src/main/res/values-sl-rSI/strings.xml
@ -136,7 +136,6 @@
 	<string name="CFC_gtasks_list_text">V seznamu: ?</string>
 	<string name="CFC_gtasks_list_name">Na GNaloge seznamu...</string>
 	<string name="gtasks_GTA_clear_completed">Zbriši dokončano</string>
-	<string name="gtasks_GLA_noaccounts">Ne morem se uskladiti z neobstoječimi Google računi.</string>
 	<string name="gtasks_GLA_authenticating">Avtentikacija v teku ...</string>
 	<string name="gtasks_GLA_errorIOAuth">Žal smo imeli težave pri povezovanju z Google strežniki. Prosimo, poskusite ponovno kasneje.</string>
 	<string name="gtasks_GPr_header">Google Naloge</string>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@ -10,7 +10,6 @@
 	<string name="TVA_add_comment">Lägg till en kommentar...</string>
 	<string name="name">Namn</string>
 	<string name="enter_filter_name">Ange ett namn för filtret</string>
-	<string name="choose_google_account">Välj Googlekonto</string>
 	<string name="backup_BPr_header">Säkerhetskopior</string>
 	<string name="backup_BAc_import">Importera uppgifter</string>
 	<string name="backup_BAc_export">Exportera uppgifter</string>
@ -162,7 +161,6 @@
 	<string name="CFC_gtasks_list_text">I listan: ?</string>
 	<string name="CFC_gtasks_list_name">I lista på Google Uppgifter...</string>
 	<string name="gtasks_GTA_clear_completed">Rensa bort färdiga</string>
-	<string name="gtasks_GLA_noaccounts">Inga tillgängliga Googlekonton att synkronisera med.</string>
 	<string name="gtasks_GLA_authenticating">Autentiserar...</string>
 	<string name="gtasks_GLA_errorIOAuth">Vi hade problem med förbindelsen till Googles servrar. Försök igen senare.</string>
 	<string name="gtasks_GPr_header">Google Uppgifter</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -124,7 +124,6 @@
 	<string name="CFC_gtasks_list_text">Liste içinde: ?</string>
 	<string name="CFC_gtasks_list_name">Gtasks Listesi içinde...</string>
 	<string name="gtasks_GTA_clear_completed">Tamamlanları Temizle</string>
-	<string name="gtasks_GLA_noaccounts">Eşleştirilecek Google hesabı mevcut değil.</string>
 	<string name="gtasks_GLA_authenticating">Kimlik doğrulanıyor...</string>
 	<string name="gtasks_GLA_errorIOAuth">Üzgünüm, Google sunucuları ile bağlanmakta sıkıntı yaşıyoruz. Lütfen daha sonra yeniden deneyin.</string>
 	<string name="gtasks_GPr_header">Google Görevleri (Beta!)</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -10,7 +10,6 @@
 	<string name="TVA_add_comment">Додати коментар...</string>
 	<string name="name">Ім\'я</string>
 	<string name="enter_filter_name">Введіть назву фільтра</string>
-	<string name="choose_google_account">Оберіть Google аккаунт</string>
 	<string name="backup_BPr_header">Резервні копії</string>
 	<string name="backup_BAc_import">Імпортувати завдання</string>
 	<string name="backup_BAc_export">Експорт завдань</string>
@ -165,7 +164,6 @@
 	<string name="CFC_gtasks_list_text">В списку: ?</string>
 	<string name="CFC_gtasks_list_name">В GTasks списку...</string>
 	<string name="gtasks_GTA_clear_completed">Очистити завершені</string>
-	<string name="gtasks_GLA_noaccounts">Немає облікового запису Google для синхронізації.</string>
 	<string name="gtasks_GLA_authenticating">Автентифікація...</string>
 	<string name="gtasks_GLA_errorIOAuth">Вибачте, проблеми при зверненні до серверів Google. Будь ласка, спробуйте пізніше.</string>
 	<string name="gtasks_error_accountNotFound">Аккаунт %s  не знайдено - будь ласка, вийдіть і увійдіть знову через налаштування Google Tasks.</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -10,7 +10,6 @@
 	<string name="TVA_add_comment">添加注释...</string>
 	<string name="name">名称</string>
 	<string name="enter_filter_name">输入过滤器名称</string>
-	<string name="choose_google_account">选择Google账户</string>
 	<string name="backup_BPr_header">备份</string>
 	<string name="backup_BAc_import">导入任务</string>
 	<string name="backup_BAc_export">导出任务</string>
@ -124,7 +123,6 @@
 	<string name="CFC_gtasks_list_text">列表内容: ?</string>
 	<string name="CFC_gtasks_list_name">在Google任务列表中...</string>
 	<string name="gtasks_GTA_clear_completed">清除已完成项</string>
-	<string name="gtasks_GLA_noaccounts">没有可用的Google帐户同步。</string>
 	<string name="gtasks_GLA_authenticating">正在认证...</string>
 	<string name="gtasks_GLA_errorIOAuth">对不起，我们在与 Google 服务器通讯时遇到了问题。请稍后再尝试。</string>
 	<string name="gtasks_error_accountNotFound">找不到帐户 %s——请退出，然后从 Google Tasks设置中重新登录。</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -128,7 +128,6 @@
 	<string name="CFC_gtasks_list_text">列表內容: ?</string>
 	<string name="CFC_gtasks_list_name">在Google任務工作列表中...</string>
 	<string name="gtasks_GTA_clear_completed">清除已完成項</string>
-	<string name="gtasks_GLA_noaccounts">沒有可用的Google帳戶同步。</string>
 	<string name="gtasks_GLA_authenticating">正在認證...</string>
 	<string name="gtasks_GLA_errorIOAuth">對不起，我們在與Google 服務器通訊時遇到了問題。請稍後再嘗試。</string>
 	<string name="gtasks_GPr_header">Google Tasks (測試中!)</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -15,10 +15,6 @@

    <string name="enter_filter_name">Enter filter name</string>

-    <!-- ========================================= sharing login activity == -->
-
-    <string name="choose_google_account">Choose Google Account</string>
-
    <!-- ================================================= BackupPreferences == -->

    <!-- slide 33c/48d: Backup Preferences Title -->
@ -432,10 +428,6 @@ File %1$s contained %2$s.\n\n

    <!-- ============================================ GtasksLoginActivity == -->

-    <!-- Activity Title: Gtasks Login -->
-
-    <string name="gtasks_GLA_noaccounts">No available Google accounts to sync with.</string>
-
    <!--  Authenticating toast -->
    <string name="gtasks_GLA_authenticating">Authenticating…</string>