Show forum names in timeline

seven332 · Jan 6, 2018 · c1b350d · c1b350d
1 parent 9eedad4
commit c1b350d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/app/src/main/java/com/hippo/nimingban/client/ac/data/ACFeed.java b/app/src/main/java/com/hippo/nimingban/client/ac/data/ACFeed.java
@@ -104,6 +104,11 @@ public String getNMBId() {
         return id;
     }
 
+    @Override
+    public String getNMBFid() {
+        return fid;
+    }
+
     @Override
     public String getNMBPostId() {
         return id;

diff --git a/app/src/main/java/com/hippo/nimingban/client/ac/data/ACPost.java b/app/src/main/java/com/hippo/nimingban/client/ac/data/ACPost.java
@@ -55,6 +55,7 @@ public class ACPost extends Post {
     }
 
     public String id = "";
+    public String fid = "";
     public String img = "";
     public String ext = "";
     public String now = "";
@@ -191,6 +192,11 @@ public String getNMBId() {
         return id;
     }
 
+    @Override
+    public String getNMBFid() {
+        return fid;
+    }
+
     @Override
     public String getNMBPostId() {
         return id;
@@ -254,6 +260,7 @@ public int describeContents() {
     @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(this.id);
+        dest.writeString(this.fid);
         dest.writeString(this.img);
         dest.writeString(this.ext);
         dest.writeString(this.now);
@@ -273,6 +280,7 @@ public ACPost() {
     // Need to call generate
     protected ACPost(Parcel in) {
         this.id = in.readString();
+        this.fid = in.readString();
         this.img = in.readString();
         this.ext = in.readString();
         this.now = in.readString();

diff --git a/app/src/main/java/com/hippo/nimingban/client/data/Post.java b/app/src/main/java/com/hippo/nimingban/client/data/Post.java
@@ -18,6 +18,8 @@
 
 public abstract class Post extends Reply {
 
+    public abstract String getNMBFid();
+
     public abstract int getNMBReplyCount();
 
     public abstract CharSequence getNMBReplyDisplayCount();

diff --git a/app/src/main/java/com/hippo/nimingban/ui/ListActivity.java b/app/src/main/java/com/hippo/nimingban/ui/ListActivity.java
@@ -78,6 +78,7 @@
 import com.hippo.nimingban.client.data.Post;
 import com.hippo.nimingban.client.data.Reply;
 import com.hippo.nimingban.client.data.UpdateStatus;
+import com.hippo.nimingban.dao.ACForumRaw;
 import com.hippo.nimingban.util.Crash;
 import com.hippo.nimingban.util.DB;
 import com.hippo.nimingban.util.LinkMovementMethod2;
@@ -1087,7 +1088,12 @@ public ListHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         public void onBindViewHolder(ListHolder holder, int position) {
             Post post = mPostHelper.getDataAt(position);
             holder.leftText.setText(post.getNMBDisplayUsername());
-            holder.centerText.setText("No." + post.getNMBId());
+            ACForumRaw forum = DB.getACForumForForumid(post.getNMBFid());
+            if (forum != null) {
+                holder.centerText.setText(forum.getDisplayname());
+            } else {
+                holder.centerText.setText("No." + post.getNMBId());
+            }
             holder.rightText.setText(ReadableTime.getDisplayTime(post.getNMBTime()));
             holder.content.setText(post.getNMBDisplayContent());
             holder.bottomText.setText(post.getNMBReplyDisplayCount());