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

Fixing url formatting

Browse Source
pull/14/head
Andrew Shaw 13 years ago
parent 9b4374688e
commit db373ba6af
5 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File

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

@ -31,7 +31,6 @@ import android.support.v4.app.ActionBar;
import android.support.v4.app.FragmentActivity; import android.support.v4.app.FragmentActivity;
import android.support.v4.view.MenuItem; import android.support.v4.view.MenuItem;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log;
import android.util.TypedValue; import android.util.TypedValue;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
@ -292,12 +291,12 @@ public class TaskRabbitActivity extends FragmentActivity implements LocationList
} }
else if(arrayID == R.string.tr_set_key_name) { else if(arrayID == R.string.tr_set_key_name) {
TaskRabbitNameControlSet nameControlSet = new TaskRabbitNameControlSet(this, TaskRabbitNameControlSet nameControlSet = new TaskRabbitNameControlSet(this,
R.layout.control_set_notes, R.layout.task_rabbit_row, titleID, i); R.layout.control_set_notes, R.layout.task_rabbit_row, titleID);
controls.add(nameControlSet); controls.add(nameControlSet);
} }
else if(arrayID == R.string.tr_set_key_description) { else if(arrayID == R.string.tr_set_key_description) {
TaskRabbitNameControlSet descriptionControlSet = new TaskRabbitNameControlSet(this, TaskRabbitNameControlSet descriptionControlSet = new TaskRabbitNameControlSet(this,
R.layout.control_set_notes, R.layout.task_rabbit_row_description, titleID, i); R.layout.control_set_notes, R.layout.task_rabbit_row_description, titleID);
try { try {
descriptionControlSet.readFromModel(new JSONObject().put(getString(arrayID), model.getValue(Task.NOTES)), getString(arrayID), currentSelectedItem); descriptionControlSet.readFromModel(new JSONObject().put(getString(arrayID), model.getValue(Task.NOTES)), getString(arrayID), currentSelectedItem);
} catch (JSONException e) { } catch (JSONException e) {
@ -336,7 +335,7 @@ public class TaskRabbitActivity extends FragmentActivity implements LocationList
int[] presetValues = getPresetValues(mode); int[] presetValues = getPresetValues(mode);
TypedArray keys = getResources().obtainTypedArray(R.array.tr_default_set_key); TypedArray keys = getResources().obtainTypedArray(R.array.tr_default_set_key);
JSONObject parameters = defaultValuesToJSON(keys, presetValues); JSONObject parameters = defaultValuesToJSON(keys, presetValues);
for (int i = 1; i < controls.size(); i++) { for (int i = 0; i < controls.size(); i++) {
if (presetValues[i] == -1) continue; if (presetValues[i] == -1) continue;
TaskRabbitSetListener set = controls.get(i); TaskRabbitSetListener set = controls.get(i);
int arrayID = keys.getResourceId(i, 0); int arrayID = keys.getResourceId(i, 0);
@ -471,7 +470,7 @@ public class TaskRabbitActivity extends FragmentActivity implements LocationList
String descriptionKey = getString(R.string.tr_set_key_description); String descriptionKey = getString(R.string.tr_set_key_description);
String category = String.format("Category: %S\n", menuTitle.getText().toString()); //$NON-NLS-1$ String category = String.format("Category: %s\n", menuTitle.getText().toString()); //$NON-NLS-1$
parameters.put(descriptionKey, category); parameters.put(descriptionKey, category);
for (int i = 0; i < controls.size(); i++) { for (int i = 0; i < controls.size(); i++) {
if (presetValues[i] == -1) continue; if (presetValues[i] == -1) continue;
@ -542,12 +541,11 @@ public class TaskRabbitActivity extends FragmentActivity implements LocationList
try { try {
String urlCall = "tasks/"; String urlCall = "tasks/";
if (taskRabbitTask.getTaskID() > 0) urlCall += taskRabbitTask.getTaskID(); if (taskRabbitTask.getTaskID() > 0) urlCall += taskRabbitTask.getTaskID();
urlCall += String.format("?client_id=%S&client_application=%S", TASK_RABBIT_CLIENT_ID, TASK_RABBIT_CLIENT_APPLICATION_ID); urlCall += String.format("?client_id=%s&client_application=%s", TASK_RABBIT_CLIENT_ID, TASK_RABBIT_CLIENT_APPLICATION_ID);
Header authorization = new BasicHeader("Authorization", "OAuth" + Preferences.getStringValue(TASK_RABBIT_TOKEN)); Header authorization = new BasicHeader("Authorization", "OAuth " + Preferences.getStringValue(TASK_RABBIT_TOKEN));
Header contentType = new BasicHeader("Content-Type", "application/json"); Header contentType = new BasicHeader("Content-Type", "application/json");
String response = restClient.post(taskRabbitURL(urlCall), getTaskBody(), contentType, authorization); String response = restClient.post(taskRabbitURL(urlCall), getTaskBody(), contentType, authorization);
Log.d("Task rabbit response", response);
JSONObject taskResponse = new JSONObject(response); JSONObject taskResponse = new JSONObject(response);
if(taskResponse.has(TASK_RABBIT_ID)){ if(taskResponse.has(TASK_RABBIT_ID)){
taskRabbitTask.setRemoteTaskData(response); taskRabbitTask.setRemoteTaskData(response);
@ -558,7 +556,6 @@ public class TaskRabbitActivity extends FragmentActivity implements LocationList
} }
} }
catch (Exception e){ catch (Exception e){
e.printStackTrace();
Message failureMessage = new Message(); Message failureMessage = new Message();
failureMessage.what = -1; failureMessage.what = -1;
handler.sendMessage(failureMessage); handler.sendMessage(failureMessage);
@ -690,7 +687,7 @@ public class TaskRabbitActivity extends FragmentActivity implements LocationList
if (requestCode == REQUEST_CODE_TASK_RABBIT_OAUTH && resultCode == Activity.RESULT_OK){ if (requestCode == REQUEST_CODE_TASK_RABBIT_OAUTH && resultCode == Activity.RESULT_OK){
String result = data.getStringExtra(OAuthLoginActivity.DATA_RESPONSE); String result = data.getStringExtra(OAuthLoginActivity.DATA_RESPONSE);
String key = "access_token"; //$NON-NLS-1$ String key = "access_token="; //$NON-NLS-1$
if(result.contains(key)) { if(result.contains(key)) {
try { try {

6
astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitControlSet.java
Unescape Escape View File

@ -164,7 +164,7 @@ public class TaskRabbitControlSet extends TaskEditControlSet implements Assigned
}; };
private String taskRabbitURL(String method) { private String taskRabbitURL(String method) {
return String.format("%S/api/v1/%S?client_id=%S&client_application=%S", TaskRabbitActivity.TASK_RABBIT_URL, method, TaskRabbitActivity.TASK_RABBIT_CLIENT_ID, TaskRabbitActivity.TASK_RABBIT_CLIENT_APPLICATION_ID); //$NON-NLS-1$ return String.format("%s/api/v1/%s?client_id=%s&client_application=%s", TaskRabbitActivity.TASK_RABBIT_URL, method, TaskRabbitActivity.TASK_RABBIT_CLIENT_ID, TaskRabbitActivity.TASK_RABBIT_CLIENT_APPLICATION_ID); //$NON-NLS-1$
} }
/** Fire task rabbit if assigned **/ /** Fire task rabbit if assigned **/
@ -217,12 +217,14 @@ public class TaskRabbitControlSet extends TaskEditControlSet implements Assigned
protected void updateStatus(JSONObject json){ protected void updateStatus(JSONObject json){
final int taskID = json.optInt(TaskRabbitActivity.TASK_RABBIT_ID); final long taskID = json.optLong(TaskRabbitActivity.TASK_RABBIT_ID);
if (taskID == TaskRabbitTaskContainer.NO_ID) return;
new Thread(new Runnable() { new Thread(new Runnable() {
@Override @Override
public void run() { public void run() {
try { try {
String response = restClient.get(taskRabbitURL("tasks/" + taskID)); //$NON-NLS-1$ String response = restClient.get(taskRabbitURL("tasks/" + taskID)); //$NON-NLS-1$
JSONObject taskResponse = new JSONObject(response); JSONObject taskResponse = new JSONObject(response);
if(taskResponse.has(TaskRabbitActivity.TASK_RABBIT_ID)){ if(taskResponse.has(TaskRabbitActivity.TASK_RABBIT_ID)){

10
astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitMapOverlayItem.java
Unescape Escape View File

@ -64,10 +64,10 @@ public class TaskRabbitMapOverlayItem extends ItemizedOverlay<OverlayItem> {
return false; return false;
} }
selectedItem = mOverlays.get(index); selectedItem = mOverlays.get(index);
AlertDialog.Builder dialog = new AlertDialog.Builder(mActivity); AlertDialog.Builder dialogPrompt = new AlertDialog.Builder(mActivity);
dialog.setTitle(mActivity.getString(R.string.tr_alert_location_clicked_title)); dialogPrompt.setTitle(mActivity.getString(R.string.tr_alert_location_clicked_title));
dialog.setMessage(selectedItem.getSnippet()); dialogPrompt.setMessage(selectedItem.getSnippet());
dialog.setIcon( dialogPrompt.setIcon(
android.R.drawable.ic_dialog_alert).setPositiveButton( android.R.drawable.ic_dialog_alert).setPositiveButton(
android.R.string.ok, new DialogInterface.OnClickListener() { android.R.string.ok, new DialogInterface.OnClickListener() {
@SuppressWarnings("nls") @SuppressWarnings("nls")
@ -80,7 +80,7 @@ public class TaskRabbitMapOverlayItem extends ItemizedOverlay<OverlayItem> {
mActivity.finish(); mActivity.finish();
} }
}).setNegativeButton(android.R.string.cancel, null); }).setNegativeButton(android.R.string.cancel, null);
dialog.show(); dialogPrompt.show();
mActivity.setSearchTextForCurrentAddress(); mActivity.setSearchTextForCurrentAddress();
return true; return true;

4
astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitNameControlSet.java
Unescape Escape View File

@ -40,14 +40,14 @@ public class TaskRabbitNameControlSet extends PopupControlSet implements TaskRab
public TaskRabbitNameControlSet(Activity activity, int viewLayout, public TaskRabbitNameControlSet(Activity activity, int viewLayout,
int displayViewLayout, int titleID, int i) { int displayViewLayout, int titleID) {
super(activity, viewLayout, displayViewLayout, titleID); super(activity, viewLayout, displayViewLayout, titleID);
editText = (EditText) getView().findViewById(R.id.notes); editText = (EditText) getView().findViewById(R.id.notes);
notesPreview = (TextView) getDisplayView().findViewById(R.id.display_row_edit); notesPreview = (TextView) getDisplayView().findViewById(R.id.display_row_edit);
notesBody = (LinearLayout) getDisplayView().findViewById(R.id.notes_body); notesBody = (LinearLayout) getDisplayView().findViewById(R.id.notes_body);
dialog.getWindow() dialog.getWindow()
.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); .setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
displayText.setText(activity.getString(titleID));; displayText.setText(activity.getString(titleID));
editText.setMaxLines(Integer.MAX_VALUE); editText.setMaxLines(Integer.MAX_VALUE);

2
astrid/res/values/keys-taskrabbit.xml
Unescape Escape View File

@ -174,7 +174,7 @@
<!-- Control set title (do not translate) --> <!-- Control set title (do not translate) -->
<string name="tr_set_type">Type</string> <string name="tr_set_type">Type</string>
<string name="tr_set_name">Name</string> <string name="tr_set_name">Restaurant Name</string>
<string name="tr_set_location">Location</string> <string name="tr_set_location">Location</string>
<string name="tr_set_skill_required">Skill Required</string> <string name="tr_set_skill_required">Skill Required</string>
<string name="tr_set_duration">Duration</string> <string name="tr_set_duration">Duration</string>

Write Preview
Loading…
Cancel
Save