diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index e7cbdcd64..74b3483d3 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -205,10 +205,6 @@ - - diff --git a/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java b/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java index a9c5eaa4a..126b25daa 100644 --- a/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java +++ b/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java @@ -7,7 +7,6 @@ import android.content.Intent; import android.os.Bundle; import com.todoroo.astrid.data.Task; -import com.todoroo.astrid.service.StartupService; import com.todoroo.astrid.service.TaskCreator; import com.todoroo.astrid.service.TaskService; @@ -25,7 +24,6 @@ import static org.tasks.intents.TaskIntents.getEditTaskStack; */ public final class ShareLinkActivity extends InjectingAppCompatActivity { - @Inject StartupService startupService; @Inject TaskService taskService; @Inject TaskCreator taskCreator; @@ -33,8 +31,6 @@ public final class ShareLinkActivity extends InjectingAppCompatActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - startupService.onStartupApplication(this); - readIntent(); } diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java index 41f364a32..47db0b97b 100644 --- a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java @@ -34,9 +34,7 @@ import com.todoroo.astrid.gtasks.GtasksList; import com.todoroo.astrid.gtasks.GtasksListFragment; import com.todoroo.astrid.gtasks.GtasksListService; import com.todoroo.astrid.repeats.RepeatControlSet; -import com.todoroo.astrid.service.StartupService; import com.todoroo.astrid.service.TaskService; -import com.todoroo.astrid.service.UpgradeActivity; import com.todoroo.astrid.subtasks.SubtasksHelper; import com.todoroo.astrid.subtasks.SubtasksListFragment; import com.todoroo.astrid.subtasks.SubtasksTagListFragment; @@ -84,7 +82,6 @@ public class TaskListActivity extends InjectingAppCompatActivity implements GoogleTaskListSelectionHandler { @Inject Preferences preferences; - @Inject StartupService startupService; @Inject SubtasksHelper subtasksHelper; @Inject TaskService taskService; @Inject RepeatConfirmationReceiver repeatConfirmationReceiver; @@ -99,8 +96,6 @@ public class TaskListActivity extends InjectingAppCompatActivity implements @BindView(R.id.drawer_layout) DrawerLayout drawerLayout; - public static final int REQUEST_UPGRADE = 505; - private NavigationDrawerFragment navigationDrawer; /** For indicating the new list screen should be launched at fragment setup time */ @@ -123,8 +118,6 @@ public class TaskListActivity extends InjectingAppCompatActivity implements currentNightMode = getNightMode(); - startupService.onStartupApplication(this); - setContentView(R.layout.task_list_activity); ButterKnife.bind(this); @@ -399,14 +392,6 @@ public class TaskListActivity extends InjectingAppCompatActivity implements } repopulateNavigationDrawer(); - } else if (requestCode == REQUEST_UPGRADE) { - if (resultCode == RESULT_OK) { - if (data != null && data.getBooleanExtra(UpgradeActivity.EXTRA_RESTART, false)) { - Timber.w("Upgrade requires restart"); - finish(); - startActivity(getIntent()); - } - } } else { super.onActivityResult(requestCode, resultCode, data); } diff --git a/src/main/java/com/todoroo/astrid/core/OldTaskPreferences.java b/src/main/java/com/todoroo/astrid/core/OldTaskPreferences.java index 69847d79f..1a6a4c748 100644 --- a/src/main/java/com/todoroo/astrid/core/OldTaskPreferences.java +++ b/src/main/java/com/todoroo/astrid/core/OldTaskPreferences.java @@ -17,7 +17,6 @@ import com.todoroo.astrid.dao.Database; import com.todoroo.astrid.dao.MetadataDao; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.gcal.GCalHelper; -import com.todoroo.astrid.service.StartupService; import com.todoroo.astrid.service.TaskDeleter; import com.todoroo.astrid.service.TaskService; @@ -32,7 +31,6 @@ import javax.inject.Inject; public class OldTaskPreferences extends InjectingPreferenceActivity { - @Inject StartupService startupService; @Inject DialogBuilder dialogBuilder; @Inject TaskService taskService; @Inject GCalHelper gcalHelper; @@ -45,8 +43,6 @@ public class OldTaskPreferences extends InjectingPreferenceActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - startupService.onStartupApplication(this); - addPreferencesFromResource(R.xml.preferences_oldtasks); findPreference(getString(R.string.EPr_manage_purge_deleted)).setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { diff --git a/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java b/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java index 69e6313db..f3b272725 100644 --- a/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java +++ b/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java @@ -11,7 +11,6 @@ import android.widget.TextView; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.activity.TaskListActivity; -import com.todoroo.astrid.service.StartupService; import org.tasks.R; import org.tasks.dialogs.DialogBuilder; @@ -39,7 +38,6 @@ public class CalendarReminderActivity extends ThemedInjectingAppCompatActivity { // Prompt user to ignore all missed calls after this many ignore presses private static final int IGNORE_PROMPT_COUNT = 3; - @Inject StartupService startupService; @Inject Preferences preferences; @Inject ResourceResolver resourceResolver; @Inject DialogBuilder dialogBuilder; @@ -98,8 +96,6 @@ public class CalendarReminderActivity extends ThemedInjectingAppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - startupService.onStartupApplication(this); - setContentView(R.layout.calendar_reminder_activity); Intent intent = getIntent(); diff --git a/src/main/java/com/todoroo/astrid/service/StartupService.java b/src/main/java/com/todoroo/astrid/service/StartupService.java index b654a5245..61d5ad6fd 100644 --- a/src/main/java/com/todoroo/astrid/service/StartupService.java +++ b/src/main/java/com/todoroo/astrid/service/StartupService.java @@ -5,34 +5,33 @@ */ package com.todoroo.astrid.service; -import android.app.Activity; +import android.content.Context; import android.content.Intent; import android.database.sqlite.SQLiteException; +import android.os.Environment; -import com.todoroo.astrid.activity.TaskListActivity; +import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.dao.Database; import org.tasks.Broadcaster; import org.tasks.BuildConfig; +import org.tasks.R; import org.tasks.analytics.Tracker; +import org.tasks.analytics.Tracking; +import org.tasks.injection.ForApplication; import org.tasks.preferences.Preferences; +import java.io.File; + import javax.inject.Inject; -import javax.inject.Singleton; import timber.log.Timber; -/** - * Service which handles jobs that need to be run when Astrid starts up. - * - * @author Tim Su - * - */ -@Singleton public class StartupService { - // --- application startup + public static final int V4_8_0 = 380; + private final Context context; private final Database database; private final Preferences preferences; private final TaskDeleter taskDeleter; @@ -40,8 +39,9 @@ public class StartupService { private final Tracker tracker; @Inject - public StartupService(Database database, Preferences preferences, TaskDeleter taskDeleter, + public StartupService(@ForApplication Context context, Database database, Preferences preferences, TaskDeleter taskDeleter, Broadcaster broadcaster, Tracker tracker) { + this.context = context; this.database = database; this.preferences = preferences; this.taskDeleter = taskDeleter; @@ -49,17 +49,8 @@ public class StartupService { this.tracker = tracker; } - /** - * bit to prevent multiple initializations - */ - private static boolean hasStartedUp = false; - /** Called when this application is started up */ - public synchronized void onStartupApplication(final Activity activity) { - if(hasStartedUp || activity == null) { - return; - } - + public synchronized void onStartupApplication() { try { database.openForWriting(); } catch (SQLiteException e) { @@ -70,19 +61,19 @@ public class StartupService { // read current version final int lastVersion = preferences.getLastSetVersion(); - int currentVersion = BuildConfig.VERSION_CODE; + final int currentVersion = BuildConfig.VERSION_CODE; Timber.i("Astrid Startup. %s => %s", lastVersion, currentVersion); // invoke upgrade service if(lastVersion != currentVersion) { - if(lastVersion > 0) { - activity.startActivityForResult(new Intent(activity, UpgradeActivity.class) {{ - putExtra(UpgradeActivity.TOKEN_FROM_VERSION, lastVersion); - }}, TaskListActivity.REQUEST_UPGRADE); - } + new Thread() { + @Override + public void run() { + upgrade(lastVersion, currentVersion); + } + }.start(); preferences.setDefaults(); - preferences.setCurrentVersion(currentVersion); } // perform startup activities in a background thread @@ -96,7 +87,37 @@ public class StartupService { if (lastVersion == 0) { broadcaster.firstLaunch(); } + } - hasStartedUp = true; + private void upgrade(int from, int to) { + try { + if (from < V4_8_0) { + performMarshmallowMigration(); + } + if (from > 0) { + tracker.reportEvent(Tracking.Events.UPGRADE, Integer.toString(from)); + } + preferences.setCurrentVersion(to); + } finally { + context.sendBroadcast(new Intent(AstridApiConstants.BROADCAST_EVENT_REFRESH)); + } + } + + private void performMarshmallowMigration() { + try { + // preserve pre-marshmallow default backup location + if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) { + if (!preferences.isStringValueSet(R.string.p_backup_dir)) { + String directory = String.format("%s/astrid", + Environment.getExternalStorageDirectory()); + File file = new File(directory); + if (file.exists() && file.isDirectory()) { + preferences.setString(R.string.p_backup_dir, directory); + } + } + } + } catch (Exception e) { + tracker.reportException(e); + } } } diff --git a/src/main/java/com/todoroo/astrid/service/UpgradeActivity.java b/src/main/java/com/todoroo/astrid/service/UpgradeActivity.java deleted file mode 100644 index 3b1d71563..000000000 --- a/src/main/java/com/todoroo/astrid/service/UpgradeActivity.java +++ /dev/null @@ -1,99 +0,0 @@ -/** - * Copyright (c) 2012 Todoroo Inc - *

- * See the file "LICENSE" for the full license governing this code. - */ -package com.todoroo.astrid.service; - -import android.app.ProgressDialog; -import android.content.Intent; -import android.os.Bundle; -import android.os.Environment; - -import com.todoroo.andlib.utility.DialogUtilities; -import com.todoroo.astrid.api.AstridApiConstants; - -import org.tasks.R; -import org.tasks.dialogs.DialogBuilder; -import org.tasks.injection.ActivityComponent; -import org.tasks.injection.InjectingAppCompatActivity; -import org.tasks.preferences.Preferences; - -import java.io.File; - -import javax.inject.Inject; - -public class UpgradeActivity extends InjectingAppCompatActivity { - - public static final String TOKEN_FROM_VERSION = "from_version"; //$NON-NLS-1$ - - public static final String EXTRA_RESTART = "extra_restart"; - - public static final int V4_8_0 = 380; - public static final int V3_0_0 = 136; - - @Inject DialogBuilder dialogBuilder; - @Inject Preferences preferences; - - private ProgressDialog dialog; - private int from; - private boolean finished = false; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - from = getIntent().getIntExtra(TOKEN_FROM_VERSION, -1); - if (from > 0) { - dialog = dialogBuilder.newProgressDialog(R.string.DLG_upgrading); - new Thread() { - @Override - public void run() { - boolean restartRequired = false; - try { - if (from < V4_8_0) { - performMarshmallowMigration(); - } - } finally { - finished = true; - DialogUtilities.dismissDialog(UpgradeActivity.this, dialog); - sendBroadcast(new Intent(AstridApiConstants.BROADCAST_EVENT_REFRESH)); - Intent data = new Intent(); - data.putExtra(EXTRA_RESTART, restartRequired); - setResult(RESULT_OK, data); - finish(); - } - } - }.start(); - } else { - finished = true; - finish(); - } - } - - @Override - public void inject(ActivityComponent component) { - component.inject(this); - } - - @Override - public void onBackPressed() { - // Don't allow the back button to finish this activity before things are done - if (finished) { - super.onBackPressed(); - } - } - - private void performMarshmallowMigration() { - // preserve pre-marshmallow default backup location - if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) { - if (!preferences.isStringValueSet(R.string.p_backup_dir)) { - String directory = String.format("%s/astrid", - Environment.getExternalStorageDirectory()); - File file = new File(directory); - if (file.exists() && file.isDirectory()) { - preferences.setString(R.string.p_backup_dir, directory); - } - } - } - } -} diff --git a/src/main/java/org/tasks/Tasks.java b/src/main/java/org/tasks/Tasks.java index 70c64a051..fb4e22675 100644 --- a/src/main/java/org/tasks/Tasks.java +++ b/src/main/java/org/tasks/Tasks.java @@ -27,9 +27,6 @@ public class Tasks extends InjectingApplication { @Inject MetadataDao metadataDao; @Inject TagDataDao tagDataDao; @Inject StoreObjectDao storeObjectDao; - @Inject UserActivityDao userActivityDao; - @Inject TaskAttachmentDao taskAttachmentDao; - @Inject TaskListMetadataDao taskListMetadataDao; @Inject TaskService taskService; @Inject TagService tagService; @Inject Broadcaster broadcaster; @@ -49,6 +46,8 @@ public class Tasks extends InjectingApplication { tracker.setTrackingEnabled(preferences.isTrackingEnabled()); themeCache.getThemeBase(preferences.getInt(R.string.p_theme, 0)).setDefaultNightMode(); + + startupService.onStartupApplication(); } @Override diff --git a/src/main/java/org/tasks/analytics/Tracking.java b/src/main/java/org/tasks/analytics/Tracking.java index 293044648..a933551fa 100644 --- a/src/main/java/org/tasks/analytics/Tracking.java +++ b/src/main/java/org/tasks/analytics/Tracking.java @@ -17,6 +17,7 @@ public class Tracking { GTASK_DISABLED(R.string.tracking_category_google_tasks, R.string.tracking_action_off), GTASK_LOGOUT(R.string.tracking_category_google_tasks, R.string.tracking_action_clear), GTASK_MOVE(R.string.tracking_category_google_tasks, R.string.tracking_action_move), + UPGRADE(R.string.tracking_category_event, R.string.tracking_event_upgrade), NIGHT_MODE_MISMATCH(R.string.tracking_category_event, R.string.tracking_event_night_mode_mismatch), SET_PREFERENCE(R.string.tracking_category_preferences, 0); diff --git a/src/main/java/org/tasks/injection/BaseActivityComponent.java b/src/main/java/org/tasks/injection/BaseActivityComponent.java index e43b55a53..e9624d657 100644 --- a/src/main/java/org/tasks/injection/BaseActivityComponent.java +++ b/src/main/java/org/tasks/injection/BaseActivityComponent.java @@ -11,7 +11,6 @@ import com.todoroo.astrid.core.OldTaskPreferences; import com.todoroo.astrid.files.AACRecordingActivity; import com.todoroo.astrid.gcal.CalendarReminderActivity; import com.todoroo.astrid.reminders.ReminderPreferences; -import com.todoroo.astrid.service.UpgradeActivity; import org.tasks.activities.AddAttachmentActivity; import org.tasks.activities.CalendarSelectionActivity; @@ -57,8 +56,6 @@ public interface BaseActivityComponent { void inject(TagSettingsActivity tagSettingsActivity); - void inject(UpgradeActivity upgradeActivity); - void inject(ShareLinkActivity shareLinkActivity); void inject(TaskListActivity taskListActivity); diff --git a/src/main/java/org/tasks/reminders/SnoozeActivity.java b/src/main/java/org/tasks/reminders/SnoozeActivity.java index 75f7f85f8..20951b60c 100644 --- a/src/main/java/org/tasks/reminders/SnoozeActivity.java +++ b/src/main/java/org/tasks/reminders/SnoozeActivity.java @@ -1,20 +1,19 @@ package org.tasks.reminders; -import android.support.v4.app.FragmentManager; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; +import android.support.v4.app.FragmentManager; import com.todoroo.astrid.data.Task; -import com.todoroo.astrid.service.StartupService; import com.todoroo.astrid.service.TaskService; -import org.tasks.injection.ActivityComponent; -import org.tasks.time.DateTime; import org.tasks.activities.DateAndTimePickerActivity; import org.tasks.activities.TimePickerActivity; +import org.tasks.injection.ActivityComponent; import org.tasks.injection.InjectingAppCompatActivity; import org.tasks.notifications.NotificationManager; +import org.tasks.time.DateTime; import javax.inject.Inject; @@ -27,7 +26,6 @@ public class SnoozeActivity extends InjectingAppCompatActivity implements Snooze public static final String EXTRA_TASK_ID = "id"; public static final String EXTRA_SNOOZE_TIME = "snooze_time"; - @Inject StartupService startupService; @Inject TaskService taskService; @Inject NotificationManager notificationManager; @@ -63,8 +61,6 @@ public class SnoozeActivity extends InjectingAppCompatActivity implements Snooze } } - startupService.onStartupApplication(this); - if (intent.hasExtra(EXTRA_SNOOZE_TIME)) { snoozeForTime(new DateTime(intent.getLongExtra(EXTRA_SNOOZE_TIME, 0L))); } else { diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml index d55cae54d..8ce39e5a6 100644 --- a/src/main/res/values-ar/strings.xml +++ b/src/main/res/values-ar/strings.xml @@ -14,7 +14,6 @@ إذن المهام أخذ التصاريح حذف هذه المهمه؟ - ترقية المهام... الوقت (ساعة : دقيقة) تراجع اضغط لتعيين diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml index cb6e27d4e..62d51bc9d 100644 --- a/src/main/res/values-bg-rBG/strings.xml +++ b/src/main/res/values-bg-rBG/strings.xml @@ -29,7 +29,6 @@ Сигурни ли сте че искате да отхвърлите промените си? Продължаване на редактиране Изтриване на тази задача? - Обновяване на твоите задачи... Време (часове: минути) Върни Кликнете, за да зададете diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index 0c5fb428f..61a7af008 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -18,7 +18,6 @@ Permís de l\'Tasks Permís de l\'Tasks Voleu suprimir aquesta tasca? - S\'estan actualitzant les vostres tasques... Temps (hores : minuts) Desfés Prem per establir diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index de5ecb0f3..4d9c28547 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -20,7 +20,6 @@ Tasks Práva Tasks Práva Smazat tento úkol? - Obnovování vašich úkolů... Čas (hodin : minut) Vrátit změny Klikni pro nastavení diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml index fa9b89f6e..9e2564207 100644 --- a/src/main/res/values-da/strings.xml +++ b/src/main/res/values-da/strings.xml @@ -20,7 +20,6 @@ Tasks Tilladelser Tasks Tilladelser Slet denne opgave? - Opgraderer dine opgaver... Tid (timer : minutter) Tryk for at indstille Sorter & skjulte diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 23502b9ca..14315f503 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -24,7 +24,6 @@ Änderungen wirklich verwerfen? Weiter bearbeiten Diese Aufgabe löschen? - Ihre Aufgaben werden aktualisiert … Zeit (Stunden : Minuten) Rückgängig Klicken zur Bestätigung diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index d89488ead..691b74e2b 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -23,7 +23,6 @@ Άδεια εργασιών Άδεια Εργασιών Διαγραφή εργασίας; - Αναβάθμιση των εργασιών σας... Ώρα (ώρες : λεπτά) Αναίρεση Κλικ για καθορισμό diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index ec526cea0..3985f5d0f 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -26,7 +26,6 @@ ¿Quieres descartar los cambios? Seguir editando ¿Borrar esta tarea? - Actualizando sus tareas.... Tiempo (horas : minutos) Deshacer Pulsar para establecer diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 7055c8a41..6632bd38b 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -26,7 +26,6 @@ Etes-vous sûrs de vouloir annuler vos modifications ? Continuer l\'édition Supprimer cette tâche ? - Mise à jour de vos tâches… Temps (heures : minutes) Annuler Action Cliquez pour définir diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index a9afece72..a2646dd94 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -26,7 +26,6 @@ Sicuro di voler annullare tutte le modifiche? Continua modifica Eliminare questa attività? - Aggiornare le attività ... Tempo (ore : minuti) Annulla l\'ultima azione Clicca per Impostare diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml index 1afa3d7cf..5e8b6d0fa 100644 --- a/src/main/res/values-iw/strings.xml +++ b/src/main/res/values-iw/strings.xml @@ -26,7 +26,6 @@ להתעלם מהשינויים ? המשך לערוך למחוק משימה זו? - משדרגת את משימותיך... זמן (שעות : דקות) בטל פעולה אחרונה הקלק כדי לקבוע diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index b31c503ff..de8fa762b 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -26,7 +26,6 @@ 変更を破棄してもよろしいですか? 編集を続ける このタスクを削除しますか? - タスクを更新しています 時間 (時:分) 動作を取り消す 入力する diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index cba8d46fc..a751c45da 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -29,7 +29,6 @@ 변경 사항을 버리시겠습니까? 계속 편집 이 일정을 삭제할까요? - 일정 업그레이드 중... 시간 (시 : 분) 실행 취소 누르세요 diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml index e9e0e1ed9..e205df1f5 100644 --- a/src/main/res/values-nb/strings.xml +++ b/src/main/res/values-nb/strings.xml @@ -18,7 +18,6 @@ Tasks Tillatelse Tasks Tillatelse Slett denne oppgaven? - Oppgraderer oppgavene dine... Tid (timer : minutter) Klikk for å sette Sorter & Skjult diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index e9de762c1..b3aa510cc 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -26,7 +26,6 @@ Weet u zeker dat u de wijzigingen niet wilt opslaan? Blijf editen Taak verwijderen? - Taken bijwerken... Tijd (uren : minuten) Ongedaan Maken Klikken om in te stellen diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index f8d938bf6..2edb6be4e 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -20,7 +20,6 @@ Uprawnienia Tasks Zezwolenia Tasks Usunąć to zadanie? - Uaktualniam Twoje zadania... Czas (godziny : minuty) Cofnij Kliknij, aby ustawić diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index 1bae3cc32..955861fb5 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -21,7 +21,6 @@ Você tem certeza que deseja descartar suas mudanças? Continuar editando Excluir esta tarefa? - Atualizando suas tarefas... Horário (horas:minutos) Desfazer Toque para definir diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml index 1694cd78d..bc4039bec 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -25,7 +25,6 @@ Permissões do Tasks Permissões do Tasks Remover esta tarefa? - Atualização de tarefas... Tempo (horas:minutos) Anular Clique para definir diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 8edce46ad..af3658b50 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -26,7 +26,6 @@ Вы действительно хотите отказаться от сделанных изменений? Продолжайте редактировать Удалить эту задачу? - Обновление ваших задач… Время (час : мин) Отмена Установить diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index 821612fa0..e0f43b444 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -22,7 +22,6 @@ Tasks povolenia Tasks povolenia Vymazať túto úlohu? - Aktualizácia tvojich úloh... Čas (hodiny : minúty) Späť Klikni pre nastavenie diff --git a/src/main/res/values-sl-rSI/strings.xml b/src/main/res/values-sl-rSI/strings.xml index 703cbbc29..1a8c22a49 100644 --- a/src/main/res/values-sl-rSI/strings.xml +++ b/src/main/res/values-sl-rSI/strings.xml @@ -23,7 +23,6 @@ Dovoljenje Opravkom Dovoljenje Opravkom Zbrišem ta opravek? - Nadgrajujem tvoje opravke... Čas (ure : minute) Razveljavi Klikni za nastavitev diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index f3f549dbc..709984c70 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -26,7 +26,6 @@ Är du säker på att du inte vill spara dina ändringar? Fortsätt redigera Radera denna uppgift? - Uppgraderar dina uppgifter... Tid (timmar : minuter Ångra Klicka för att ställa diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml index 079027f84..de41f31e0 100644 --- a/src/main/res/values-tr/strings.xml +++ b/src/main/res/values-tr/strings.xml @@ -20,7 +20,6 @@ Tasks İzni Tasks İzni Bu görev silinsin mi? - Görevleriniz güncelleniyor... Zaman (saat : dakika) Geri al Ayar İçin Dokun diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index 150040e86..c7e2eda82 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -29,7 +29,6 @@ Дійсно хочете скасувати ваші зміни? Продовжити редагування Видалити цю задачу? - Оновлення ваших завдань... Час (години : хвилини) Відмінити Натисніть для установки diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index 701ec0516..f9c7fdf3a 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -20,7 +20,6 @@ 清单小助理权限 清单小助理权限 确认删除？ - 升级您的任务... 时间（小时:分钟） 撤消 点选 diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 2cf21e4bc..79d38288a 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -20,7 +20,6 @@ Tasks 權限 Tasks 權限 確認刪除? - 升級您的工作... 時間 (小時:分鐘) 撤消 點選 diff --git a/src/main/res/values/keys.xml b/src/main/res/values/keys.xml index 95c60cfc7..f602539b7 100644 --- a/src/main/res/values/keys.xml +++ b/src/main/res/values/keys.xml @@ -293,6 +293,7 @@ Off Clear Night Mismatch + Upgrade tesla_unread_enabled purchased_tesla_unread purchased_tasker diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index a8feebd90..d0cef33a7 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -79,9 +79,6 @@ File %1$s contained %2$s.\n\n Delete this task? - - Upgrading your tasks... - Time (hours : minutes)