Fix so that when you log in to RTM, sync happens right away.

pull/14/head
Tim Su 17 years ago
parent 356df7b7b4
commit b1c1388063

@ -30,7 +30,6 @@ import android.widget.Button;
import android.widget.TextView; import android.widget.TextView;
import com.timsu.astrid.R; import com.timsu.astrid.R;
import com.timsu.astrid.utilities.Constants;
/** /**
* This activity displays a <code>WebView</code> that allows users to log in to the * This activity displays a <code>WebView</code> that allows users to log in to the
@ -118,7 +117,7 @@ public class SyncLoginActivity extends Activity {
public void run() { public void run() {
boolean result = callback.verifyLogin(handler); boolean result = callback.verifyLogin(handler);
if(result) { if(result) {
setResult(Constants.RESULT_SYNCHRONIZE); TaskList.synchronizeNow = true;
finish(); finish();
} }
} }

@ -819,6 +819,11 @@ public class TaskListSubActivity extends SubActivity {
else if(syncPreferencesOpened) { else if(syncPreferencesOpened) {
syncPreferencesOpened = false; syncPreferencesOpened = false;
if(TaskList.synchronizeNow) {
synchronize();
TaskList.synchronizeNow = false;
}
// stop & start synchronization service // stop & start synchronization service
SynchronizationService.stop(); SynchronizationService.stop();
SynchronizationService.start(); SynchronizationService.start();
@ -837,9 +842,8 @@ public class TaskListSubActivity extends SubActivity {
shouldRefreshTaskList = false; shouldRefreshTaskList = false;
} }
@Override /** Invoke synchronizer */
protected void onActivityResult(int requestCode, int resultCode, Intent data) { private void synchronize() {
if(resultCode == Constants.RESULT_SYNCHRONIZE) {
Synchronizer sync = new Synchronizer(false); Synchronizer sync = new Synchronizer(false);
sync.setTagController(getTagController()); sync.setTagController(getTagController());
sync.setTaskController(getTaskController()); sync.setTaskController(getTaskController());
@ -853,6 +857,12 @@ public class TaskListSubActivity extends SubActivity {
reloadList(); reloadList();
} }
}); });
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if(resultCode == Constants.RESULT_SYNCHRONIZE) {
synchronize();
} else if(requestCode == ACTIVITY_TAGS) { } else if(requestCode == ACTIVITY_TAGS) {
switchToActivity(TaskList.AC_TAG_LIST, null); switchToActivity(TaskList.AC_TAG_LIST, null);
} }

Loading…
Cancel
Save