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