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

Fixed some taskrabbit bugs, insert api keys in build script

Browse Source
pull/14/head
Sam Bosley 13 years ago
parent 74e1c62a14
commit b429159661
4 changed files with 24 additions and 42 deletions
Show Stats Download Patch File Download Diff File

11
astrid/build.xml
Unescape Escape View File

@ -114,6 +114,17 @@
<replaceregexp file="${source.dir}/com/todoroo/astrid/actfm/sync/ActFmInvoker.java"
match="APP_SECRET = .*"
replace="APP_SECRET = &quot;${apikey.actfm.secret}&quot;;" />
<replaceregexp file="${source.dir}/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java"
match="TASK_RABBIT_CLIENT_ID = .*"
replace="TASK_RABBIT_CLIENT_ID = &quot;${apikey.taskrabbit.clientid}&quot;;" />
<replaceregexp file="${source.dir}/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java"
match="TASK_RABBIT_CLIENT_APPLICATION_ID = .*"
replace="TASK_RABBIT_CLIENT_APPLICATION_ID = &quot;${apikey.taskrabbit.appid}&quot;;" />
<replaceregexp file="${source.dir}/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java"
match="TASK_RABBIT_URL = .*"
replace="TASK_RABBIT_URL = &quot;${apikey.taskrabbit.url}&quot;;" />
<replaceregexp file="${source.dir}/com/todoroo/astrid/gtasks/api/GtasksInvoker.java"
match="API_KEY = .*"
replace="API_KEY = &quot;${apikey.gtasks}&quot;;" />

23
astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java
Unescape Escape View File

@ -130,13 +130,13 @@ public class TaskRabbitActivity extends FragmentActivity implements LocationList
/** Act.fm current user name */
public static final String TASK_RABBIT_TOKEN = "task_rabbit_token"; //$NON-NLS-1$
public static final String TASK_RABBIT_URL = "http://www.taskrabbit.com"; //$NON-NLS-1$
public static final String TASK_RABBIT_CLIENT_ID = "RZUDrMuGn9Q3dXeq4nL24bM6LZmMCi1CEGgfP4ND"; //$NON-NLS-1$
public static final String TASK_RABBIT_CLIENT_APPLICATION_ID = "Va7FUIUTprsmyuwAq9eHSZvAgiRj8FVH1zeaM8Zt"; //$NON-NLS-1$
// public static final String TASK_RABBIT_URL = "http://rs-astrid-api.taskrabbit.com"; //$NON-NLS-1$
// public static final String TASK_RABBIT_CLIENT_ID = "fDTmGeR0uNCvoxopNyqsRWae8xOvbOBqC7jmHaxv"; //$NON-NLS-1$
// public static final String TASK_RABBIT_CLIENT_APPLICATION_ID = "XBpKshU8utH5eaNmhky9N8aAId5rSLTh04Hi60Co"; //$NON-NLS-1$
private static final String TASK_RABBIT_POPOVER_PREF = "task_rabbit_popover"; //$NON-NLS-1$
// Non-production values
public static final String TASK_RABBIT_URL = "http://rs-astrid-api.taskrabbit.com"; //$NON-NLS-1$
public static final String TASK_RABBIT_CLIENT_ID = "fDTmGeR0uNCvoxopNyqsRWae8xOvbOBqC7jmHaxv"; //$NON-NLS-1$
public static final String TASK_RABBIT_CLIENT_APPLICATION_ID = "XBpKshU8utH5eaNmhky9N8aAId5rSLTh04Hi60Co"; //$NON-NLS-1$
public static final String CITY_NAME = "task_rabbit_city_name"; //$NON-NLS-1$
private TaskRabbitTaskContainer taskRabbitTask;
@ -161,10 +161,12 @@ public class TaskRabbitActivity extends FragmentActivity implements LocationList
}
public void showAddListPopover() {
ActionBar actionBar = getSupportActionBar();
HelpInfoPopover.showPopover(this, actionBar.getCustomView().findViewById(R.id.menu_nav), R.string.help_popover_add_lists, null);
if (!Preferences.getBoolean(TASK_RABBIT_POPOVER_PREF, false)) {
ActionBar actionBar = getSupportActionBar();
HelpInfoPopover.showPopover(this, actionBar.getCustomView().findViewById(R.id.menu_nav), R.string.help_popover_taskrabbit_type, null);
Preferences.setBoolean(TASK_RABBIT_POPOVER_PREF, true);
}
}
@ -173,9 +175,6 @@ public class TaskRabbitActivity extends FragmentActivity implements LocationList
super.onResume();
StatisticsService.sessionStart(this);
populateFields();
if(!isLoggedIn())
showAddListPopover();
}

30
astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitDataService.java
Unescape Escape View File

@ -29,7 +29,6 @@ import com.todoroo.astrid.notes.NoteMetadata;
import com.todoroo.astrid.producteev.ProducteevUtilities;
import com.todoroo.astrid.producteev.sync.ProducteevDashboard;
import com.todoroo.astrid.service.MetadataService;
import com.todoroo.astrid.tags.TagService;
public final class TaskRabbitDataService {
@ -150,34 +149,7 @@ public final class TaskRabbitDataService {
task.metadata.add(task.trTask);
// note we don't include note metadata, since we only receive deltas
metadataService.synchronizeMetadata(task.task.getId(), task.metadata,
Criterion.or(MetadataCriteria.withKey(TaskRabbitMetadata.METADATA_KEY),
MetadataCriteria.withKey(TagService.KEY)));
}
/**
* Reads a task and its metadata
* @param task
* @return
*/
public TaskRabbitTaskContainer readTaskAndMetadata(TodorooCursor<Task> taskCursor) {
Task task = new Task(taskCursor);
// read tags, notes, etc
ArrayList<Metadata> metadata = new ArrayList<Metadata>();
TodorooCursor<Metadata> metadataCursor = metadataService.query(Query.select(Metadata.PROPERTIES).
where(Criterion.and(MetadataCriteria.byTask(task.getId()),
Criterion.or(MetadataCriteria.withKey(TagService.KEY),
MetadataCriteria.withKey(TaskRabbitMetadata.METADATA_KEY),
MetadataCriteria.withKey(NoteMetadata.METADATA_KEY)))));
try {
for(metadataCursor.moveToFirst(); !metadataCursor.isAfterLast(); metadataCursor.moveToNext()) {
metadata.add(new Metadata(metadataCursor));
}
} finally {
metadataCursor.close();
}
return new TaskRabbitTaskContainer(task, metadata.get(0));
MetadataCriteria.withKey(TaskRabbitMetadata.METADATA_KEY));
}
/**

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

@ -88,5 +88,5 @@
<!-- Shown after user goes to task rabbit activity-->
<string name="help_popover_add_lists">Change your type here</string>
<string name="help_popover_taskrabbit_type">Change the type of task</string>
</resources>

Write Preview
Loading…
Cancel
Save