From db373ba6afbd95035b8ebfd113a08519af9f6d42 Mon Sep 17 00:00:00 2001 From: Andrew Shaw Date: Fri, 10 Feb 2012 18:09:12 -0800 Subject: [PATCH] Fixing url formatting --- .../astrid/taskrabbit/TaskRabbitActivity.java | 17 +++++++---------- .../astrid/taskrabbit/TaskRabbitControlSet.java | 6 ++++-- .../taskrabbit/TaskRabbitMapOverlayItem.java | 10 +++++----- .../taskrabbit/TaskRabbitNameControlSet.java | 4 ++-- astrid/res/values/keys-taskrabbit.xml | 2 +- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java index e45ecd889..4fa2fcec5 100644 --- a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java @@ -31,7 +31,6 @@ import android.support.v4.app.ActionBar; import android.support.v4.app.FragmentActivity; import android.support.v4.view.MenuItem; import android.text.TextUtils; -import android.util.Log; import android.util.TypedValue; import android.view.View; 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) { 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); } else if(arrayID == R.string.tr_set_key_description) { 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 { descriptionControlSet.readFromModel(new JSONObject().put(getString(arrayID), model.getValue(Task.NOTES)), getString(arrayID), currentSelectedItem); } catch (JSONException e) { @@ -336,7 +335,7 @@ public class TaskRabbitActivity extends FragmentActivity implements LocationList int[] presetValues = getPresetValues(mode); TypedArray keys = getResources().obtainTypedArray(R.array.tr_default_set_key); 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; TaskRabbitSetListener set = controls.get(i); 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 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); for (int i = 0; i < controls.size(); i++) { if (presetValues[i] == -1) continue; @@ -542,12 +541,11 @@ public class TaskRabbitActivity extends FragmentActivity implements LocationList try { String urlCall = "tasks/"; 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); - Header authorization = new BasicHeader("Authorization", "OAuth" + Preferences.getStringValue(TASK_RABBIT_TOKEN)); + 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 contentType = new BasicHeader("Content-Type", "application/json"); String response = restClient.post(taskRabbitURL(urlCall), getTaskBody(), contentType, authorization); - Log.d("Task rabbit response", response); JSONObject taskResponse = new JSONObject(response); if(taskResponse.has(TASK_RABBIT_ID)){ taskRabbitTask.setRemoteTaskData(response); @@ -558,7 +556,6 @@ public class TaskRabbitActivity extends FragmentActivity implements LocationList } } catch (Exception e){ - e.printStackTrace(); Message failureMessage = new Message(); failureMessage.what = -1; 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){ 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)) { try { diff --git a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitControlSet.java b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitControlSet.java index aa3f67caa..bee941402 100644 --- a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitControlSet.java @@ -164,7 +164,7 @@ public class TaskRabbitControlSet extends TaskEditControlSet implements Assigned }; 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 **/ @@ -217,12 +217,14 @@ public class TaskRabbitControlSet extends TaskEditControlSet implements Assigned 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() { @Override public void run() { try { + String response = restClient.get(taskRabbitURL("tasks/" + taskID)); //$NON-NLS-1$ JSONObject taskResponse = new JSONObject(response); if(taskResponse.has(TaskRabbitActivity.TASK_RABBIT_ID)){ diff --git a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitMapOverlayItem.java b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitMapOverlayItem.java index 96ef93171..d1a958c95 100644 --- a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitMapOverlayItem.java +++ b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitMapOverlayItem.java @@ -64,10 +64,10 @@ public class TaskRabbitMapOverlayItem extends ItemizedOverlay { return false; } selectedItem = mOverlays.get(index); - AlertDialog.Builder dialog = new AlertDialog.Builder(mActivity); - dialog.setTitle(mActivity.getString(R.string.tr_alert_location_clicked_title)); - dialog.setMessage(selectedItem.getSnippet()); - dialog.setIcon( + AlertDialog.Builder dialogPrompt = new AlertDialog.Builder(mActivity); + dialogPrompt.setTitle(mActivity.getString(R.string.tr_alert_location_clicked_title)); + dialogPrompt.setMessage(selectedItem.getSnippet()); + dialogPrompt.setIcon( android.R.drawable.ic_dialog_alert).setPositiveButton( android.R.string.ok, new DialogInterface.OnClickListener() { @SuppressWarnings("nls") @@ -80,7 +80,7 @@ public class TaskRabbitMapOverlayItem extends ItemizedOverlay { mActivity.finish(); } }).setNegativeButton(android.R.string.cancel, null); - dialog.show(); + dialogPrompt.show(); mActivity.setSearchTextForCurrentAddress(); return true; diff --git a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitNameControlSet.java b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitNameControlSet.java index 46584f0ad..ad52f396b 100644 --- a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitNameControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitNameControlSet.java @@ -40,14 +40,14 @@ public class TaskRabbitNameControlSet extends PopupControlSet implements TaskRab public TaskRabbitNameControlSet(Activity activity, int viewLayout, - int displayViewLayout, int titleID, int i) { + int displayViewLayout, int titleID) { super(activity, viewLayout, displayViewLayout, titleID); editText = (EditText) getView().findViewById(R.id.notes); notesPreview = (TextView) getDisplayView().findViewById(R.id.display_row_edit); notesBody = (LinearLayout) getDisplayView().findViewById(R.id.notes_body); dialog.getWindow() .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); diff --git a/astrid/res/values/keys-taskrabbit.xml b/astrid/res/values/keys-taskrabbit.xml index f77f5b03f..d1231624e 100644 --- a/astrid/res/values/keys-taskrabbit.xml +++ b/astrid/res/values/keys-taskrabbit.xml @@ -174,7 +174,7 @@ Type - Name + Restaurant Name Location Skill Required Duration