diff --git a/astrid/src-legacy/com/timsu/astrid/activities/TaskListSubActivity.java b/astrid/src-legacy/com/timsu/astrid/activities/TaskListSubActivity.java index 1946a54d2..82638c257 100644 --- a/astrid/src-legacy/com/timsu/astrid/activities/TaskListSubActivity.java +++ b/astrid/src-legacy/com/timsu/astrid/activities/TaskListSubActivity.java @@ -68,7 +68,6 @@ import com.timsu.astrid.data.task.TaskController; import com.timsu.astrid.data.task.TaskIdentifier; import com.timsu.astrid.data.task.TaskModelForEdit; import com.timsu.astrid.data.task.TaskModelForList; -import com.timsu.astrid.sync.SynchronizationService; import com.timsu.astrid.sync.Synchronizer; import com.timsu.astrid.sync.Synchronizer.SynchronizerListener; import com.timsu.astrid.utilities.AstridUtilities; @@ -356,7 +355,7 @@ public class TaskListSubActivity extends SubActivity { item.setIcon(android.R.drawable.ic_menu_myplaces); item.setAlphabeticShortcut('t'); - if (Preferences.shouldDisplaySyncButton(getParent())) { + if (Constants.SYNCHRONIZE && Preferences.shouldDisplaySyncButton(getParent())) { item = menu.add(Menu.NONE, SYNC_ID, Menu.NONE, R.string.taskList_menu_syncshortcut); item.setIcon(android.R.drawable.ic_menu_upload); @@ -375,9 +374,11 @@ public class TaskListSubActivity extends SubActivity { public boolean onCreateMoreOptionsMenu(Menu menu) { MenuItem item; - item = menu.add(Menu.NONE, OPTIONS_SYNC_ID, Menu.NONE, - R.string.taskList_menu_sync); - item.setAlphabeticShortcut('s'); + if(Constants.SYNCHRONIZE) { + item = menu.add(Menu.NONE, OPTIONS_SYNC_ID, Menu.NONE, + R.string.taskList_menu_sync); + item.setAlphabeticShortcut('s'); + } item = menu.add(Menu.NONE, OPTIONS_SETTINGS_ID, Menu.NONE, R.string.taskList_menu_settings); @@ -980,9 +981,6 @@ public class TaskListSubActivity extends SubActivity { synchronize(); } - // schedule synchronization service - SynchronizationService.scheduleService(getParent()); - } else if (context.taskArray != null && context.taskArray.size() > 0 && context.taskArray.size() < AUTO_REFRESH_MAX_LIST_SIZE) { @@ -999,6 +997,9 @@ public class TaskListSubActivity extends SubActivity { /** Invoke synchronizer */ private void synchronize() { + if(!Constants.SYNCHRONIZE) + return; + Synchronizer sync = new Synchronizer(false); sync.setTagController(getTagController()); sync.setTaskController(getTaskController()); diff --git a/astrid/src-legacy/com/timsu/astrid/utilities/Constants.java b/astrid/src-legacy/com/timsu/astrid/utilities/Constants.java index 82eef6f6b..31b8f60e7 100644 --- a/astrid/src-legacy/com/timsu/astrid/utilities/Constants.java +++ b/astrid/src-legacy/com/timsu/astrid/utilities/Constants.java @@ -10,13 +10,18 @@ public class Constants { /** URL of Astrid Help Page */ public static final String HELP_URL = "http://weloveastrid.com/?page_id=59"; - /** Flurry API KEy */ + /** Flurry API Key */ public static final String FLURRY_KEY = "T3JAY9TV2JFMJR4YTG16"; public static final boolean DEBUG = true; public static final long WIDGET_UPDATE_INTERVAL = 30 * 60 * 1000L; + /** + * Whether to display synchronization + */ + public static final boolean SYNCHRONIZE = true; + // result codes /** Return to the task list view */ diff --git a/astrid/src-legacy/com/timsu/astrid/utilities/StartupReceiver.java b/astrid/src-legacy/com/timsu/astrid/utilities/StartupReceiver.java index 53470cd86..b6b06bf85 100644 --- a/astrid/src-legacy/com/timsu/astrid/utilities/StartupReceiver.java +++ b/astrid/src-legacy/com/timsu/astrid/utilities/StartupReceiver.java @@ -95,7 +95,8 @@ public class StartupReceiver extends BroadcastReceiver { Constants.WIDGET_UPDATE_INTERVAL, pendingIntent); // start synchronization service - SynchronizationService.scheduleService(context); + if(Constants.SYNCHRONIZE) + SynchronizationService.scheduleService(context); // start backup service BackupService.scheduleService(context);