Fixed a few potential null pointers in taskadapter

pull/14/head
Sam Bosley 14 years ago
parent 7641d01a43
commit d900f07563

@ -17,6 +17,7 @@ import java.util.concurrent.atomic.AtomicReference;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import android.app.Activity;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@ -588,12 +589,15 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
requestNewDetails(task); requestNewDetails(task);
} }
if(taskDetailLoader.size() > 0) { if(taskDetailLoader.size() > 0) {
fragment.getActivity().runOnUiThread(new Runnable() { Activity activity = fragment.getActivity();
@Override if (activity != null) {
public void run() { activity.runOnUiThread(new Runnable() {
notifyDataSetChanged(); @Override
} public void run() {
}); notifyDataSetChanged();
}
});
}
} }
} catch (Exception e) { } catch (Exception e) {
// suppress silently // suppress silently
@ -615,7 +619,9 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
private void requestNewDetails(Task task) { private void requestNewDetails(Task task) {
Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_REQUEST_DETAILS); Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_REQUEST_DETAILS);
broadcastIntent.putExtra(AstridApiConstants.EXTRAS_TASK_ID, task.getId()); broadcastIntent.putExtra(AstridApiConstants.EXTRAS_TASK_ID, task.getId());
fragment.getActivity().sendOrderedBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ); Activity activity = fragment.getActivity();
if (activity != null)
activity.sendOrderedBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ);
} }
} }
@ -642,12 +648,15 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
taskService.save(task); taskService.save(task);
} }
fragment.getActivity().runOnUiThread(new Runnable() { Activity activity = fragment.getActivity();
@Override if (activity != null) {
public void run() { activity.runOnUiThread(new Runnable() {
notifyDataSetChanged(); @Override
} public void run() {
}); notifyDataSetChanged();
}
});
}
} }
private final ImageGetter detailImageGetter = new ImageGetter() { private final ImageGetter detailImageGetter = new ImageGetter() {
@ -849,7 +858,9 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
if(myHolder != null) { if(myHolder != null) {
final ViewHolder viewHolder = myHolder; final ViewHolder viewHolder = myHolder;
fragment.getActivity().runOnUiThread(new Runnable() { Activity activity = fragment.getActivity();
if (activity != null) {
activity.runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
mBarListener.addWithAction(item); mBarListener.addWithAction(item);
@ -857,6 +868,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
mBar.show(viewHolder.view); mBar.show(viewHolder.view);
} }
}); });
}
} }
} }
} }
@ -1037,7 +1049,9 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
} }
try { try {
fragment.getActivity().unregisterReceiver(this); Activity activity = fragment.getActivity();
if (activity != null)
activity.unregisterReceiver(this);
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
// ignore // ignore
} }

Loading…
Cancel
Save