From 50d2742cae0c57efaf2ae092e978daca8d5aa879 Mon Sep 17 00:00:00 2001 From: Torsten Grote <t@grobox.de> Date: Tue, 2 Aug 2016 18:25:49 -0300 Subject: [PATCH] Fix two Blog NPEs Closes #571 --- .../org/briarproject/android/blogs/BlogPostFragment.java | 7 +++++-- .../src/org/briarproject/android/blogs/FeedFragment.java | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/briar-android/src/org/briarproject/android/blogs/BlogPostFragment.java b/briar-android/src/org/briarproject/android/blogs/BlogPostFragment.java index dbb926493a..89670292e3 100644 --- a/briar-android/src/org/briarproject/android/blogs/BlogPostFragment.java +++ b/briar-android/src/org/briarproject/android/blogs/BlogPostFragment.java @@ -1,6 +1,7 @@ package org.briarproject.android.blogs; import android.app.Activity; +import android.content.Context; import android.os.Bundle; import android.support.annotation.Nullable; import android.view.LayoutInflater; @@ -141,8 +142,10 @@ public class BlogPostFragment extends BaseFragment { ui.avatar.setImageDrawable(d); ui.authorName.setText(author.getName()); ui.trust.setTrustLevel(post.getAuthorStatus()); - ui.date.setText( - AndroidUtils.formatDate(getActivity(), post.getTimestamp())); + Context ctx = getContext(); + if (ctx != null) { + ui.date.setText(AndroidUtils.formatDate(ctx, post.getTimestamp())); + } if (post.getTitle() != null) { ui.title.setText(post.getTitle()); diff --git a/briar-android/src/org/briarproject/android/blogs/FeedFragment.java b/briar-android/src/org/briarproject/android/blogs/FeedFragment.java index 30e8b6dae1..a337f5a2f6 100644 --- a/briar-android/src/org/briarproject/android/blogs/FeedFragment.java +++ b/briar-android/src/org/briarproject/android/blogs/FeedFragment.java @@ -172,7 +172,7 @@ public class FeedFragment extends BaseFragment implements @Override public void onBlogPostAdded(final BlogPostItem post) { - getActivity().runOnUiThread(new Runnable() { + listener.runOnUiThread(new Runnable() { @Override public void run() { adapter.add(post); -- GitLab