Fixed quickadd assignment oddity, don't push task in edit note activity

pull/14/head
Sam Bosley 13 years ago
parent 80707c5281
commit 3f744f23f9

@ -311,11 +311,11 @@ public final class ActFmSyncService {
long creationDate;
if (task.containsValue(Task.CREATION_DATE)) {
creationDate = task.getValue(Task.CREATION_DATE);
creationDate = task.getValue(Task.CREATION_DATE) / 1000L; // In seconds
} else {
if (taskForRemote == null)
return;
creationDate = taskForRemote.getValue(Task.CREATION_DATE);
creationDate = taskForRemote.getValue(Task.CREATION_DATE) / 1000L; // In seconds
}
boolean newlyCreated = remoteId == 0;

@ -371,6 +371,10 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
}
public void refreshData(boolean manual, SyncResultCallback existingCallback) {
if(!task.containsNonNullValue(Task.REMOTE_ID)) {
return;
}
final SyncResultCallback callback;
if(existingCallback != null)
callback = existingCallback;
@ -389,18 +393,6 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
callback.incrementMax(100);
}
// push task if it hasn't been pushed
if(!task.containsNonNullValue(Task.REMOTE_ID) && !TextUtils.isEmpty(task.getValue(Task.TITLE))) {
new Thread(new Runnable() {
@Override
public void run() {
actFmSyncService.pushTask(task.getId());
task = PluginServices.getTaskService().fetchById(task.getId(), Task.NOTES, Task.ID, Task.REMOTE_ID, Task.TITLE);
refreshData(false, callback);
}
}).start();
return;
}
actFmSyncService.fetchUpdatesForTask(task, manual, new Runnable() {
@Override

@ -281,8 +281,10 @@ public class QuickAddBar extends LinearLayout {
TaskDao.createDefaultHideUntil(task);
}
gcalControl.writeToModel(task);
peopleControl.setTask(task);
peopleControl.saveSharingSettings(null);
if (!peopleControl.willBeAssignedToMe()) {
peopleControl.setTask(task);
peopleControl.saveSharingSettings(null);
}
taskService.save(task);
String assignedTo = peopleControl.getAssignedToString();

Loading…
Cancel
Save