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

Fixed task rabbit oauth and posting

Browse Source
pull/14/head
Andrew Shaw 13 years ago
parent e51e351fdb
commit d7841b2b44
6 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File

6
astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java
Unescape Escape View File

@ -193,6 +193,7 @@ public class TagUpdatesFragment extends ListFragment {
private void refreshUpdatesList() {
Cursor cursor = null;
ListView listView = ((ListView) getView().findViewById(android.R.id.list));
if(updateAdapter == null) {
cursor = tagDataService.getUpdates(tagData);
getActivity().startManagingCursor(cursor);
@ -200,7 +201,6 @@ public class TagUpdatesFragment extends ListFragment {
updateAdapter = new UpdateAdapter(this, R.layout.update_adapter_row,
cursor, false, fromUpdateClass);
ListView listView = ((ListView) getView().findViewById(android.R.id.list));
addHeaderToListView(listView);
listView.setAdapter(updateAdapter);
} else {
@ -213,9 +213,11 @@ public class TagUpdatesFragment extends ListFragment {
View activityContainer = getView().findViewById(R.id.no_activity_container);
if (cursor.getCount() == 0) {
activityContainer.setVisibility(View.VISIBLE);
listView.setVisibility(View.GONE);
}
else {
activityContainer.setVisibility(View.VISIBLE);
activityContainer.setVisibility(View.GONE);
listView.setVisibility(View.VISIBLE);
}
if (getActivity() instanceof TagUpdatesActivity)

6
astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java
Unescape Escape View File

@ -26,9 +26,9 @@ import com.todoroo.andlib.utility.Preferences;
public class ActFmInvoker {
/** NOTE: these values are development values & will not work on production */
private static final String URL = "//10.0.2.2:3000/api/";
private static final String APP_ID = "a4732a32859dbcd3e684331acd36432c";
private static final String APP_SECRET = "e389bfc82a0d932332f9a8bd8203735f";
private static final String URL = "//astrid.com/api/";
private static final String APP_ID = "bf6170638298af8ed9a8c79995b1fc0f";
private static final String APP_SECRET = "d15d25c63323bddcaa48928dccac1207";
public static final String PROVIDER_FACEBOOK = "facebook";
public static final String PROVIDER_GOOGLE= "google";

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

@ -150,12 +150,9 @@ public class TaskRabbitActivity extends FragmentActivity {
public static final String LOCATION_CONTAINER = "other_locations_attributes"; //$NON-NLS-1$
// Non-production values
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$
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 TASK_RABBIT_ID = "id"; //$NON-NLS-1$
private TaskRabbitTaskContainer taskRabbitTask;
@ -551,6 +548,7 @@ public class TaskRabbitActivity extends FragmentActivity {
private HttpEntity getTaskBody() {
try {
Log.d("SENT JSON", localParamsToJSON().toString());
return new StringEntity(localParamsToJSON().toString());
}
catch (Exception e) {
@ -593,7 +591,6 @@ public class TaskRabbitActivity extends FragmentActivity {
Header contentType = new BasicHeader("Content-Type", "application/json");
HttpEntity taskBody = getTaskBody();
String response = null;
try {
response = restClient.post(taskRabbitURL(urlCall), taskBody, contentType, authorization);
Log.e("The response", "The post response: " + response);
@ -780,8 +777,12 @@ public class TaskRabbitActivity extends FragmentActivity {
result = result.substring(result.indexOf(key)+key.length());
Preferences.setString(TASK_RABBIT_TOKEN, result);
String response = restClient.get(taskRabbitURL("account")); //$NON-NLS-1$
saveUserInfo(response);
String url = String.format("%s?oauth_token=%s&client_application=",taskRabbitURL("account"), Preferences.getStringValue(TASK_RABBIT_TOKEN), TASK_RABBIT_CLIENT_APPLICATION_ID);
Log.d("TASKRABBIT AUTHURL", url);
String response = restClient.get(url);
saveUserInfo(response);//;
}
catch (Exception e){
e.printStackTrace();
@ -819,15 +820,15 @@ public class TaskRabbitActivity extends FragmentActivity {
/* location calls */
private boolean supportsSelectedLocation() {
for (TaskRabbitSetListener controlSet : controls) {
if (TaskRabbitLocationControlSet.class.isAssignableFrom(controlSet.getClass())) {
TaskRabbitLocationControlSet locationControlSet = (TaskRabbitLocationControlSet) controlSet;
if(!TaskRabbitLocationManager.supportsCurrentLocation(locationControlSet.location) && locationControlSet.getDisplayView().getParent() != null) {
return false;
}
for (TaskRabbitSetListener controlSet : controls) {
if (TaskRabbitLocationControlSet.class.isAssignableFrom(controlSet.getClass())) {
TaskRabbitLocationControlSet locationControlSet = (TaskRabbitLocationControlSet) controlSet;
if(!TaskRabbitLocationManager.supportsCurrentLocation(locationControlSet.location) && locationControlSet.getDisplayView().getParent() != null) {
return false;
}
}
return true;
}
return true;
}
public void updateControlSetLocation (Location location) {

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

@ -19,6 +19,7 @@ import android.widget.Toast;
import com.timsu.astrid.R;
import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.andlib.service.RestClient;
import com.todoroo.andlib.utility.Preferences;
@ -143,7 +144,8 @@ public class TaskRabbitControlSet extends TaskEditControlSet implements Assigned
* Show toast for task edit canceling
*/
private void showSuccessToast() {
Toast.makeText(fragment.getActivity(), fragment.getString(R.string.tr_success_toast),
Toast.makeText(ContextManager.getContext(),
ContextManager.getString(R.string.tr_success_toast),
Toast.LENGTH_SHORT).show();
}

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

@ -102,13 +102,13 @@ public class TaskRabbitDeadlineControlSet extends PopupControlSet implements Tas
@Override
public void saveToDatabase(JSONObject json, String key) throws JSONException {
json.put(key, dateAndTimePicker.constructDueDate());
json.put(key, dateAndTimePicker.constructDueDate()/1000);
}
@Override
public void postToTaskRabbit(JSONObject json, String key) throws JSONException {
long dueDate = dateAndTimePicker.constructDueDate();
long dueDate = dateAndTimePicker.constructDueDate()/1000;
json.put(key, dueDate);
}

4
astrid/res/layout/tag_updates_fragment.xml
Unescape Escape View File

@ -24,12 +24,14 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/welcome_activity" />
<TextView
android:id="@+id/no_activity_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" />
</LinearLayout>
<ListView

Write Preview
Loading…
Cancel
Save