From 580ab99d91dd92ca3d94947341311c461ef54aa2 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 4 Oct 2013 15:24:18 -0500 Subject: [PATCH] Remove unreachable code actFmPreferenceService.isLoggedIn() always false --- .../astrid/actfm/CommentsFragment.java | 18 +- .../astrid/actfm/TagSettingsActivity.java | 5 +- .../todoroo/astrid/actfm/TagViewFragment.java | 138 ---------- .../astrid/actfm/sync/ActFmSyncService.java | 19 +- .../astrid/actfm/sync/ActFmSyncThread.java | 249 +----------------- .../astrid/activity/TaskEditFragment.java | 10 - .../todoroo/astrid/core/PluginServices.java | 41 --- .../todoroo/astrid/dao/RemoteModelDao.java | 3 - .../astrid/gcal/CalendarAlarmListCreator.java | 30 +-- .../astrid/gtasks/GtasksFilterExposer.java | 5 +- .../astrid/gtasks/GtasksPreferences.java | 44 +--- .../astrid/gtasks/sync/GtasksSyncService.java | 21 +- .../gtasks/sync/GtasksSyncV2Provider.java | 118 +-------- .../astrid/notes/EditNoteActivity.java | 20 -- .../reminders/ReengagementReceiver.java | 16 +- .../astrid/service/UpdateMessageService.java | 2 +- astrid/src/main/res/values-ca/strings.xml | 5 - astrid/src/main/res/values-cs/strings.xml | 2 - astrid/src/main/res/values-de/strings.xml | 11 - astrid/src/main/res/values-es/strings.xml | 9 - astrid/src/main/res/values-fr/strings.xml | 12 - astrid/src/main/res/values-it/strings.xml | 4 - astrid/src/main/res/values-iw/strings.xml | 9 - astrid/src/main/res/values-ja/strings.xml | 3 - astrid/src/main/res/values-ko/strings.xml | 12 - astrid/src/main/res/values-nb/strings.xml | 1 - astrid/src/main/res/values-nl/strings.xml | 12 - astrid/src/main/res/values-pl/strings.xml | 12 - astrid/src/main/res/values-pt-rBR/strings.xml | 4 - astrid/src/main/res/values-ru/strings.xml | 11 - astrid/src/main/res/values-sv/strings.xml | 3 - astrid/src/main/res/values-tr/strings.xml | 3 - astrid/src/main/res/values-uk/strings.xml | 12 - astrid/src/main/res/values-zh-rCN/strings.xml | 3 - astrid/src/main/res/values-zh-rTW/strings.xml | 3 - astrid/src/main/res/values/strings-actfm.xml | 7 - astrid/src/main/res/values/strings-core.xml | 2 - astrid/src/main/res/values/strings-gtasks.xml | 10 - .../src/main/res/values/strings-reminders.xml | 2 - 39 files changed, 48 insertions(+), 843 deletions(-) diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsFragment.java b/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsFragment.java index fbb9cc199..dc5a8627e 100644 --- a/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsFragment.java @@ -220,7 +220,6 @@ public abstract class CommentsFragment extends SherlockListFragment { }); refreshUpdatesList(); - refreshActivity(false); // start a pull in the background } protected void resetPictureButton() { @@ -317,21 +316,8 @@ public abstract class CommentsFragment extends SherlockListFragment { } } } - - @Override - public void runOnErrors(List errors) {/**/} }; - protected void refreshActivity(boolean manual) { - if (actFmPreferenceService.isLoggedIn()) { - if (hasModel()) { - performFetch(manual, doneRunnable); - } else { - doneRunnable.runOnSuccess(); - } - } - } - @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { if(menu.size() > 0) { @@ -339,7 +325,7 @@ public abstract class CommentsFragment extends SherlockListFragment { } MenuItem item; - boolean showCommentsRefresh = actFmPreferenceService.isLoggedIn(); + boolean showCommentsRefresh = false; if (showCommentsRefresh) { Activity activity = getActivity(); if (activity instanceof TaskListActivity) { @@ -360,8 +346,6 @@ public abstract class CommentsFragment extends SherlockListFragment { switch (item.getItemId()) { case MENU_REFRESH_ID: { - - refreshActivity(true); return true; } diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java b/astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java index a42063878..6926f0a50 100644 --- a/astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java @@ -227,9 +227,6 @@ public class TagSettingsActivity extends SherlockFragmentActivity { else if (tagData.getValue(TagData.MEMBER_COUNT) > 0) { leaveListButton.setText(getString(R.string.tag_leave_button)); } - if(actFmPreferenceService.isLoggedIn()) { - findViewById(R.id.tag_silenced_container).setVisibility(View.VISIBLE); - } picture.setDefaultImageDrawable(ResourceDrawableCache.getImageDrawableFromId(getResources(), TagService.getDefaultImageIDForTag(tagData.getUuid()))); picture.setOnClickListener(new OnClickListener() { @@ -308,7 +305,7 @@ public class TagSettingsActivity extends SherlockFragmentActivity { JSONArray members = new JSONArray(); - if(members.length() > 0 && !actFmPreferenceService.isLoggedIn()) { + if(members.length() > 0) { if(newName.length() > 0 && oldName.length() == 0) { tagDataService.save(tagData); } diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java b/astrid/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java index 1a7ca5674..23465aeff 100644 --- a/astrid/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java @@ -9,7 +9,6 @@ import android.app.Activity; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; @@ -28,16 +27,11 @@ import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.NotificationManager; import com.todoroo.andlib.service.NotificationManager.AndroidNotificationManager; -import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DateUtilities; -import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.astrid.actfm.sync.ActFmPreferenceService; import com.todoroo.astrid.actfm.sync.ActFmSyncService; -import com.todoroo.astrid.actfm.sync.ActFmSyncThread; -import com.todoroo.astrid.actfm.sync.ActFmSyncThread.SyncMessageCallback; -import com.todoroo.astrid.actfm.sync.messages.BriefMe; import com.todoroo.astrid.activity.AstridActivity; import com.todoroo.astrid.activity.FilterListFragment; import com.todoroo.astrid.activity.TaskListActivity; @@ -47,31 +41,24 @@ import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.FilterWithCustomIntent; import com.todoroo.astrid.core.SortHelper; import com.todoroo.astrid.dao.MetadataDao; -import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria; import com.todoroo.astrid.dao.TagDataDao; import com.todoroo.astrid.dao.TagMetadataDao; import com.todoroo.astrid.dao.TaskListMetadataDao; import com.todoroo.astrid.dao.UserDao; import com.todoroo.astrid.data.RemoteModel; -import com.todoroo.astrid.data.SyncFlags; import com.todoroo.astrid.data.TagData; -import com.todoroo.astrid.data.TagMetadata; import com.todoroo.astrid.data.Task; -import com.todoroo.astrid.data.TaskListMetadata; import com.todoroo.astrid.service.SyncV2Service; import com.todoroo.astrid.service.TagDataService; import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.subtasks.SubtasksTagListFragment; import com.todoroo.astrid.tags.TagFilterExposer; import com.todoroo.astrid.tags.TagService; -import com.todoroo.astrid.tags.TaskToTagMetadata; import com.todoroo.astrid.utility.AstridPreferences; import com.todoroo.astrid.utility.Flags; -import org.json.JSONArray; import org.tasks.R; -import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; public class TagViewFragment extends TaskListFragment { @@ -187,16 +174,6 @@ public class TagViewFragment extends TaskListFragment { return R.layout.task_list_body_tag; } - @Override - protected void addSyncRefreshMenuItem(Menu menu, int themeFlags) { - if(actFmPreferenceService.isLoggedIn()) { - addMenuItem(menu, R.string.actfm_TVA_menu_refresh, - ThemeService.getDrawable(R.drawable.icn_menu_refresh, themeFlags), MENU_REFRESH_ID, true); - } else { - super.addSyncRefreshMenuItem(menu, themeFlags); - } - } - @Override protected void addMenuItems(Menu menu, Activity activity) { super.addMenuItems(menu, activity); @@ -299,123 +276,10 @@ public class TagViewFragment extends TaskListFragment { if(DateUtilities.now() - lastAutosync > AUTOSYNC_INTERVAL) { tagData.setValue(TagData.LAST_AUTOSYNC, DateUtilities.now()); tagDataDao.saveExisting(tagData); - refreshData(); } } } - /** refresh the list with latest data from the web */ - private void refreshData() { - if (actFmPreferenceService.isLoggedIn() && tagData != null && !RemoteModel.isUuidEmpty(tagData.getUuid())) { - ((TextView)taskListView.findViewById(android.R.id.empty)).setText(R.string.DLG_loading); - - SyncMessageCallback callback = new SyncMessageCallback() { - @Override - public void runOnSuccess() { - synchronized(this) { - Activity activity = getActivity(); - if (activity != null) { - activity.runOnUiThread(new Runnable() { - @Override - public void run() { - try { - reloadTagData(false); - refresh(); - ((TextView)taskListView.findViewById(android.R.id.empty)).setText(R.string.TLA_no_items); - } catch (Exception e) { - // Can happen when swipe between lists is on - } - } - }); - } - } - } - @Override - public void runOnErrors(List errors) { - Activity activity = getActivity(); - if (activity != null && activity instanceof TaskListActivity) { - boolean notAuthorized = false; - for (JSONArray error : errors) { - String errorCode = error.optString(1); - if ("not_authorized".equals(errorCode)) { //$NON-NLS-1$ - notAuthorized = true; - break; - } - } - - final String tagName = tagData.getValue(TagData.NAME); - if (notAuthorized) { - final TaskListActivity tla = (TaskListActivity) activity; - tla.runOnUiThread(new Runnable() { - @Override - public void run() { - DialogUtilities.okCancelCustomDialog(tla, - tla.getString(R.string.actfm_tag_not_authorized_title), - tla.getString(R.string.actfm_tag_not_authorized_body, tagName), - R.string.actfm_tag_not_authorized_new_list, - R.string.actfm_tag_not_authorized_leave_list, - android.R.drawable.ic_dialog_alert, - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - String oldUuid = tagData.getUuid(); - tagData.setValue(TagData.DELETION_DATE, DateUtilities.now()); - tagData.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true); - tagDataDao.saveExisting(tagData); - - // TODO: Make this better - tagData.clearValue(TagData.ID); - tagData.clearValue(TagData.UUID); - tagData.clearValue(TagData.USER_ID); - tagData.clearValue(TagData.DELETION_DATE); - tagData.setValue(TagData.CREATION_DATE, DateUtilities.now()); - tagDataDao.createNew(tagData); - String newUuid = tagData.getUuid(); - - TodorooCursor tasks = taskService.fetchFiltered(filter.getSqlQuery(), null, Task.ID, Task.UUID, Task.USER_ID); - try { - Task t = new Task(); - for (tasks.moveToFirst(); !tasks.isAfterLast(); tasks.moveToNext()) { - t.clear(); - t.readFromCursor(tasks); - if (Task.USER_ID_SELF.equals(t.getValue(Task.USER_ID))) { - tagService.createLink(t, tagName, newUuid); - } - } - } finally { - tasks.close(); - } - tagService.deleteTagMetadata(oldUuid); - - Filter newFilter = TagFilterExposer.filterFromTagData(tla, tagData); - tla.onFilterItemClicked(newFilter); - } - }, - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - String uuid = tagData.getUuid(); - tagDataDao.delete(tagData.getId()); - metadataDao.deleteWhere(Criterion.and(MetadataCriteria.withKey(TaskToTagMetadata.KEY), TaskToTagMetadata.TAG_UUID.eq(uuid))); - tagMetadataDao.deleteWhere(TagMetadata.TAG_UUID.eq(uuid)); - tla.switchToActiveTasks(); - } - }); - } - }); - } - - } - } - }; - - ActFmSyncThread.getInstance().repopulateQueueFromOutstandingTables(); - ActFmSyncThread.getInstance().enqueueMessage(new BriefMe(Task.class, null, tagData.getValue(TagData.TASKS_PUSHED_AT), BriefMe.TAG_ID_KEY, tagData.getUuid()), callback); - ActFmSyncThread.getInstance().enqueueMessage(new BriefMe(TagData.class, tagData.getUuid(), tagData.getValue(TagData.PUSHED_AT)), callback); - ActFmSyncThread.getInstance().enqueueMessage(new BriefMe(TaskListMetadata.class, null, tagData.getValue(TagData.METADATA_PUSHED_AT), BriefMe.TAG_ID_KEY, tagData.getUuid()), callback); - } - } - protected void setUpMembersGallery() { getView().findViewById(R.id.members_header).setVisibility(View.GONE); } @@ -438,7 +302,6 @@ public class TagViewFragment extends TaskListFragment { //refreshUpdatesList(); } }); - refreshData(); NotificationManager nm = new AndroidNotificationManager(ContextManager.getContext()); try { @@ -521,7 +384,6 @@ public class TagViewFragment extends TaskListFragment { // handle my own menus switch (id) { case MENU_REFRESH_ID: - refreshData(); return true; case MENU_LIST_SETTINGS_ID: settingsListener.onClick(null); diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/sync/ActFmSyncService.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/ActFmSyncService.java index 959d7579e..653263200 100644 --- a/astrid/src/main/java/com/todoroo/astrid/actfm/sync/ActFmSyncService.java +++ b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/ActFmSyncService.java @@ -5,13 +5,6 @@ */ package com.todoroo.astrid.actfm.sync; -import java.io.IOException; -import java.util.List; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - import android.util.Log; import com.todoroo.andlib.service.Autowired; @@ -23,6 +16,12 @@ import com.todoroo.astrid.data.User; import com.todoroo.astrid.service.TagDataService; import com.todoroo.astrid.tags.reusable.FeaturedListFilterExposer; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; + /** * Service for synchronizing data on Astrid.com server with local. * @@ -88,11 +87,7 @@ public final class ActFmSyncService { } private boolean checkForToken() { - if(!actFmPreferenceService.isLoggedIn()) { - return false; - } - token = actFmPreferenceService.getToken(); - return true; + return false; } // --- json reader helper diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java index 985f091d5..80757532e 100644 --- a/astrid/src/main/java/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java +++ b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java @@ -1,14 +1,9 @@ package com.todoroo.astrid.actfm.sync; -import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import android.content.pm.PackageInfo; -import android.content.pm.PackageManager; import android.net.ConnectivityManager; -import android.net.NetworkInfo; -import android.support.v4.app.NotificationCompat; import android.util.Log; import com.todoroo.andlib.data.TodorooCursor; @@ -21,14 +16,9 @@ import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.Preferences; -import com.todoroo.astrid.actfm.sync.messages.BriefMe; import com.todoroo.astrid.actfm.sync.messages.ChangesHappened; import com.todoroo.astrid.actfm.sync.messages.ClientToServerMessage; -import com.todoroo.astrid.actfm.sync.messages.JSONPayloadBuilder; import com.todoroo.astrid.actfm.sync.messages.NameMaps; -import com.todoroo.astrid.actfm.sync.messages.ReplayOutstandingEntries; -import com.todoroo.astrid.actfm.sync.messages.ReplayTaskListMetadataOutstanding; -import com.todoroo.astrid.actfm.sync.messages.ServerToClientMessage; import com.todoroo.astrid.actfm.sync.messages.TaskListMetadataChangesHappened; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.core.PluginServices; @@ -46,31 +36,17 @@ import com.todoroo.astrid.dao.UserActivityOutstandingDao; import com.todoroo.astrid.data.OutstandingEntry; import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.data.TagData; -import com.todoroo.astrid.data.TagOutstanding; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.TaskAttachment; import com.todoroo.astrid.data.TaskListMetadata; import com.todoroo.astrid.data.TaskListMetadataOutstanding; -import com.todoroo.astrid.data.TaskOutstanding; -import com.todoroo.astrid.data.User; import com.todoroo.astrid.data.UserActivity; -import com.todoroo.astrid.utility.Constants; -import com.todoroo.astrid.widget.TasksWidget; -import org.apache.http.entity.mime.MultipartEntity; -import org.json.JSONArray; -import org.json.JSONObject; -import org.tasks.R; - -import java.io.IOException; -import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Set; public class ActFmSyncThread { @@ -111,17 +87,12 @@ public class ActFmSyncThread { @Autowired private TaskListMetadataOutstandingDao taskListMetadataOutstandingDao; - private String token; - - private boolean isTimeForBackgroundSync = false; - private final NotificationManager notificationManager; private int notificationId = -1; public static interface SyncMessageCallback { public void runOnSuccess(); - public void runOnErrors(List errors); } public static enum ModelType { @@ -213,35 +184,21 @@ public class ActFmSyncThread { } } - public synchronized void setTimeForBackgroundSync(boolean isTimeForBackgroundSync) { - this.isTimeForBackgroundSync = isTimeForBackgroundSync; - if (isTimeForBackgroundSync) { - synchronized (monitor) { - monitor.notifyAll(); - } - } - } - public static final SyncMessageCallback DEFAULT_REFRESH_RUNNABLE = new SyncMessageCallback() { @Override public void runOnSuccess() { Intent refresh = new Intent(AstridApiConstants.BROADCAST_EVENT_REFRESH); ContextManager.getContext().sendBroadcast(refresh); } - - @Override - public void runOnErrors(List errors) {/**/} }; private void sync() { try { - int batchSize = 4; - List> messageBatch = new ArrayList>(); while(true) { synchronized(monitor) { - while ((pendingMessages.isEmpty() && !timeForBackgroundSync()) || !actFmPreferenceService.isLoggedIn()) { + while (true) { try { - if ((pendingMessages.isEmpty() || !actFmPreferenceService.isLoggedIn()) && notificationId >= 0) { + if (notificationId >= 0) { notificationManager.cancel(notificationId); notificationId = -1; } @@ -252,110 +209,6 @@ public class ActFmSyncThread { } } } - - boolean recordSyncSuccess = true; - if (timeForBackgroundSync()) { - repopulateQueueFromOutstandingTables(); - enqueueMessage(BriefMe.instantiateBriefMeForClass(TaskListMetadata.class, NameMaps.PUSHED_AT_TASK_LIST_METADATA), DEFAULT_REFRESH_RUNNABLE); - enqueueMessage(BriefMe.instantiateBriefMeForClass(Task.class, NameMaps.PUSHED_AT_TASKS), DEFAULT_REFRESH_RUNNABLE); - enqueueMessage(BriefMe.instantiateBriefMeForClass(TagData.class, NameMaps.PUSHED_AT_TAGS), DEFAULT_REFRESH_RUNNABLE); - enqueueMessage(BriefMe.instantiateBriefMeForClass(User.class, NameMaps.PUSHED_AT_USERS), DEFAULT_REFRESH_RUNNABLE); - setTimeForBackgroundSync(false); - } - - while (messageBatch.size() < batchSize && !pendingMessages.isEmpty()) { - ClientToServerMessage message = pendingMessages.remove(0); - if (message != null) { - messageBatch.add(message); - } - } - - if (!messageBatch.isEmpty() && checkForToken()) { - JSONPayloadBuilder payload = new JSONPayloadBuilder(); - MultipartEntity entity = new MultipartEntity(); - boolean containsChangesHappened = false; - for (int i = 0; i < messageBatch.size(); i++) { - ClientToServerMessage message = messageBatch.get(i); - boolean success = payload.addMessage(message, entity); - if (success) { - if (message instanceof ChangesHappened) { - containsChangesHappened = true; - } - } else { - messageBatch.remove(i); - i--; - } - - } - - if (payload.getMessageCount() == 0) { - messageBatch.clear(); - continue; - } - - setupNotification(); - - payload.addJSONObject(getClientVersion()); - - JSONArray errors = null; - try { - JSONObject response = actFmInvoker.postSync(payload.closeAndReturnString(), entity, containsChangesHappened, token); - // process responses - String time = response.optString("time"); - JSONArray serverMessagesJson = response.optJSONArray("messages"); - if (serverMessagesJson != null) { - setWidgetSuppression(true); - for (int i = 0; i < serverMessagesJson.length(); i++) { - JSONObject serverMessageJson = serverMessagesJson.optJSONObject(i); - if (serverMessageJson != null) { - ServerToClientMessage serverMessage = ServerToClientMessage.instantiateMessage(serverMessageJson); - if (serverMessage != null) { - serverMessage.processMessage(time); - } else { - syncLog("Index " + i + " unable to instantiate message " + serverMessageJson.toString()); - } - } - } - errors = response.optJSONArray("errors"); - boolean errorsExist = (errors != null && errors.length() > 0); - replayOutstandingChanges(errorsExist); - setWidgetSuppression(false); - } - - batchSize = Math.max(12, Math.min(batchSize, messageBatch.size()) * 2); - - if (recordSyncSuccess) { - actFmPreferenceService.setLastError(null, null); - actFmPreferenceService.recordSuccessfulSync(); - } - } catch (IOException e) { - Log.e(ERROR_TAG, "IOException", e); - batchSize = Math.max(batchSize / 2, 1); - } - - Set callbacksExecutedThisLoop = new HashSet(); - Map> errorMap = buildErrorMap(errors); - for (int i = 0; i < messageBatch.size(); i++) { - ClientToServerMessage message = messageBatch.get(i); - try { - SyncMessageCallback r = pendingCallbacks.remove(message); - if (r != null && !callbacksExecutedThisLoop.contains(r)) { - List errorList = errorMap.get(i); - if (errorList == null || errorList.isEmpty()) { - r.runOnSuccess(); - } else { - r.runOnErrors(errorList); - } - - callbacksExecutedThisLoop.add(r); - } - } catch (Exception e) { - Log.e(ERROR_TAG, "Unexpected exception executing sync callback", e); - } - } - - messageBatch.clear(); - } } } catch (Exception e) { // In the worst case, restart thread if something goes wrong @@ -366,70 +219,6 @@ public class ActFmSyncThread { } - private Map> buildErrorMap(JSONArray errors) { - Map> result = new HashMap>(); - if (errors != null) { - for (int i = 0; i < errors.length(); i++) { - JSONArray error = errors.optJSONArray(i); - if (error != null && error.length() > 0) { - int index = error.optInt(0); - List errorList = result.get(index); - if (errorList == null) { - errorList = new LinkedList(); - result.put(index, errorList); - } - errorList.add(error); - } - } - } - return result; - } - - // Reapplies changes still in the outstanding tables to the local database - // Called after a batch has finished processing - private void replayOutstandingChanges(boolean afterErrors) { - syncLog("Replaying outstanding changes"); //$NON-NLS-1$ - new ReplayOutstandingEntries(Task.class, NameMaps.TABLE_ID_TASKS, taskDao, taskOutstandingDao, afterErrors).execute(); - new ReplayOutstandingEntries(TagData.class, NameMaps.TABLE_ID_TAGS, tagDataDao, tagOutstandingDao, afterErrors).execute(); - new ReplayTaskListMetadataOutstanding(taskListMetadataDao, taskListMetadataOutstandingDao, afterErrors).execute(); - } - - private boolean timeForBackgroundSync() { - return isTimeForBackgroundSync; - } - - private void setWidgetSuppression(boolean suppress) { - long date = suppress ? DateUtilities.now() : 0; - TasksWidget.suppressUpdateFlag = date; - - if (date == 0) { - Context context = ContextManager.getContext(); - if (context != null) { - TasksWidget.updateWidgets(context); - } - } - } - - private JSONObject clientVersion = null; - - private JSONObject getClientVersion() { - if (clientVersion == null) { - try { - PackageManager pm = ContextManager.getContext().getPackageManager(); - PackageInfo pi = pm.getPackageInfo(Constants.PACKAGE, PackageManager.GET_META_DATA); - JSONObject message = new JSONObject(); - message.put(ClientToServerMessage.TYPE_KEY, "ClientVersion"); - message.put("platform", "android"); - message.put("versionName", pi.versionName); - message.put("versionCode", pi.versionCode); - clientVersion = message; - } catch (Exception e) { - Log.e(ERROR_TAG, "Error getting client version", e); - } - } - return clientVersion; - } - public void repopulateQueueFromOutstandingTables() { syncLog("Constructing queue from outstanding tables"); //$NON-NLS-1$ constructChangesHappenedFromOutstandingTable(Task.class, taskDao, taskOutstandingDao); @@ -462,33 +251,6 @@ public class ActFmSyncThread { } } - private void setupNotification() { - try { - NotificationCompat.Builder builder = new NotificationCompat.Builder(ContextManager.getContext()); - builder.setContentText(ContextManager.getString(R.string.actfm_sync_ongoing)) - .setContentTitle(ContextManager.getString(R.string.app_name)) - .setOngoing(true) - .setSmallIcon(android.R.drawable.stat_notify_sync) - .setContentIntent(PendingIntent.getActivity(ContextManager.getContext().getApplicationContext(), 0, new Intent(), 0)); - - - notificationManager.notify(0, builder.getNotification()); - notificationId = 0; - } catch (Exception e) { - Log.e(ERROR_TAG, "Exception creating notification", e); //$NON-NLS-1$ - } catch (Error e) { - Log.e(ERROR_TAG, "Error creating notification", e); //$NON-NLS-1$ - } - } - - private boolean checkForToken() { - if(!actFmPreferenceService.isLoggedIn()) { - return false; - } - token = actFmPreferenceService.getToken(); - return true; - } - public static void syncLog(String message) { if (ActFmInvoker.SYNC_DEBUG) { Log.e(ERROR_TAG, message); @@ -502,12 +264,7 @@ public class ActFmSyncThread { public void onReceive(Context context, Intent intent) { lastSyncFromNetworkChange = Preferences.getLong(PREF_LAST_SYNC_FROM_NETWORK_CHANGE, 0L); if (DateUtilities.now() - lastSyncFromNetworkChange > DateUtilities.ONE_MINUTE * 10) { - NetworkInfo info = intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK_INFO); - if (info != null && NetworkInfo.State.CONNECTED.equals(info.getState()) && PluginServices.getActFmPreferenceService().isLoggedIn()) { - ActFmSyncThread syncThread = ActFmSyncThread.getInstance(); - syncThread.repopulateQueueFromOutstandingTables(); - Preferences.setLong(PREF_LAST_SYNC_FROM_NETWORK_CHANGE, DateUtilities.now()); - } + intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK_INFO); } } } diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java index 6e3823578..978632f2f 100755 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -1109,16 +1109,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); } } - - boolean wouldShowComments = actFmPreferenceService.isLoggedIn() && menu.findItem(MENU_COMMENTS_REFRESH_ID) == null; - if(wouldShowComments && showEditComments) { - item = menu.add(Menu.NONE, MENU_COMMENTS_REFRESH_ID, Menu.NONE, - R.string.ENA_refresh_comments); - item.setIcon(R.drawable.icn_menu_refresh_dark); - } else if (wouldShowComments && !showEditComments) { - item = menu.add(Menu.NONE, MENU_SHOW_COMMENTS_ID, Menu.NONE, R.string.TEA_menu_comments); - item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); - } } @Override diff --git a/astrid/src/main/java/com/todoroo/astrid/core/PluginServices.java b/astrid/src/main/java/com/todoroo/astrid/core/PluginServices.java index 00f8015f7..c840437bf 100644 --- a/astrid/src/main/java/com/todoroo/astrid/core/PluginServices.java +++ b/astrid/src/main/java/com/todoroo/astrid/core/PluginServices.java @@ -5,15 +5,11 @@ */ package com.todoroo.astrid.core; -import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.ExceptionService; -import com.todoroo.andlib.sql.Query; -import com.todoroo.astrid.actfm.sync.ActFmPreferenceService; import com.todoroo.astrid.dao.Database; import com.todoroo.astrid.dao.HistoryDao; -import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria; import com.todoroo.astrid.dao.StoreObjectDao; import com.todoroo.astrid.dao.TagDataDao; import com.todoroo.astrid.dao.TagMetadataDao; @@ -27,9 +23,7 @@ import com.todoroo.astrid.dao.TaskOutstandingDao; import com.todoroo.astrid.dao.UserActivityDao; import com.todoroo.astrid.dao.UserActivityOutstandingDao; import com.todoroo.astrid.dao.UserDao; -import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.gtasks.GtasksPreferenceService; -import com.todoroo.astrid.service.AddOnService; import com.todoroo.astrid.service.AstridDependencyInjector; import com.todoroo.astrid.service.MetadataService; import com.todoroo.astrid.service.TagDataService; @@ -61,9 +55,6 @@ public final class PluginServices { @Autowired TagMetadataDao tagMetadataDao; - @Autowired - AddOnService addOnService; - @Autowired TagDataService tagDataService; @@ -103,9 +94,6 @@ public final class PluginServices { @Autowired TaskListMetadataOutstandingDao taskListMetadataOutstandingDao; - @Autowired - ActFmPreferenceService actFmPreferenceService; - @Autowired GtasksPreferenceService gtasksPreferenceService; @@ -181,10 +169,6 @@ public final class PluginServices { return getInstance().metadataService; } - public static AddOnService getAddOnService() { - return getInstance().addOnService; - } - public static StoreObjectDao getStoreObjectDao() { return getInstance().storeObjectDao; } @@ -213,32 +197,7 @@ public final class PluginServices { return getInstance().taskListMetadataOutstandingDao; } - public static ActFmPreferenceService getActFmPreferenceService() { - return getInstance().actFmPreferenceService; - } - public static GtasksPreferenceService getGtasksPreferenceService() { return getInstance().gtasksPreferenceService; } - - // -- helpers - - /** - * Find the corresponding metadata for this task - */ - public static Metadata getMetadataByTaskAndWithKey(long taskId, String metadataKey) { - TodorooCursor cursor = PluginServices.getMetadataService().query(Query.select( - Metadata.PROPERTIES).where(MetadataCriteria.byTaskAndwithKey(taskId, metadataKey))); - try { - if(cursor.getCount() > 0) { - cursor.moveToNext(); - return new Metadata(cursor); - } else { - return null; - } - } finally { - cursor.close(); - } - - } } diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/RemoteModelDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/RemoteModelDao.java index e2ac9dfbd..91a65b9ba 100644 --- a/astrid/src/main/java/com/todoroo/astrid/dao/RemoteModelDao.java +++ b/astrid/src/main/java/com/todoroo/astrid/dao/RemoteModelDao.java @@ -48,9 +48,6 @@ public class RemoteModelDao extends DatabaseDao match = taskService.query(Query.select(Task.ID, Task.UUID) - .join(Join.left(Metadata.TABLE, Criterion.and(Metadata.KEY.eq(GtasksMetadata.METADATA_KEY), Metadata.TASK.eq(Task.ID)))) - .where(Criterion.and(Task.TITLE.eq(title), GtasksMetadata.ID.isNull()))); - try { - if (match.getCount() > 0) { - match.moveToFirst(); - task.setId(match.get(Task.ID)); - task.setUuid(match.get(Task.UUID)); - } - } finally { - match.close(); - } - } - private void mergeDates(Task remote, Task local) { if(remote.hasDueDate() && local.hasDueTime()) { Date newDate = new Date(remote.getValue(Task.DUE_DATE)); @@ -417,67 +390,4 @@ public class GtasksSyncV2Provider extends SyncV2Provider { remote.setValue(Task.DUE_DATE, setDate); } } - - private void finishImport(SyncResultCallback callback) { - TodorooCursor tasks = taskService.query(Query.select(Task.ID, Task.UUID, Task.TITLE, GtasksList.NAME) - .join(Join.inner(Metadata.TABLE, Task.ID.eq(Metadata.TASK))) - .join(Join.left(StoreObject.TABLE, GtasksMetadata.LIST_ID.eq(GtasksList.REMOTE_ID))) - .where(MetadataCriteria.withKey(GtasksMetadata.METADATA_KEY))); - - GtasksImportCallback gtCallback = null; - if (callback instanceof GtasksImportCallback) { - gtCallback = (GtasksImportCallback) callback; - } - - try { - for (tasks.moveToFirst(); !tasks.isAfterLast(); tasks.moveToNext()) { - String listName = tasks.get(GtasksList.NAME); - String tagUuid = RemoteModel.NO_UUID; - if (!TextUtils.isEmpty(listName)) { - TodorooCursor existingTag = tagDataDao.query(Query.select(TagData.UUID).where(TagData.NAME.eq(listName))); - try { - if (existingTag.getCount() > 0) { - existingTag.moveToFirst(); - tagUuid = existingTag.get(TagData.UUID); - - boolean taskIsInTag = metadataDao.taskIsInTag(tasks.get(Task.UUID), tagUuid); - - if (tagMetadataDao.tagHasMembers(tagUuid) && !taskIsInTag) { - GtasksImportTuple tuple = new GtasksImportTuple(); - tuple.taskId = tasks.get(Task.ID); - tuple.taskName = tasks.get(Task.TITLE); - tuple.taskUuid = tasks.get(Task.UUID); - tuple.tagUuid = tagUuid; - tuple.tagName = listName; - - if (gtCallback != null) { - gtCallback.addImportConflict(tuple); - } - - continue; - } else if (taskIsInTag) { - continue; - } - } else { - TagData td = new TagData(); - td.setValue(TagData.NAME, listName); - tagDataDao.createNew(td); - tagUuid = td.getUuid(); - } - } finally { - existingTag.close(); - } - - if (!RemoteModel.isUuidEmpty(tagUuid)) { - Task task = new Task(); - task.setId(tasks.get(Task.ID)); - task.setUuid(tasks.get(Task.UUID)); - tagService.createLink(task, listName, tagUuid); - } - } - } - } finally { - tasks.close(); - } - } } diff --git a/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java index b4cccc034..d6768b2af 100644 --- a/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java @@ -70,7 +70,6 @@ import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.timers.TimerActionControlSet.TimerActionListener; import com.todoroo.astrid.utility.ResourceDrawableCache; -import org.json.JSONArray; import org.json.JSONObject; import org.tasks.R; @@ -142,8 +141,6 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene } } } - @Override - public void runOnErrors(List errors) {/**/} }; private static boolean respondToPicture = false; @@ -205,22 +202,8 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene } setUpInterface(); setUpListAdapter(); - - if(actFmPreferenceService.isLoggedIn()) { - long pushedAt = task.getValue(Task.USER_ACTIVITIES_PUSHED_AT); - if(DateUtilities.now() - pushedAt > DateUtilities.ONE_HOUR / 2) { - refreshData(); - } else { - loadingText.setText(R.string.ENA_no_comments); - if(items.size() == 0) { - loadingText.setVisibility(View.VISIBLE); - } - } - } } - - // --- UI preparation private void setUpInterface() { @@ -493,9 +476,6 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene }); } } - - @Override - public void runOnErrors(List errors) {/**/} }); new FetchHistory(taskDao, Task.HISTORY_FETCH_DATE, Task.HISTORY_HAS_MORE, NameMaps.TABLE_ID_TASKS, task.getUuid(), task.getValue(Task.TITLE), task.getValue(Task.HISTORY_FETCH_DATE), 0, callback).execute(); diff --git a/astrid/src/main/java/com/todoroo/astrid/reminders/ReengagementReceiver.java b/astrid/src/main/java/com/todoroo/astrid/reminders/ReengagementReceiver.java index defaea470..e654371a0 100644 --- a/astrid/src/main/java/com/todoroo/astrid/reminders/ReengagementReceiver.java +++ b/astrid/src/main/java/com/todoroo/astrid/reminders/ReengagementReceiver.java @@ -5,8 +5,6 @@ */ package com.todoroo.astrid.reminders; -import org.json.JSONObject; - import android.app.Notification; import android.app.PendingIntent; import android.content.BroadcastReceiver; @@ -15,9 +13,7 @@ import android.content.Context; import android.content.Intent; import android.graphics.Color; import android.os.Bundle; -import android.text.TextUtils; -import org.tasks.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; @@ -37,6 +33,8 @@ import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.utility.Constants; import com.todoroo.astrid.utility.Flags; +import org.tasks.R; + public class ReengagementReceiver extends BroadcastReceiver { @Autowired ActFmPreferenceService actFmPreferenceService; @@ -72,16 +70,6 @@ public class ReengagementReceiver extends BroadcastReceiver { String title = Notifications.getRandomReminder(context.getResources().getStringArray(R.array.rmd_reengage_notif_titles)); if (title.contains("%s")) { //$NON-NLS-1$ String name = ""; //$NON-NLS-1$ - if (actFmPreferenceService.isLoggedIn()) { - JSONObject thisUser = ActFmPreferenceService.thisUser(); - name = thisUser.optString("first_name"); //$NON-NLS-1$ - if (TextUtils.isEmpty(name)) { - name = thisUser.optString("name"); //$NON-NLS-1$ - } - if (TextUtils.isEmpty(name)) { - name = context.getString(R.string.rmd_reengage_name_default); - } - } title = String.format(title, name); } diff --git a/astrid/src/main/java/com/todoroo/astrid/service/UpdateMessageService.java b/astrid/src/main/java/com/todoroo/astrid/service/UpdateMessageService.java index 459224be9..1bed9b0bf 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/UpdateMessageService.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/UpdateMessageService.java @@ -352,7 +352,7 @@ public class UpdateMessageService { String url = URL + "?version=" + versionCode + "&" + "language=" + Locale.getDefault().getISO3Language() + "&" + "market=" + Constants.MARKET_STRATEGY.strategyId() + "&" + - "actfm=" + (actFmPreferenceService.isLoggedIn() ? "1" : "0") + "&" + + "actfm=0" + "&" + "premium=1"; String result = restClient.get(url); //$NON-NLS-1$ if(TextUtils.isEmpty(result)) { diff --git a/astrid/src/main/res/values-ca/strings.xml b/astrid/src/main/res/values-ca/strings.xml index 72d0f8920..ac1fd3316 100644 --- a/astrid/src/main/res/values-ca/strings.xml +++ b/astrid/src/main/res/values-ca/strings.xml @@ -31,10 +31,6 @@ L\'operació s\'ha realitzat correctament. Tarea copiada No tarea a copiar - No autorizado - Crear una nueva lista - Abandonar la lista - Sincronització en curs... Alarmes Afegeix una alarma @@ -180,7 +176,6 @@ Mostra a la meva llista Carrega més... Quan venç? - Tasca nova En/na %1$s\nha trucat a les %2$s Truca ara Truca després diff --git a/astrid/src/main/res/values-cs/strings.xml b/astrid/src/main/res/values-cs/strings.xml index 46327a635..a116b4724 100644 --- a/astrid/src/main/res/values-cs/strings.xml +++ b/astrid/src/main/res/values-cs/strings.xml @@ -25,7 +25,6 @@ Vyberte, který účet Google chcete použít: Povedlo se! Úkol zkopírován - Probíhá synchronizace... Alarmy Přidat alarm @@ -162,7 +161,6 @@ Zobrazit v mém seznamu Více... Kdy je termín? - Nový úkol V %2$s volal\n%1$s Hned zavolat Zavolat později diff --git a/astrid/src/main/res/values-de/strings.xml b/astrid/src/main/res/values-de/strings.xml index 767e59ca7..5eb257748 100644 --- a/astrid/src/main/res/values-de/strings.xml +++ b/astrid/src/main/res/values-de/strings.xml @@ -33,11 +33,6 @@ Viel Erfolg! Aufgabe kopiert Keine Aufgaben zum Kopieren vorhanden - Nicht autorisiert! - Sie sind nicht mehr berechtigt, die Liste %s anzuzeigen (Sie wurden möglicherweise entfernt). Möchten Sie eine neue Liste mit dem gleichen Namen erstellen? - Neue Liste anlegen - Liste verlassen - Synchronisierung läuft... Synchronisation zurücksetzen Setzt einige lokale Daten zur Behebung von Synchronisations-Fehlern zurück Bei der nächsten Synchronisation werden deine Aufgaben und Listen denjenigen auf Tasks.com angeglichen. Das behebt Synchronisationsfehler. Möchtest du damit beginen? @@ -184,7 +179,6 @@ Anzeigen in meiner Liste Weitere laden … Wann ist das fällig? - Neue Aufgabe %1$s hat um %2$s angerufen Jetzt anrufen Später anrufen @@ -407,10 +401,6 @@ Anmeldung beo Google Tasks nicht möglich. Bitte Passwort prüfen oder später erneut versuchen. Fehler in den Fehler bei der Hintergrunautehntifizierung. Starte eine Synchronisation in der App. - Google Tasks importieren - Die Liste %1$s wird mit anderen geteilt! Wollen Sie die Aufgabe %2$s wirklich hinzuzufügen? - Aufgabe hinzufügen - Aufgabe nicht hinzufügen Du hast $NUM Übereinstimmungen mit: $FILTER Einen Kommentar hinzufügen Ersteller @@ -504,7 +494,6 @@ Ihre Tasks-Übersicht Erinnerungen von Tasks - Sie Aufgabe hinzufügen Zeit, Ihre Todo-Liste zu verkürzen! diff --git a/astrid/src/main/res/values-es/strings.xml b/astrid/src/main/res/values-es/strings.xml index 1ef4b1b52..6126e49b2 100644 --- a/astrid/src/main/res/values-es/strings.xml +++ b/astrid/src/main/res/values-es/strings.xml @@ -33,11 +33,6 @@ La operación se ha realizado correctamente. Tarea copiada No hay tareas para copiar - No autorizado - Ya no estas autorizado para ver la lista %s (probablemente fuiste removido) Quieres crear una nueva lista con el mismo nombre? - Crea una nueva lista - Abandonar lista - Sincronización en marcha Reiniciar sincronización Reinicia algunos datos locales para ayudar a resolver los problemas de sincronización La próxima ocasión que sincronices, tus tareas y listas serán cambiadas a un espejo que existe en Tareas.com, que podría ayudar a resolver los problemas de sincronización. Quieres continuar? @@ -192,7 +187,6 @@ Mostrar en mi lista Cargar mas... ¿Para cuando esta previsto? - Nueva Tarea %1$s\nllamó a las %2$s Llamar ahora Llamar luego @@ -403,8 +397,6 @@ Tasks podría no avisarle cuanto venza una tarea.\n No se pudo autenticar con Google Tasks. Por favor revisa la contraseña de tu cuenta o intenta de nuevo mas tarde. Error en el administrador de cuentas de tu teléfono. Por favor reinicia sesión desde la configuración de Google Tasks. Error al autenticarse en un segundo plano. Por favor, intente iniciar la sincronización mientras Tasks está ejecutándose. - Añadir tarea - No añadir tarea Tiene $NUM que coincide con: $FILTER Añadir un comentario Creador @@ -494,7 +486,6 @@ Tasks podría no avisarle cuanto venza una tarea.\n Tu resumen Tasks Recordatorios de Tasks - tú Añadir una tarea ¡Es hora de acortar la lista de tareas! diff --git a/astrid/src/main/res/values-fr/strings.xml b/astrid/src/main/res/values-fr/strings.xml index f03f6a5c1..354e1860b 100644 --- a/astrid/src/main/res/values-fr/strings.xml +++ b/astrid/src/main/res/values-fr/strings.xml @@ -32,11 +32,6 @@ Opération réussie ! Tâche copiée Aucune tâche à copier - Non autorisé - Vous n\'êtes plus autorisé à voir la liste %s (vous avez peut-être été supprimé). Voulez-vous créer une nouvelle liste avec le même nom? - Créer une nouvelle liste - Quitter la liste - Synchronisation en cours... Réinitialiser la synchronisation Réinitialiser certaines données locales pour aider à la résolution de problème de synchronisation A la prochaine synchronisation, vos tâches et listes seront modifiées pour refléter ce qui existe sur Tasks.com, ce qui pourrait aider à résoudre des erreurs de synchronisation. Voulez-vous continuer? @@ -188,7 +183,6 @@ Montrer dans ma liste Charger plus... Pour quand est-ce prévu ? - Nouvelle tâche \"%1$s\na appelé à %2$s\" Appeler maintenant Appeler plus tard @@ -419,11 +413,6 @@ Impossible de s\'authentifier avec Google Tasks. Veuillez vérifier votre mot de passe ou essayez plus tard. Une erreur est apparue dans le gestionnaire de comptes de votre téléphone. Veuillez vous deconnecter de votre compte Google Task puis vous reconnecter. \"Erreur d\'authentification en arrière plan. Réessayez de vous synchroniser quand Tasks est lancé.\" - Importer les tâches de Google Tâches... - La liste %1$s est partagée avec d\'autres utilisateurs! Voulez-vous quand même ajouter la tâche %2$s à celle-ci? - Importer des tâches depuis Google - Ajout d\'une tâche - Ne pas ajouter de tâche Vous avez $NUM correspondant(s) : $FILTER Ajouter un commentaire Auteur @@ -517,7 +506,6 @@ Votre résumé Tasks Rappels d\'Tasks - vous Ajouter une tâche Il est temps de réduire votre liste de tâches! diff --git a/astrid/src/main/res/values-it/strings.xml b/astrid/src/main/res/values-it/strings.xml index 6bd91d0f8..4e38ee982 100644 --- a/astrid/src/main/res/values-it/strings.xml +++ b/astrid/src/main/res/values-it/strings.xml @@ -33,8 +33,6 @@ Operazione riuscita! Compito copiato Nessun compito da copiare - Crea nuova lista - Sincronizzazione in corso... Promemoria Aggiungi un promemoria @@ -171,7 +169,6 @@ Mostra nella mia lista Caricane di più... Quando dovrà terminare? - Nuova Attività %1$s\nha chiamato alle %2$s Chiama ora Chiama più tardi @@ -441,7 +438,6 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat Your Tasks digest Promemoria da Tasks - tu Aggiungi un\'attività E\' tempo di accorciare la tua lista delle cose da fare! diff --git a/astrid/src/main/res/values-iw/strings.xml b/astrid/src/main/res/values-iw/strings.xml index b697ec78d..6f07104da 100644 --- a/astrid/src/main/res/values-iw/strings.xml +++ b/astrid/src/main/res/values-iw/strings.xml @@ -33,8 +33,6 @@ הצלחה! משימה הועתקה אין משימות להעתיק - צור רשימה חדשה - הסינכרון מתבצע התראות הוסף התראה @@ -180,7 +178,6 @@ הצג ברשימה שלי טען עוד... למתי? - משימה חדשה %1$s \nהתקשר ב־%2$s התקשר כעת התקשר מאוחר יותר @@ -402,11 +399,6 @@ איני מצליחה לאמת אותך מול ״משימות גוגל״. אנא בדוק את הסיסמא שהזנת, או נסה מאוחר יותר. מנהל החשבונות של הטלפון שלך נתקל בשגיאה. אנא התנתק והתחבר מתוך הגדרות ״משימות גוגל״. האימות המתבצע ברקע נכשל. אנא נסה להתחיל את הסינכרון בזמן שאסטריד פועלת. - מייבאת את ״משימות גוגל״ - הרשימה %1$s משותפת עם אחרים! האם אתה בטוח שברצונך להוסיף את המשימה %2$sלרשימה זו? - ייבוא ״משימות גוגל״ - הוסף משימה - אל תוסיף משימה יש לך $NUM המתאימים: $FILTER הוסף הערה יוצר @@ -496,7 +488,6 @@ תמצית מאסטריד תזכורות מאסטריד - אתה הוסף משימה הגיע הזמן לקצר את רשימת המשימות שלך! diff --git a/astrid/src/main/res/values-ja/strings.xml b/astrid/src/main/res/values-ja/strings.xml index 11d0cc5ef..43989bfab 100644 --- a/astrid/src/main/res/values-ja/strings.xml +++ b/astrid/src/main/res/values-ja/strings.xml @@ -27,7 +27,6 @@ 追加しないで 使用したいGoogleアカウントを選択してください: 成功！ - 同期中 アラーム アラームを追加する @@ -140,7 +139,6 @@ リスト 概要 リマインダー - 新しいタスク %1$s\ncalled at %2$s 無視する 無視する @@ -231,7 +229,6 @@ お知らせ 既に完了しています! スヌーズ - あなた タスクを追加する 通知の設定 消音時間の始まり diff --git a/astrid/src/main/res/values-ko/strings.xml b/astrid/src/main/res/values-ko/strings.xml index bb87c7ce8..dc615f21e 100644 --- a/astrid/src/main/res/values-ko/strings.xml +++ b/astrid/src/main/res/values-ko/strings.xml @@ -33,11 +33,6 @@ 성공! 일정 복사 완료 복사할 일정 없음 - 권한이 없습니다 - 더 이상 목록 %s 를 열람할 수 있는 권한이 없습니다 (권한을 삭제한 것 같습니다). 같은 이름의 새 목록을 생성하시겠습니까? - 새 목록 만들기 - 목록 탈퇴하기 - 동기화 진행 중... 동기화 초기화 동기화 에러를 해결하기 위해 몇가지 로컬 자료를 초기화합니다 동기화 에러를 해결하기 위해, 다음 동기화 때 당신의 일정과 목록은 Tasks.com 상에 존재하는 미러로 변경될 것입니다. 계속하시겠습니까? @@ -195,7 +190,6 @@ 내 목록에 표시 더 불러오기... 마감일이 언제입니까? - 새 일정 %1$s\n받은 시간: %2$s 지금 전화하기 나중에 전화하기 @@ -431,11 +425,6 @@ 구글 일정으로 인증할 수 없습니다. 계정 비밀번호를 확인하거나 나중에 다시 시도해 보세요. 휴대폰 계정 관리자에서 에러가 발생했습니다. 로그아웃 후 구글 일정 설정에서 다시 로그인 해 주세요. 백그라운드에서 인증 에러가 발생했습니다. 아스트리드가 실행중일 때 동기화를 시작해 보세요. - 구글 일정 가져오는 중... - %1$s 목록을 타인과 공유 중입니다! %2$s 일정을 이 목록에 추가할까요? - 구글 일정 가져오기 - 일정 추가하기 - 일정 추가하지 않기 $NUM 개의 일정이 일치합니다: $FILTER 댓글 쓰기 작성자 @@ -532,7 +521,6 @@ 당신의 아스트리드 요약 아스트리드 알림 - 당신 일정 추가하기 당신의 할일 목록을 줄일 시간이에요! diff --git a/astrid/src/main/res/values-nb/strings.xml b/astrid/src/main/res/values-nb/strings.xml index a79ec62c3..3a1bcd22a 100644 --- a/astrid/src/main/res/values-nb/strings.xml +++ b/astrid/src/main/res/values-nb/strings.xml @@ -5,7 +5,6 @@ - Synkronisering pågår... Varsler Legg til nytt varsel Sikkerhetskopier diff --git a/astrid/src/main/res/values-nl/strings.xml b/astrid/src/main/res/values-nl/strings.xml index 31b491339..7f5044d8c 100644 --- a/astrid/src/main/res/values-nl/strings.xml +++ b/astrid/src/main/res/values-nl/strings.xml @@ -33,11 +33,6 @@ Succes! Taak gekopiéerd. Geen taken om te kopiéren - Niet geautoriseerd - Je bent niet langer geautoriseerd om lijst %s te bekijken (wellicht ben je verwijderd). Wil je een nieuwe lijst aanmaken met dezelfde naam? - Maak een nieuwe lijst - Verlaat lijst - Synchronisatie bezig... Synchronisatie herstellen Reset sommige lokale data om synchronisatie te proberen te herstellen De volgende keer dat je synchroniseert, zullen je taken en lijsten veranderen in overeenstemming met de data die aanwezig is Tasks.com, wat synchronisatie fouten kan herstellen. Wil je doorgaan? @@ -190,7 +185,6 @@ Laat zien in mijn lijst Laad meer... Wanneer moet dit gedaan zijn? - Nieuwe Taak %1$s\nheeft gebeld op (%2$s) Bel nu Bel later @@ -419,11 +413,6 @@ Authenticatieprobleem bij Google Taken. Controleer je wachtwoord of probeer het later opnieuw. Error in uw telefoon account manager. Log uit en log opnieuw in vanuit de Google Task instellingen. Error authenticatie op achtergrond bezig. Probeer alstublieft een synchronisatie te starten wanneer Tasks is gestart. - Google Taken importeren - De lijst %1$s is gedeeld met anderen! Wil je de taak %2$s nog steeds toevoegen? - Google Taken import - Taak toevoegen - Taak niet toevoegen Er zijn $NUM taken voor: $FILTER Commentaar toevoegen Auteur @@ -517,7 +506,6 @@ Your Tasks digest Herinneringen van Tasks - jij Taak toevoegen Het is tijd om je to-do lijst op te schonen! diff --git a/astrid/src/main/res/values-pl/strings.xml b/astrid/src/main/res/values-pl/strings.xml index a80ce4df0..4356bb73c 100644 --- a/astrid/src/main/res/values-pl/strings.xml +++ b/astrid/src/main/res/values-pl/strings.xml @@ -33,11 +33,6 @@ Zakończono pomyślnie! Zadanie skopiowane Brak zadań do skopiowania - Nie autoryzowany - Nie masz już uprawnień do wyświetlenia listy %s (mogłeś być usunięty). Czy chcesz stworzyć nową listę o tej samej nazwie? - Utwórz nową listę - Opuść Listę - Synchronizacja trwa... Resetuj synchronizację Zresetuj lokalne dane aby naprawić błędy sychronizacji Podczas następnej synchronizacji Twoje zadania zostaną zamienione na kopię, która znajduje się na Tasks.com, co może pomóc rozwiązać błędy synchronizacji. Czy chcesz kontynuować? @@ -184,7 +179,6 @@ Pokaż na mojej liście Wczytaj więcej... Na kiedy ma być zrobione? - Nowe zadanie %1$s\ndzwonił\\-a o %2$s Zadzwoń teraz Zadzwoń później @@ -409,11 +403,6 @@ i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup-&g Uwierzytelnienie w Google Zadania nieudane. Proszę, sprawdź poprawność swego hasła lub spróbuj ponownie później. Błąd w menadżerze kont Twojego telefonu. Proszę, wyloguj się i zaloguj ponownie w ustawieniach Google Zadań. Błąd uwierzytelniania w tle. Spróbuj zainicjalizować synchronizację, gdy aplikacja Tasks będzie włączone. - Importuję Zadania Google... - Lista %1$s jest współdzielona z innymi! Czy dalej chcesz dodać zadanie %2$s do niej? - Import Zadań Google - Dodaj zadanie - Nie dodawaj zadania Masz $NUM pasujących: $FILTER Dodaj komentarz Krator @@ -505,7 +494,6 @@ i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup-&g Your Tasks digest Przypomnienia z Tasks - Ty Dodaj zadanie Time to shorten your to-do list! diff --git a/astrid/src/main/res/values-pt-rBR/strings.xml b/astrid/src/main/res/values-pt-rBR/strings.xml index 6fcf09551..ae4d6a5d3 100644 --- a/astrid/src/main/res/values-pt-rBR/strings.xml +++ b/astrid/src/main/res/values-pt-rBR/strings.xml @@ -33,8 +33,6 @@ Sucesso! Tarefa copiada Sem tarefas para copiar - Criar nova lista - Sincronizando... Alarmes Inserir alarme @@ -172,7 +170,6 @@ Mostrar na minha lista Carregar mais... Quando vence? - Nova Tarefa %1$s\nligou às %2$s Ligar agora Ligar mais tarde @@ -447,7 +444,6 @@ Seu resumo no Tasks Lembretes do Tasks - você Inserir tarefa Hora de diminuir sua lista de tarefas! diff --git a/astrid/src/main/res/values-ru/strings.xml b/astrid/src/main/res/values-ru/strings.xml index 5c97477e8..cf536a4a8 100644 --- a/astrid/src/main/res/values-ru/strings.xml +++ b/astrid/src/main/res/values-ru/strings.xml @@ -33,10 +33,6 @@ Завершено успешно! Задача скопирована Нет задач для копирования - Не авторизовано - Создать новый список - Покинуть список - Процесс синхронизации… Сброс синхронизации Сбросьте некоторые данные, чтобы разрешить проблему синхронизации Напоминания @@ -184,7 +180,6 @@ Показать в моем листе Загрузить больше... Когда это должно произойти? - Новое задание %1$s\nзвонил(а) в %2$s Позвонить сейчас Позвонить позже @@ -403,11 +398,6 @@ Не удалось пройти аутентификацию в Google Tasks. Пожалуйста, проверьте пароль к учетной записи или попробуйте еще раз позже. Ошибка в менеджере аккаунтов вашего телефона, Пожалуйста выйдите и войдите снова в настройках Google Tasks Ошибка фоновой аутентификации. Пожалуйста, попробуйте синхронизироваться, когда Tasks запущен. - Импорт из Google Tasks - Список %1$s сделан общедоступным! Вы всё ещё хотите добавлять задачи в %2$s? - Импорт Google задач - Добавить задание - Не добавляйте задачи Число соответствий $FILTER: $NUM Добавить комментарий Автор @@ -498,7 +488,6 @@ Обзор задач от Tasks Напоминания от Tasks - Вы Добавить задание Время сократить Ваш список задач! diff --git a/astrid/src/main/res/values-sv/strings.xml b/astrid/src/main/res/values-sv/strings.xml index 80320afbd..e7186d179 100644 --- a/astrid/src/main/res/values-sv/strings.xml +++ b/astrid/src/main/res/values-sv/strings.xml @@ -33,7 +33,6 @@ Klart! Uppgift kopierad Ingen uppgift att kopiera - Synkronisering pågår... Alarm Lägg till ett alarm Säkerhetskopior @@ -173,7 +172,6 @@ Visa i min lista Ladda mer... När ska uppgiften vara slutförd? - Ny uppgift %1$s\nringde kl %2$s Ring nu Ring senare @@ -445,7 +443,6 @@ och återställer dina aktuella uppgifter från en backup Vänta... Grattis till den slutförda uppgiften! Påminnelse: - du Lägg till uppgift Påminnelseinställningar Tysta timmar, snooze alternativ, envishets-nivå diff --git a/astrid/src/main/res/values-tr/strings.xml b/astrid/src/main/res/values-tr/strings.xml index be4cc9adf..2d114a497 100644 --- a/astrid/src/main/res/values-tr/strings.xml +++ b/astrid/src/main/res/values-tr/strings.xml @@ -33,7 +33,6 @@ Başarılı! Görev kopyalandı Kopyalanmış görev bulunmuyor - Senkronizasyon devam ediyor... Alarmlar Alarm Ekle Yedekler @@ -168,7 +167,6 @@ Listemde göster Daha yükle... Son zamanı nedir? - Yeni Görev %1$s aradı\nzamanı: %2$s Şimdi ara Sonra ara @@ -436,7 +434,6 @@ Tasks özetiniz Tasks Hatırlatmaları - siz Görev ekle Yapılacaklar listenizi kısaltmanın tam zamanı! diff --git a/astrid/src/main/res/values-uk/strings.xml b/astrid/src/main/res/values-uk/strings.xml index 7bcdcec35..a32700830 100644 --- a/astrid/src/main/res/values-uk/strings.xml +++ b/astrid/src/main/res/values-uk/strings.xml @@ -33,11 +33,6 @@ Успішно! Завдання скопійовано! Жодного завдання для копіювання - Не авторизований - Ви більше не авторизовані для перегляду списку %s (ви, можливо, були видалені). Хотіли б ви створити новий список з тим же ім\'ям? - Створити новий список - Покинути список - Синхронізація в процесі... Скинути синхронізацію Скидання деяких локальних даних, щоб допомогти вирішити помилоки синхронізації Наступного разу при синхронізації ваших завдань і списків буде змінена, щоб відобразити те, що існує на Tasks.com, які можуть допомогти вирішити помилки синхронізації. Ви хочете продовжити? @@ -195,7 +190,6 @@ Показувати в мому списку Завантажити більше... Коли це потрібно виконати? - Нове завдання %1$s\nтелефонував о %2$s Зателефонувати зараз Зателефонувати пізніше @@ -425,11 +419,6 @@ Не вдалося пройти аутентифікацію в Google Tasks. Будь ласка, перевірте пароль до облікового запису або спробуйте ще раз пізніше. Помилка в менеджері акаунтів вашого телефону, ласка вийдіть і увійдіть знову в налаштуваннях Google Tasks Не вдалося пройти аутентифікацію у фоні. Будь ласка, попробуйте при запущеному Tasks. - Імпорт Google Tasks... - Список %1$s зроблений загальнодоступним! Ви все ще хочете додавати завдання у %2$s ? - Імпорт Google Tasks - Додати завдання - Не додавати завдання Число відповідностей $FILTER: $NUM Додати коментар Автор @@ -523,7 +512,6 @@ Your Tasks digest Нагадування від Tasks - ти Додати завдання Налаштування нагадувань Тихі години, опції короткого сну, рівень наполегливості diff --git a/astrid/src/main/res/values-zh-rCN/strings.xml b/astrid/src/main/res/values-zh-rCN/strings.xml index 26c707a3b..ee3756988 100644 --- a/astrid/src/main/res/values-zh-rCN/strings.xml +++ b/astrid/src/main/res/values-zh-rCN/strings.xml @@ -32,7 +32,6 @@ 完成! 任务已复制 无任务复制 - 同步中... 闹钟 添加闹钟 @@ -170,7 +169,6 @@ 在我的列表中显示 加载更多…… 这项活动定在什么时候呀？ - 新建任务 %1$s\n在 %2$s 给您打过电话 现在回电 稍后回电 @@ -422,7 +420,6 @@ 您的清单小助理摘要 清单小助理的提醒 - 您 添加任务 是时候缩短您的任务清单了！ diff --git a/astrid/src/main/res/values-zh-rTW/strings.xml b/astrid/src/main/res/values-zh-rTW/strings.xml index b5d307272..d20486cad 100644 --- a/astrid/src/main/res/values-zh-rTW/strings.xml +++ b/astrid/src/main/res/values-zh-rTW/strings.xml @@ -32,7 +32,6 @@ 完成! 任務工作已復制 無任務工作複製 - 同步中... 警示 加入警示 @@ -170,7 +169,6 @@ 在我的列表中顯示 加載更多…… 這項活動定在什麼時候呀？ - 新建任務工作 %1$s\n在 %2$s 給您打過電話 現在回電 稍後回電 @@ -444,7 +442,6 @@ 您的 Tasks 摘要 Tasks 的提醒 - 您 添加任務工作 是時候縮短您的任務工作清單了！ diff --git a/astrid/src/main/res/values/strings-actfm.xml b/astrid/src/main/res/values/strings-actfm.xml index 3482f1bb4..cfcb10c75 100644 --- a/astrid/src/main/res/values/strings-actfm.xml +++ b/astrid/src/main/res/values/strings-actfm.xml @@ -91,13 +91,6 @@ - Not authorized - You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name? - Create new list - Leave list - - Sync ongoing... - Reset sync Resets some local data to help resolve sync errors The next time you sync, your tasks and lists will be changed to mirror what exists on Tasks.com, which may help resolve sync errors. Do you wish to continue? diff --git a/astrid/src/main/res/values/strings-core.xml b/astrid/src/main/res/values/strings-core.xml index f657feadf..d84917a09 100644 --- a/astrid/src/main/res/values/strings-core.xml +++ b/astrid/src/main/res/values/strings-core.xml @@ -339,8 +339,6 @@ When is this due? - New Task - diff --git a/astrid/src/main/res/values/strings-gtasks.xml b/astrid/src/main/res/values/strings-gtasks.xml index 513d9eb41..1a75cb183 100644 --- a/astrid/src/main/res/values/strings-gtasks.xml +++ b/astrid/src/main/res/values/strings-gtasks.xml @@ -81,14 +81,4 @@ Error authenticating in background. Please try initiating a sync while Tasks is running. - Importing Google Tasks... - - The list %1$s is shared with others! Do you still want to add the task %2$s to it? - - Google Tasks Import - - Add task - - Don\'t add task - diff --git a/astrid/src/main/res/values/strings-reminders.xml b/astrid/src/main/res/values/strings-reminders.xml index 99257e4d7..140d0907e 100644 --- a/astrid/src/main/res/values/strings-reminders.xml +++ b/astrid/src/main/res/values/strings-reminders.xml @@ -82,8 +82,6 @@ Reminders from Tasks - you - Add a task