Skip to content
Snippets Groups Projects
Commit 9a32a137 authored by akwizgran's avatar akwizgran
Browse files

Merge branch '571-npe-in-feedfragment' into 'master'

Fix two Blog NPEs

Closes #571

See merge request !264
parents 747ed023 50d2742c
No related branches found
No related tags found
No related merge requests found
package org.briarproject.android.blogs; package org.briarproject.android.blogs;
import android.app.Activity; import android.app.Activity;
import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.view.LayoutInflater; import android.view.LayoutInflater;
...@@ -141,8 +142,10 @@ public class BlogPostFragment extends BaseFragment { ...@@ -141,8 +142,10 @@ public class BlogPostFragment extends BaseFragment {
ui.avatar.setImageDrawable(d); ui.avatar.setImageDrawable(d);
ui.authorName.setText(author.getName()); ui.authorName.setText(author.getName());
ui.trust.setTrustLevel(post.getAuthorStatus()); ui.trust.setTrustLevel(post.getAuthorStatus());
ui.date.setText( Context ctx = getContext();
AndroidUtils.formatDate(getActivity(), post.getTimestamp())); if (ctx != null) {
ui.date.setText(AndroidUtils.formatDate(ctx, post.getTimestamp()));
}
if (post.getTitle() != null) { if (post.getTitle() != null) {
ui.title.setText(post.getTitle()); ui.title.setText(post.getTitle());
......
...@@ -172,7 +172,7 @@ public class FeedFragment extends BaseFragment implements ...@@ -172,7 +172,7 @@ public class FeedFragment extends BaseFragment implements
@Override @Override
public void onBlogPostAdded(final BlogPostItem post) { public void onBlogPostAdded(final BlogPostItem post) {
getActivity().runOnUiThread(new Runnable() { listener.runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
adapter.add(post); adapter.add(post);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment