Temporary fix for a task edit crash in tablets

pull/14/head
Sam Bosley 13 years ago
parent da5e73dd05
commit 235dc415de

@ -592,6 +592,7 @@ public class EditPeopleControlSet extends PopupControlSet {
public void onItemClick(AdapterView<?> arg0, View arg1, int position, public void onItemClick(AdapterView<?> arg0, View arg1, int position,
long id) { long id) {
AssignedToUser user = (AssignedToUser) assignedList.getAdapter().getItem(position); AssignedToUser user = (AssignedToUser) assignedList.getAdapter().getItem(position);
System.err.println("Position: " + position + ", label: " + user.label + ", user: " + user.user);
for (AssignedChangedListener l : listeners) { for (AssignedChangedListener l : listeners) {
if(l.showTaskRabbitForUser(user.label, user.user)) { if(l.showTaskRabbitForUser(user.label, user.user)) {

@ -169,7 +169,8 @@ public class TaskRabbitControlSet extends TaskEditControlSet implements Assigned
/** Fire task rabbit if assigned **/ /** Fire task rabbit if assigned **/
@Override @Override
public boolean showTaskRabbitForUser(String name, JSONObject json) { public boolean showTaskRabbitForUser(String name, JSONObject json) {
if (name.equals(fragment.getActivity().getString(R.string.actfm_EPA_task_rabbit))) { Activity fragActivity = fragment.getActivity();
if (fragActivity != null && name.equals(fragActivity.getString(R.string.actfm_EPA_task_rabbit))) {
showTaskRabbitActivity(); showTaskRabbitActivity();
return true; return true;
} }

@ -403,7 +403,6 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
} else { } else {
TaskListFragment tlf = getTaskListFragment(); TaskListFragment tlf = getTaskListFragment();
if (tlf != null) { if (tlf != null) {
System.err.println("Adding task");
Task result = tlf.quickAddBar.quickAddTask("", true); //$NON-NLS-1$ Task result = tlf.quickAddBar.quickAddTask("", true); //$NON-NLS-1$
if (result != null) if (result != null)
onTaskListItemClicked(result.getId()); onTaskListItemClicked(result.getId());
@ -439,11 +438,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
@Override @Override
protected void onStop() { protected void onStop() {
super.onStop(); super.onStop();
try { AndroidUtilities.tryUnregisterReceiver(this, tagDeletedReceiver);
unregisterReceiver(tagDeletedReceiver);
} catch (IllegalArgumentException e) {
// Receiver might not be registered if for example activity is stopped before on resume (?)
}
} }
public void setSelectedItem(Filter item) { public void setSelectedItem(Filter item) {

@ -315,7 +315,6 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
// We have a menu item to show in action bar. // We have a menu item to show in action bar.
setHasOptionsMenu(true); setHasOptionsMenu(true);
System.err.println("Initializing fragment");
syncActionHelper = new SyncActionHelper(getActivity(), this); syncActionHelper = new SyncActionHelper(getActivity(), this);
setUpUiComponents(); setUpUiComponents();
initializeData(); initializeData();
@ -368,7 +367,6 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
protected void initializeData() { protected void initializeData() {
if (extras != null && extras.containsKey(TOKEN_FILTER)) { if (extras != null && extras.containsKey(TOKEN_FILTER)) {
filter = extras.getParcelable(TOKEN_FILTER); filter = extras.getParcelable(TOKEN_FILTER);
System.err.println("Filter on init: " + filter);
extras.remove(TOKEN_FILTER); // Otherwise writing this filter to parcel gives infinite recursion extras.remove(TOKEN_FILTER); // Otherwise writing this filter to parcel gives infinite recursion
} else { } else {
filter = CoreFilterExposer.buildInboxFilter(getResources()); filter = CoreFilterExposer.buildInboxFilter(getResources());

Loading…
Cancel
Save