Fixed bug whereby user's own activities would cause a crash.

This commit is contained in:
RyanBateman 2012-07-30 15:15:09 -04:00
parent 0676475602
commit b4cdf1731d
2 changed files with 12 additions and 3 deletions

View file

@ -109,8 +109,13 @@ public class ReadingItemFragment extends Fragment {
protected void onPostExecute(Void result) {
for (final String userId : story.sharedUserIds) {
ImageView image = new ImageView(getActivity());
image.setMaxHeight(UIUtils.convertDPsToPixels(getActivity(), 10));
image.setMaxWidth(UIUtils.convertDPsToPixels(getActivity(), 10));
int imageLength = UIUtils.convertDPsToPixels(getActivity(), 25);
image.setMaxHeight(imageLength);
image.setMaxWidth(imageLength);
GridLayout.LayoutParams imageParameters = new GridLayout.LayoutParams();
imageParameters.height = imageLength;
imageParameters.width = imageLength;
image.setLayoutParams(imageParameters);
GridLayout grid = (GridLayout) view.findViewById(R.id.reading_social_shareimages);
grid.addView(image);

View file

@ -113,7 +113,11 @@ public class ActivitiesAdapter extends ArrayAdapter<ActivitiesResponse> {
ImageView imageView = (ImageView) view.findViewById(R.id.row_activity_icon);
activityTime.setText(activity.timeSince + " " + ago);
imageLoader.displayImage(activity.user.photoUrl, activity.id, imageView);
if (activity.user != null) {
imageLoader.displayImage(activity.user.photoUrl, activity.id, imageView);
} else {
imageView.setImageResource(R.drawable.logo);
}
activityText.setText(stringBuilder);
activityText.setMovementMethod(LinkMovementMethod.getInstance());