diff --git a/api/src/com/todoroo/astrid/sync/SyncProvider.java b/api/src/com/todoroo/astrid/sync/SyncProvider.java index 081bf79cd..9affab4ee 100644 --- a/api/src/com/todoroo/astrid/sync/SyncProvider.java +++ b/api/src/com/todoroo/astrid/sync/SyncProvider.java @@ -155,8 +155,7 @@ public abstract class SyncProvider { ((Activity) context).runOnUiThread(new Runnable() { @Override public void run() { - Toast.makeText(context, R.string.SyP_progress_toast, - Toast.LENGTH_LONG).show(); + makeSyncToast(context); } }); } @@ -184,6 +183,11 @@ public abstract class SyncProvider { } } + protected void makeSyncToast(Context context) { + Toast.makeText(context, R.string.SyP_progress_toast, + Toast.LENGTH_LONG).show(); + } + // --- synchronization logic /** diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml index ac74ad83e..21eb688fe 100644 --- a/astrid/AndroidManifest.xml +++ b/astrid/AndroidManifest.xml @@ -78,7 +78,7 @@ android:screenOrientation="portrait"> + android:windowSoftInputMode="stateHidden|adjustResize"> diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncProvider.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncProvider.java index f54a91b8c..baf796872 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncProvider.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncProvider.java @@ -44,6 +44,7 @@ import com.todoroo.astrid.service.StatisticsService; import com.todoroo.astrid.sync.SyncProvider; import com.todoroo.astrid.sync.SyncProviderUtilities; import com.todoroo.astrid.utility.Constants; +import com.todoroo.astrid.utility.Flags; @SuppressWarnings("nls") public class ActFmSyncProvider extends SyncProvider { @@ -123,6 +124,12 @@ public class ActFmSyncProvider extends SyncProvider { } } + protected void makeSyncToast(Context context) { + if (!Flags.checkAndClear(Flags.ACTFM_SUPPRESS_SYNC_TOAST)) { + super.makeSyncToast(context); + } + } + // ---------------------------------------------------------------------- // ----------------------------------------------------- synchronization! // ---------------------------------------------------------------------- diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index 2323b1420..7553a8972 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -495,6 +495,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener, @Override public void run() { Preferences.setLong(LAST_AUTOSYNC_ATTEMPT, DateUtilities.now()); + Flags.set(Flags.ACTFM_SUPPRESS_SYNC_TOAST); new ActFmSyncProvider().synchronize(TaskListActivity.this); } }.start(); diff --git a/astrid/src/com/todoroo/astrid/utility/Flags.java b/astrid/src/com/todoroo/astrid/utility/Flags.java index 731dac210..740b6187d 100644 --- a/astrid/src/com/todoroo/astrid/utility/Flags.java +++ b/astrid/src/com/todoroo/astrid/utility/Flags.java @@ -41,6 +41,11 @@ public class Flags { */ public static final int ACTFM_REPEATED_TASK = 1 << 6; + /** + * If set, indicates to suppress the toast when synchronizing (used for act.fm autosync) + */ + public static final int ACTFM_SUPPRESS_SYNC_TOAST = 1 << 7; + public static boolean checkAndClear(int flag) { boolean set = (state & flag) > 0; state &= ~flag;