Removed the sync actions menu, default to Astrid.com

pull/14/head
Sam Bosley 11 years ago
parent 9aeb0ada96
commit 94e2b2d213

@ -749,8 +749,8 @@ public class TaskListFragment extends SherlockListFragment implements OnScrollLi
* the above method takes care of calling it in the correct way * the above method takes care of calling it in the correct way
*/ */
protected void initiateAutomaticSyncImpl() { protected void initiateAutomaticSyncImpl() {
if (isCurrentTaskListFragment()) if (isCurrentTaskListFragment() && isInbox)
syncActionHelper.initiateAutomaticSync(filter); syncActionHelper.initiateAutomaticSync();
} }
// Subclasses should override this // Subclasses should override this

@ -33,10 +33,8 @@ import com.todoroo.andlib.utility.Preferences;
import com.todoroo.astrid.actfm.sync.messages.NameMaps; import com.todoroo.astrid.actfm.sync.messages.NameMaps;
import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.SyncAction; import com.todoroo.astrid.api.SyncAction;
import com.todoroo.astrid.gtasks.GtasksPreferences; import com.todoroo.astrid.gtasks.GtasksPreferences;
import com.todoroo.astrid.service.MarketStrategy.AmazonMarketStrategy;
import com.todoroo.astrid.service.SyncV2Service; import com.todoroo.astrid.service.SyncV2Service;
import com.todoroo.astrid.sync.SyncResultCallback; import com.todoroo.astrid.sync.SyncResultCallback;
import com.todoroo.astrid.sync.SyncV2Provider; import com.todoroo.astrid.sync.SyncV2Provider;
@ -89,11 +87,7 @@ public class SyncActionHelper {
// --- automatic sync logic // --- automatic sync logic
public void initiateAutomaticSync(Filter filter) { public void initiateAutomaticSync() {
if (filter == null || filter.title == null
|| !filter.title.equals(activity.getString(R.string.BFE_Active)))
return;
long tasksPushedAt = Preferences.getLong(NameMaps.PUSHED_AT_TASKS, 0); long tasksPushedAt = Preferences.getLong(NameMaps.PUSHED_AT_TASKS, 0);
if (DateUtilities.now() - tasksPushedAt > DateUtilities.ONE_HOUR / 2) { if (DateUtilities.now() - tasksPushedAt > DateUtilities.ONE_HOUR / 2) {
performSyncServiceV2Sync(false); performSyncServiceV2Sync(false);
@ -198,8 +192,7 @@ public class SyncActionHelper {
resolveInfo, pm); resolveInfo, pm);
if (GtasksPreferences.class.getName().equals( if (GtasksPreferences.class.getName().equals(
resolveInfo.activityInfo.name) resolveInfo.activityInfo.name))
&& AmazonMarketStrategy.isKindleFire())
continue; continue;
if (resolveInfo.activityInfo.metaData != null) { if (resolveInfo.activityInfo.metaData != null) {
@ -221,8 +214,11 @@ public class SyncActionHelper {
fragment.startActivityForResult(actions[which], TaskListFragment.ACTIVITY_SETTINGS); fragment.startActivityForResult(actions[which], TaskListFragment.ACTIVITY_SETTINGS);
} }
}; };
if (actions.length == 1) {
showSyncOptionMenu(actions, listener); fragment.startActivityForResult(actions[0], TaskListFragment.ACTIVITY_SETTINGS);
} else {
showSyncOptionMenu(actions, listener);
}
} else { } else {
syncService.synchronizeActiveTasks(true, syncResultCallback); syncService.synchronizeActiveTasks(true, syncResultCallback);

Loading…
Cancel
Save