diff --git a/app/src/main/java/com/todoroo/astrid/utility/Constants.java b/app/src/main/java/com/todoroo/astrid/utility/Constants.java
index 63d2016c7..7e1bf152c 100644
--- a/app/src/main/java/com/todoroo/astrid/utility/Constants.java
+++ b/app/src/main/java/com/todoroo/astrid/utility/Constants.java
@@ -15,6 +15,4 @@ public final class Constants {
/** Notification Manager id for timing */
public static final int NOTIFICATION_TIMER = -2;
-
- public static final int NOTIFICATION_SYNC_ERROR = -3;
}
diff --git a/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java b/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java
index c0a0cc352..7614cded7 100644
--- a/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java
+++ b/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java
@@ -3,13 +3,9 @@ package org.tasks.gtasks;
import static com.google.common.collect.Lists.transform;
import static org.tasks.date.DateTimeUtils.newDateTime;
-import android.app.PendingIntent;
import android.content.Context;
-import android.content.Intent;
import android.text.TextUtils;
import androidx.annotation.Nullable;
-import androidx.core.app.NotificationCompat;
-import com.google.api.client.googleapis.extensions.android.gms.auth.UserRecoverableAuthIOException;
import com.google.api.client.googleapis.json.GoogleJsonResponseException;
import com.google.api.services.tasks.model.TaskList;
import com.google.api.services.tasks.model.TaskLists;
@@ -27,7 +23,6 @@ import com.todoroo.astrid.gtasks.api.GtasksInvoker;
import com.todoroo.astrid.gtasks.api.HttpNotFoundException;
import com.todoroo.astrid.service.TaskCreator;
import com.todoroo.astrid.service.TaskDeleter;
-import com.todoroo.astrid.utility.Constants;
import java.io.EOFException;
import java.io.IOException;
import java.net.HttpRetryException;
@@ -50,7 +45,6 @@ import org.tasks.data.GoogleTaskDao;
import org.tasks.data.GoogleTaskList;
import org.tasks.data.GoogleTaskListDao;
import org.tasks.injection.ForApplication;
-import org.tasks.notifications.NotificationManager;
import org.tasks.preferences.DefaultFilterProvider;
import org.tasks.preferences.PermissionChecker;
import org.tasks.preferences.Preferences;
@@ -78,7 +72,6 @@ public class GoogleTaskSynchronizer {
private final Preferences preferences;
private final TaskDao taskDao;
private final Tracker tracker;
- private final NotificationManager notificationManager;
private final GoogleTaskDao googleTaskDao;
private final TaskCreator taskCreator;
private final DefaultFilterProvider defaultFilterProvider;
@@ -97,7 +90,6 @@ public class GoogleTaskSynchronizer {
Preferences preferences,
TaskDao taskDao,
Tracker tracker,
- NotificationManager notificationManager,
GoogleTaskDao googleTaskDao,
TaskCreator taskCreator,
DefaultFilterProvider defaultFilterProvider,
@@ -113,7 +105,6 @@ public class GoogleTaskSynchronizer {
this.preferences = preferences;
this.taskDao = taskDao;
this.tracker = tracker;
- this.notificationManager = notificationManager;
this.googleTaskDao = googleTaskDao;
this.taskCreator = taskCreator;
this.defaultFilterProvider = defaultFilterProvider;
@@ -125,7 +116,7 @@ public class GoogleTaskSynchronizer {
this.gtasksInvoker = gtasksInvoker;
}
- public static void mergeDates(long remoteDueDate, Task local) {
+ static void mergeDates(long remoteDueDate, Task local) {
if (remoteDueDate > 0 && local.hasDueTime()) {
DateTime oldDate = newDateTime(local.getDueDate());
DateTime newDate =
@@ -163,9 +154,6 @@ public class GoogleTaskSynchronizer {
} else {
tracker.reportException(e);
}
- } catch (UserRecoverableAuthIOException e) {
- Timber.e(e);
- sendNotification(context, e.getIntent());
} catch (Exception e) {
account.setError(e.getMessage());
tracker.reportException(e);
@@ -176,25 +164,6 @@ public class GoogleTaskSynchronizer {
}
}
- private void sendNotification(Context context, Intent intent) {
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_FROM_BACKGROUND);
-
- PendingIntent resolve =
- PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
- NotificationCompat.Builder builder =
- new NotificationCompat.Builder(
- context, NotificationManager.NOTIFICATION_CHANNEL_MISCELLANEOUS)
- .setAutoCancel(true)
- .setContentIntent(resolve)
- .setContentTitle(context.getString(R.string.sync_error_permissions))
- .setContentText(
- context.getString(R.string.common_google_play_services_notification_ticker))
- .setAutoCancel(true)
- .setSmallIcon(R.drawable.ic_warning_white_24dp)
- .setTicker(context.getString(R.string.common_google_play_services_notification_ticker));
- notificationManager.notify(Constants.NOTIFICATION_SYNC_ERROR, builder, true, false, false);
- }
-
private void synchronize(GoogleTaskAccount account) throws IOException {
if (!permissionChecker.canAccessAccounts()
|| googleAccountManager.getAccount(account.getAccount()) == null) {
diff --git a/app/src/main/res/drawable-hdpi/ic_warning_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_warning_white_24dp.png
deleted file mode 100644
index 55c68431b..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_warning_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_warning_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_warning_white_24dp.png
deleted file mode 100644
index 04365b98a..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_warning_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_warning_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_warning_white_24dp.png
deleted file mode 100644
index a43fa3c27..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_warning_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_warning_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_warning_white_24dp.png
deleted file mode 100644
index 807b9fa18..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_warning_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 59d581ec9..0555d7a5d 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -388,7 +388,6 @@
Настройки на widget
Настройки на заглавието
Настройки на реда
- Tasks изисква разрешения
Изчистване на завършени задачи?
%s копирани
%s изтрити
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index c9a816967..fd849bf07 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -403,7 +403,6 @@
Je vyžadována hardwarová podpora
Nastavení nadpisu
Nastavení řádku
- Aplikace vyžaduje oprávnění
Smazat splněné úkoly\?
Smazat vybrané úkoly\?
Zkopírovat vybrané úkoly\?
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5b516ef03..aae8a2520 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -379,7 +379,6 @@
Widget-Einstellungen
Kopf-Einstellungen
Reihen-Einstellungen
- Tasks benötigt Zugriff
Erledigte Aufgaben löschen?
%s kopiert
%s gelöscht
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index aee9bc09d..2d0e02682 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -387,7 +387,6 @@
Configuración de widget
Configuración de encabezado
Configuración de fila
- Permiso requerido
¿Borrar tareas completadas?
%s copiadas
%s borradas
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 8b110739c..b11f1e372 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -247,7 +247,6 @@
Vidina seaded
Päise seaded
Rea seaded
- Ülesanded nõuavad õiguseid
%s kustutatud
Kustutada valitud ülesanded\?
Kopeerida valitud ülesanded\?
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 0eeefdcbe..02d59f868 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -393,7 +393,6 @@
Trepetaren ezarpenak
Goiburuaren ezarpenak
Errenkadaren ezarpenak
- Tasks aplikazioak baimenak behar ditu
Garbitu burututako zereginak\?
%s kopiatuta
%s ezabatuta
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 7cd16f630..42e7f8044 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -363,7 +363,6 @@
Widgetin asetukset
Otsikon asetukset
Rivin asetukset
- Tasks vaatii lupaa
Siivoa valmiit tehtävät?
%s kopioitu
%s poistettu
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 799616a3f..674a6a01a 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -369,7 +369,6 @@
Paramètres du widget
Paramètres de l\'en-tête
Paramètres de la colonne
- Autorisation requise
Supprimer les tâches terminées ?
%s copiées
%s supprimées
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index e77f7d868..158e51716 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -284,7 +284,6 @@
Configuración de widget
Configuración de encabezado
Configuración de fila
- Tasks requiere permisos
¿Borrar tareas completadas?
%s copiadas
%s borradas
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 0baf22a2b..c39b7ab9b 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -387,7 +387,6 @@
Widget beállításai
Fejléc beállításai
Sorok beállíátsai
- Engedély szükséges
Elvégzett feladatok törlése?
%s átmásolva
%s törölve
@@ -554,4 +553,4 @@
Az ingyenes próbaidőszak megkezdéséhez válassz a lenti előfizetési díjakból. Bármikor lemondhatod az előfizetést
A támogatásod sokat jelent nekem, köszönöm!
Vissza
-
\ No newline at end of file
+
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index bc903eaa9..181caa0d8 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -359,7 +359,6 @@
Masukan suara
Pengingat suara
Tasks akan mengucapkan nama tugas selama pengingat tugas berjalan
- Tasks membutuhkan izin akses
Tampilkan jumlah tugas pada ikon peluncur Tasks. Tidak semua peluncur mendukung fitur ini.
Gabung beberapa notifikasi menjadi satu notifikasi
pada hari yang sama setiap bulan
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index dc4b3b67d..14e93206c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -384,7 +384,6 @@
Impostazioni widget
Impostazioni intestazione
Impostazioni riga
- L\'attività richiede l\'autorizzazione
Elimino le attività completate?
%s copiati
%s eliminati
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 3da40c9b4..402326822 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -423,7 +423,6 @@
הגדרות ווידג\'ט
הגדרות כותרת
הגדרות שורה
- דרושות הרשאות
למחוק משימות שבוצעו?
%s הועתקו
%s נמחקו
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index c0e534eb6..f1ef241a2 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -385,7 +385,6 @@
ウィジェット設定
ヘッダー設定
行設定
- Tasks はアクセス許可が必要です
完了したタスクをクリアしますか?
%s コピー済
%s 削除済
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index c9530f3a0..c0a487f94 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -388,7 +388,6 @@
위젯 설정
헤더 설정
줄 설정
- Tasks는 권한이 필요합니다
완료한 할일을 지울까요?
%s 복사 완료
%s 삭제 완료
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 63303991c..79f4c5bb7 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -384,7 +384,6 @@
Widget nustatymai
Antraščių nustatymai
Eilutės nustatymai
- Tasks reikalingas leidimas
Išvalyti užbaigtas užduotis?
%s nukopijuota
%s ištrinta
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 2187882a4..80d33b1d7 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -411,7 +411,6 @@
Miniprogramsinnstillinger
Hodeinnstillinger
Radinnstillinger
- Tasks krever tilgang
Tøm fullførte oppgaver\?
%s kopiert
%s slettet
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index fdb0989e1..44ce9d7cb 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -378,7 +378,6 @@
Widget instellingen
Titel instellingen
Regel instellingen
- Permissie vereist
Verwijder voltooide taken?
%s gekopieerd
%s verwijderd
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 45f9dad96..adcdbdb56 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -399,7 +399,6 @@
Ustawienie widgetu
Ustawienia nagłówka
Ustawienia rzędu
- Wymagane uprawnienia
Wyczyścić ukończone zadania?
%s skopiowanych
%s usuniętych
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 789c925c8..8f6f1a461 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -385,7 +385,6 @@
Configurações de Widget
Config. cabeçalho
Congif. entrada
- Tasks precisa de permissão
Limpar tarefas concluídas?
%s copiadas
%s excluídas
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 079d1ed43..25fc33948 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -358,7 +358,6 @@
Definições do widget
Definições de cabeçalho
Definições de linhas
- O Tasks necessita de permissão
Remover tarefas concluídas?
%s copiado
%s apagado
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index ba7db0f01..a1ab0ea27 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -406,7 +406,6 @@
Настройки виджета
Настройки заголовка
Настройки строк
- Требуемые разрешения
Очистить завершенные задачи?
Клонировано %s задач(и)
%s удалено
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index dfa3e0ad1..7a1e55f3e 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -384,7 +384,6 @@
Widget - nastavenia
Nastavenie záhlavia
Nastavenie riadka
- Úlohy vyžadujú povolenia
Vymazať dokončené úlohy?
%s skopírovaných
%s zmazaných
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index b912d025a..2544b28c0 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -387,7 +387,6 @@
Hemskärmsikon
Överskriftsinställningar
Radinställmingar
- Tasks kräver tillstånd
%s kopierade
%s raderade
Radera valda uppgifter\?
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 9749e74a2..8cfc6fef7 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -390,7 +390,6 @@
Widget ayarları
Başlık ayarları
Satır ayarları
- İzin gerekli
Tamamlanan görevleri temizle?
%s kopyalandı
%s silindi
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index c13ded38a..e630065f7 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -388,7 +388,6 @@
Налаштування віджету
Налаштування заголовку
Налаштування рядку
- Завдання потребують дозволу
Видалити завершені завдання?
%s скопійовано
%s видалено
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 48c58dced..76f2bad13 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -370,7 +370,6 @@
插件设置
标题设置
行设置
- 需要授予权限
清除完成的任务?
%s 已复制
%s 已删除
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 482afd100..59ede4a30 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -409,7 +409,6 @@ File %1$s contained %2$s.\n\n
Widget settings
Header settings
Row settings
- Permission required
Clear completed tasks?
%s copied
%s deleted