archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Killed dead code, fixed issues with user assignment

Browse Source
pull/14/head
Tim Su 13 years ago
parent d77e7da5b6
commit 759b05053d
7 changed files with 48 additions and 142 deletions
Show Stats Download Patch File Download Diff File

24
api/src/com/todoroo/andlib/data/AbstractModel.java
Unescape Escape View File

@ -10,7 +10,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.HashMap;
import android.content.ContentValues;
import android.os.Parcel;
@ -68,8 +68,8 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
/** Values from database */
protected ContentValues values = null;
/** Model Flags(not saved in database) */
protected HashSet<String> modelFlags = null;
/** Transitory Metadata (not saved in database) */
protected HashMap<String, Object> transitoryData = null;
/** Get database-read values for this object */
public ContentValues getDatabaseValues() {
@ -164,7 +164,7 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
// clears user-set values
setValues = null;
modelFlags = null;
transitoryData = null;
for (Property<?> property : cursor.getProperties()) {
try {
@ -353,16 +353,16 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
// --- setting and retrieving flags
public synchronized void setModelFlag(String flag) {
if(modelFlags == null)
modelFlags = new HashSet<String>();
modelFlags.add(flag);
public synchronized void putTransitory(String key, Object value) {
if(transitoryData == null)
transitoryData = new HashMap<String, Object>();
transitoryData.put(key, value);
}
public boolean checkModelFlag(String flag) {
if(modelFlags == null)
return false;
return modelFlags.contains(flag);
public Object getTransitory(String key) {
if(transitoryData == null)
return null;
return transitoryData.get(key);
}
// --- property management

2
astrid/plugin-src/com/timsu/astrid/C2DMReceiver.java
Unescape Escape View File

@ -234,7 +234,7 @@ public class C2DMReceiver extends BroadcastReceiver {
if(cursor.getCount() == 0) {
task.setValue(Task.TITLE, intent.getStringExtra("title"));
task.setValue(Task.REMOTE_ID, Long.parseLong(intent.getStringExtra("task_id")));
task.setValue(Task.USER_ID, -1L); // set it to invalid number because we don't know whose it is
task.setValue(Task.USER_ID, Task.USER_ID_UNASSIGNED);
Flags.set(Flags.ACTFM_SUPPRESS_SYNC);
taskService.save(task);

148
astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
Unescape Escape View File

@ -2,7 +2,6 @@ package com.todoroo.astrid.actfm;
import greendroid.widget.AsyncImageView;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@ -13,7 +12,6 @@ import org.json.JSONObject;
import android.app.Activity;
import android.app.Dialog;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
@ -40,23 +38,16 @@ import android.widget.Toast;
import com.timsu.astrid.R;
import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.andlib.service.ExceptionService;
import com.todoroo.andlib.utility.DialogUtilities;
import com.todoroo.astrid.actfm.sync.ActFmInvoker;
import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
import com.todoroo.astrid.actfm.sync.ActFmSyncService;
import com.todoroo.astrid.actfm.sync.ActFmSyncService.JsonHelper;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria;
import com.todoroo.astrid.data.Metadata;
import com.todoroo.astrid.data.TagData;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.AstridDependencyInjector;
import com.todoroo.astrid.service.MetadataService;
import com.todoroo.astrid.service.StatisticsConstants;
import com.todoroo.astrid.service.StatisticsService;
import com.todoroo.astrid.service.TagDataService;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.service.ThemeService;
@ -64,7 +55,6 @@ import com.todoroo.astrid.tags.TagService;
import com.todoroo.astrid.ui.PeopleContainer;
import com.todoroo.astrid.ui.PeopleContainer.OnAddNewPersonListener;
import com.todoroo.astrid.ui.PopupControlSet;
import com.todoroo.astrid.utility.Flags;
public class EditPeopleControlSet extends PopupControlSet {
@ -302,12 +292,14 @@ public class EditPeopleControlSet extends PopupControlSet {
}
JSONObject myself = new JSONObject();
myself.put("id", 0L);
myself.put("id", Task.USER_ID_SELF);
sharedPeople.add(0, myself);
if (actFmPreferenceService.isLoggedIn()) {
boolean hasTags = task.getTransitory("tags") != null &&
((HashSet<String>)task.getTransitory("tags")).size() > 0;
if (actFmPreferenceService.isLoggedIn() && hasTags) {
JSONObject unassigned = new JSONObject();
unassigned.put("id", -1L);
unassigned.put("id", Task.USER_ID_UNASSIGNED);
sharedPeople.add(1, unassigned);
}
@ -361,15 +353,15 @@ public class EditPeopleControlSet extends PopupControlSet {
for (int i = 0; i < listValues.size(); i++) {
JSONObject user = listValues.get(i).user;
if (user != null) {
if (user.optLong("id") == assignedId || (user.optString("email").equals(assignedEmail) && !(TextUtils.isEmpty(assignedEmail))))
if (user.optLong("id") == assignedId ||
(user.optString("email").equals(assignedEmail) &&
!(TextUtils.isEmpty(assignedEmail))))
assignedIndex = i;
}
}
}
final int selected = assignedIndex;
// final ArrayAdapter<AssignedToUser> usersAdapter = new ArrayAdapter<AssignedToUser>(activity,
// android.R.layout.simple_list_item_single_choice, listValues);
final AssignedUserAdapter usersAdapter = new AssignedUserAdapter(activity, listValues);
activity.runOnUiThread(new Runnable() {
@ -388,6 +380,7 @@ public class EditPeopleControlSet extends PopupControlSet {
super(context, R.layout.assigned_adapter_row, people);
}
@SuppressWarnings("nls")
@Override
public View getView(int position, View convertView, ViewGroup parent) {
if(convertView == null)
@ -425,7 +418,7 @@ public class EditPeopleControlSet extends PopupControlSet {
long id) {
AssignedToUser user = (AssignedToUser) assignedList.getAdapter().getItem(position);
assignedDisplay.setText(user.toString());
assignedCustom.setText("");
assignedCustom.setText(""); //$NON-NLS-1$
refreshDisplayView();
DialogUtilities.dismissDialog(activity, dialog);
}
@ -435,7 +428,7 @@ public class EditPeopleControlSet extends PopupControlSet {
assignedClear.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
assignedCustom.setText("");
assignedCustom.setText(""); //$NON-NLS-1$
assignedList.setItemChecked(0, true);
}
});
@ -503,6 +496,9 @@ public class EditPeopleControlSet extends PopupControlSet {
task.setValue(Task.USER_ID, Task.USER_ID_SELF);
if(!TextUtils.isEmpty(task.getValue(Task.USER)))
task.setValue(Task.USER, "");
} else if(userJson.optLong("id") == Task.USER_ID_UNASSIGNED) {
dirty = task.getValue(Task.USER_ID) == Task.USER_ID_UNASSIGNED ? dirty : true;
task.setValue(Task.USER_ID, Task.USER_ID_UNASSIGNED);
} else {
String user = userJson.toString();
@ -525,6 +521,13 @@ public class EditPeopleControlSet extends PopupControlSet {
dirty = match ? dirty : true;
task.setValue(Task.USER_ID, userJson.optLong("id", Task.USER_ID_EMAIL));
task.setValue(Task.USER, user);
String assignedName = userJson.optString("name", userEmail);
if(task.getTransitory("tags") == null ||
((HashSet<String>)task.getTransitory("tags")).size() == 0)
saveToast = activity.getString(R.string.actfm_EPA_assigned_toast, assignedName,
assignedName);
}
JSONObject sharedWith = parseSharedWithAndTags();
@ -549,7 +552,8 @@ public class EditPeopleControlSet extends PopupControlSet {
};
DialogUtilities.okCancelCustomDialog(activity, activity.getString(R.string.actfm_EPA_login_button),
activity.getString(R.string.actfm_EPA_login_to_share), R.string.actfm_EPA_login_button,
R.string.actfm_EPA_dont_share_button, android.R.drawable.ic_dialog_alert, okListener, cancelListener);
R.string.actfm_EPA_dont_share_button, android.R.drawable.ic_dialog_alert,
okListener, cancelListener);
return false;
}
@ -557,7 +561,8 @@ public class EditPeopleControlSet extends PopupControlSet {
if(!TextUtils.isEmpty(task.getValue(Task.SHARED_WITH)) || sharedWith.length() != 0)
task.setValue(Task.SHARED_WITH, sharedWith.toString());
task.setModelFlag("task-assigned");
task.putTransitory("task-assigned", true);
showSaveToast();
return true;
@ -624,107 +629,6 @@ public class EditPeopleControlSet extends PopupControlSet {
return sharedWith;
}
@SuppressWarnings("nls")
private void shareTask(final JSONObject sharedWith) {
final JSONArray emails = sharedWith.optJSONArray("p");
final ProgressDialog pd = DialogUtilities.progressDialog(activity,
activity.getString(R.string.DLG_please_wait));
new Thread() {
@Override
public void run() {
ActFmInvoker invoker = new ActFmInvoker(actFmPreferenceService.getToken());
try {
if(task.getValue(Task.REMOTE_ID) == 0) {
actFmSyncService.pushTask(task.getId());
task.setValue(Task.REMOTE_ID, taskService.fetchById(task.getId(),
Task.REMOTE_ID).getValue(Task.REMOTE_ID));
}
if(task.getValue(Task.REMOTE_ID) == 0) {
DialogUtilities.okDialog(activity, "We had an error saving " +
"this task to Astrid.com. Could you let us know why this happened?", null);
return;
}
Object[] args = buildSharingArgs(emails);
JSONObject result = invoker.invoke("task_share", args);
sharedWith.remove("p");
task.setValue(Task.SHARED_WITH, sharedWith.toString());
task.setValue(Task.DETAILS_DATE, 0L);
readTagData(result.getJSONArray("tags"));
JSONObject assignee = result.getJSONObject("user");
JsonHelper.readUser(assignee,
task, Task.USER_ID, Task.USER);
Flags.set(Flags.ACTFM_SUPPRESS_SYNC);
taskService.save(task);
String assignedName = assignee.optString("name");
if (TextUtils.isEmpty(assignedName)) {
assignedName = assignee.optString("email");
}
long id = assignee.optLong("id", -2);
if (!(id == -2 || id == ActFmPreferenceService.userId() || TextUtils.isEmpty(assignedName))) {
saveToast += "\n" +
activity.getString(R.string.actfm_EPA_assigned_toast, assignedName, assignedName);
}
int count = result.optInt("shared", 0);
if(count > 0) {
saveToast += "\n" +
activity.getString(R.string.actfm_EPA_emailed_toast,
activity.getResources().getQuantityString(R.plurals.Npeople, count, count));
StatisticsService.reportEvent(StatisticsConstants.ACTFM_TASK_SHARED);
}
Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_EVENT_REFRESH);
ContextManager.getContext().sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ);
DialogUtilities.dismissDialog(activity, pd);
activity.runOnUiThread(new Runnable() {
public void run() {
showSaveToast();
activity.finish();
}
});
} catch (IOException e) {
DialogUtilities.okDialog(activity,
activity.getString(R.string.SyP_ioerror),
android.R.drawable.ic_dialog_alert, e.toString(), null);
} catch (JSONException e) {
DialogUtilities.okDialog(activity,
activity.getString(R.string.SyP_ioerror),
android.R.drawable.ic_dialog_alert, e.toString(), null);
} finally {
DialogUtilities.dismissDialog(activity, pd);
}
}
}.start();
}
@SuppressWarnings("nls")
private void readTagData(JSONArray tags) throws JSONException {
ArrayList<Metadata> metadata = new ArrayList<Metadata>();
for(int i = 0; i < tags.length(); i++) {
JSONObject tagObject = tags.getJSONObject(i);
TagData tagData = tagDataService.getTag(tagObject.getString("name"), TagData.ID);
if(tagData == null)
tagData = new TagData();
ActFmSyncService.JsonHelper.tagFromJson(tagObject, tagData);
tagDataService.save(tagData);
Metadata tagMeta = new Metadata();
tagMeta.setValue(Metadata.KEY, TagService.KEY);
tagMeta.setValue(TagService.TAG, tagData.getValue(TagData.NAME));
tagMeta.setValue(TagService.REMOTE_ID, tagData.getValue(TagData.REMOTE_ID));
metadata.add(tagMeta);
}
metadataService.synchronizeMetadata(task.getId(), metadata, MetadataCriteria.withKey(TagService.KEY));
}
@SuppressWarnings("nls")
protected Object[] buildSharingArgs(JSONArray emails) throws JSONException {
ArrayList<Object> values = new ArrayList<Object>();
@ -780,8 +684,6 @@ public class EditPeopleControlSet extends PopupControlSet {
* @param data */
public void onActivityResult(int requestCode, int resultCode, Intent data) {
if(requestCode == loginRequestCode && resultCode == Activity.RESULT_OK) {
task.setValue(Task.USER_ID, -2L);
task.setValue(Task.USER, "{}");
saveSharingSettings(saveToast);
}
else if (requestCode == loginRequestCode)

4
astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
Unescape Escape View File

@ -319,7 +319,7 @@ public final class ActFmSyncService {
if(values.containsKey(Task.DELETION_DATE.name)) {
params.add("deleted_at"); params.add(task.getValue(Task.DELETION_DATE) / 1000L);
}
if(task.checkModelFlag("repeat-complete")) {
if(task.getTransitory("repeat-complete") != null) {
params.add("completed"); params.add(DateUtilities.now() / 1000L);
} else if(values.containsKey(Task.COMPLETION_DATE.name)) {
params.add("completed"); params.add(task.getValue(Task.COMPLETION_DATE) / 1000L);
@ -335,7 +335,7 @@ public final class ActFmSyncService {
params.add("repeat"); params.add(recurrence);
}
if(values.containsKey(Task.USER_ID.name) && task.checkModelFlag("task-assigned")) {
if(values.containsKey(Task.USER_ID.name) && task.getTransitory("task-assigned") != null) {
if(task.getValue(Task.USER_ID) == Task.USER_ID_EMAIL) {
try {
JSONObject user = new JSONObject(task.getValue(Task.USER));

2
astrid/plugin-src/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java
Unescape Escape View File

@ -75,7 +75,7 @@ public class RepeatTaskCompleteListener extends BroadcastReceiver {
task.setValue(Task.COMPLETION_DATE, 0L);
task.setValue(Task.DUE_DATE, newDueDate);
task.setValue(Task.HIDE_UNTIL, hideUntil);
task.setModelFlag("repeat-complete"); //$NON-NLS-1$
task.putTransitory("repeat-complete", true); //$NON-NLS-1$
PluginServices.getTaskService().save(task);
return;
}

8
astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.todoroo.astrid.tags;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashSet;
import android.app.Activity;
@ -99,7 +100,7 @@ public final class TagsControlSet extends PopupControlSet {
LinkedHashSet<String> tags = getTagSet();
for (String tag : tags) {
if (builder.length() != 0)
builder.append(", ");
builder.append(", "); //$NON-NLS-1$
builder.append(tag);
}
@ -231,16 +232,19 @@ public final class TagsControlSet extends PopupControlSet {
if(task.getId() != AbstractModel.NO_ID) {
TodorooCursor<Metadata> cursor = tagService.getTags(task.getId());
HashSet<String> tags = new HashSet<String>(cursor.getCount());
try {
for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
String tag = cursor.get(TagService.TAG);
setTagSelected(tag);
tags.add(tag);
}
} finally {
cursor.close();
}
task.putTransitory("tags", tags); //$NON-NLS-1$
}
addTag("", false);
addTag("", false); //$NON-NLS-1$
refreshDisplayView();
populated = true;
}

2
astrid/res/values/strings-actfm.xml
Unescape Escape View File

@ -106,7 +106,7 @@
<string name="actfm_EPA_share_with">Share with:</string>
<!-- Toast when assigning a task -->
<string name="actfm_EPA_assigned_toast">Sent to %2$s (you can see on a new shared list between you and %2$s).</string>
<string name="actfm_EPA_assigned_toast">Sent to %1$s (you can see it in the list between you and %2$s).</string>
<!-- task sharing dialog: shared with label -->
<string name="actfm_EPA_collaborators_header">Share with Friends</string>

Write Preview
Loading…
Cancel
Save