Prevented autosync popups from happening all the time, fixed bug where quick add bar would push header off screen

pull/14/head
Sam Bosley 14 years ago
parent fe8556ce44
commit a5d4de0d99

@ -155,8 +155,7 @@ public abstract class SyncProvider<TYPE extends SyncContainer> {
((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<TYPE extends SyncContainer> {
}
}
protected void makeSyncToast(Context context) {
Toast.makeText(context, R.string.SyP_progress_toast,
Toast.LENGTH_LONG).show();
}
// --- synchronization logic
/**

@ -78,7 +78,7 @@
android:screenOrientation="portrait">
</activity>
<activity android:name="com.todoroo.astrid.activity.TaskListActivity"
android:windowSoftInputMode="stateHidden">
android:windowSoftInputMode="stateHidden|adjustResize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />

@ -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<ActFmTaskContainer> {
@ -123,6 +124,12 @@ public class ActFmSyncProvider extends SyncProvider<ActFmTaskContainer> {
}
}
protected void makeSyncToast(Context context) {
if (!Flags.checkAndClear(Flags.ACTFM_SUPPRESS_SYNC_TOAST)) {
super.makeSyncToast(context);
}
}
// ----------------------------------------------------------------------
// ----------------------------------------------------- synchronization!
// ----------------------------------------------------------------------

@ -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();

@ -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;

Loading…
Cancel
Save