Show more types of issue events

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## [Unreleased]
+
+### Added
+- Show more issue events.
+
+### Fixed
+- Fix crash that occurred when opening a pull request with reviews.
+- Some minor improvements.
+
 ## [ForkHub v1.2.5] - 2016-12-16
 
 ### Added
@@ -149,6 +158,7 @@
 
 - Last official GitHub release
 
+[Unreleased]: https://github.com/jonan/ForkHub/compare/ForkHub-v1.2.5...master
 [ForkHub v1.2.5]: https://github.com/jonan/ForkHub/compare/ForkHub-v1.2.4...ForkHub-v1.2.5
 [ForkHub v1.2.4]: https://github.com/jonan/ForkHub/compare/ForkHub-v1.2.3...ForkHub-v1.2.4
 [ForkHub v1.2.3]: https://github.com/jonan/ForkHub/compare/ForkHub-v1.2.2...ForkHub-v1.2.3

app/src/main/java/com/github/mobile/api/RequestConfiguration.java

@@ -30,7 +30,7 @@
 public class RequestConfiguration implements okhttp3.Interceptor {
 
     private static final String HEADER_USER_AGENT = "ForkHub/2.0";
-    private static final String HEADER_ACCEPT = "application/vnd.github.v3.html+json";
+    private static final String HEADER_ACCEPT = "application/vnd.github.v3.full+json";
 
     private final Provider<GitHubAccount> accountProvider;
 

app/src/main/java/com/github/mobile/api/model/CommitAuthor.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2016 Jon Ander Peñalba
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.mobile.api.model;
+
+import java.util.Date;
+
+public class CommitAuthor {
+    public String name;
+
+    public String email;
+
+    public Date date;
+}

app/src/main/java/com/github/mobile/api/model/Issue.java

@@ -21,6 +21,8 @@
 public class Issue {
     public long id;
 
+    public Repository repository;
+
     public String url;
 
     public String html_url;
@@ -39,6 +41,8 @@ public class Issue {
 
     public User assignee;
 
+    public List<User> assignees;
+
     public Milestone milestone;
 
     public boolean locked;

app/src/main/java/com/github/mobile/api/model/LineComment.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2016 Jon Ander Peñalba
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.mobile.api.model;
+
+import java.util.Date;
+
+public class LineComment {
+    public long id;
+
+    public User user;
+
+    public String body_html;
+
+    public Date created_at;
+
+    public Date updated_at;
+}

app/src/main/java/com/github/mobile/api/model/ReferenceSource.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2016 Jon Ander Peñalba
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.mobile.api.model;
+
+import java.util.Date;
+
+public class ReferenceSource {
+    public String type;
+
+    public Issue issue;
+
+    public Date date;
+}

app/src/main/java/com/github/mobile/api/model/Repository.java

@@ -17,6 +17,8 @@
 
 import com.squareup.moshi.Json;
 
+import java.util.Date;
+
 public class Repository {
     public long id;
 
@@ -34,11 +36,11 @@ public class Repository {
     @Json(name = "fork")
     public boolean is_fork;
 
-    public String created_at;
+    public Date created_at;
 
-    public String updated_at;
+    public Date updated_at;
 
-    public String pushed_at;
+    public Date pushed_at;
 
     public String homepage;
 

app/src/main/java/com/github/mobile/api/model/TimelineEvent.java

@@ -15,7 +15,10 @@
  */
 package com.github.mobile.api.model;
 
+import org.eclipse.egit.github.core.Comment;
+
 import java.util.Date;
+import java.util.List;
 
 public class TimelineEvent {
     public static final String EVENT_ASSIGNED = "assigned";
@@ -36,6 +39,8 @@ public class TimelineEvent {
     public static final String EVENT_RENAMED = "renamed";
     public static final String EVENT_REOPENED = "reopened";
     public static final String EVENT_REVIEWED = "reviewed";
+    public static final String EVENT_REVIEW_REQUESTED = "review_requested";
+    public static final String EVENT_REVIEW_REQUEST_REMOVED = "review_request_removed";
     public static final String EVENT_SUBSCRIBED = "subscribed";
     public static final String EVENT_UNASSIGNED = "unassigned";
     public static final String EVENT_UNLABELED = "unlabeled";
@@ -46,19 +51,50 @@ public class TimelineEvent {
 
     public User actor;
 
+    public CommitAuthor author;
+
+    public CommitAuthor committer;
+
+    public List<LineComment> comments;
+
+    public ReferenceSource source;
+
+    public User review_requester;
+
+    public User requested_reviewer;
+
     public String commit_id;
 
+    public String sha;
+
+    public String message;
+
     public String event;
 
     public Date created_at;
 
     public Date updated_at;
 
+    public String body;
+
+    public String body_html;
+
     public Label label;
 
     public User assignee;
 
     public Milestone milestone;
 
     public Rename rename;
+
+    public Comment getOldCommentModel() {
+        Comment comment = new Comment();
+        comment.setCreatedAt(created_at);
+        comment.setUpdatedAt(updated_at);
+        comment.setBody(body);
+        comment.setBodyHtml(body_html);
+        comment.setId(id);
+        comment.setUser(actor.getOldUserModel());
+        return comment;
+    }
 }

app/src/main/java/com/github/mobile/api/model/User.java

@@ -17,6 +17,8 @@
 
 import com.squareup.moshi.Json;
 
+import java.util.Date;
+
 public class User {
     public static final String TYPE_USER = "User";
     public static final String TYPE_ORGANIZATION = "Organization";
@@ -55,9 +57,9 @@ public class User {
 
     public int following;
 
-    public String created_at;
+    public Date created_at;
 
-    public String updated_at;
+    public Date updated_at;
 
     public int total_private_repos;
 
@@ -70,4 +72,30 @@ public class User {
     public int collaborators;
 
     public Plan plan;
+
+    public org.eclipse.egit.github.core.User getOldUserModel() {
+        org.eclipse.egit.github.core.User user = new org.eclipse.egit.github.core.User();
+        user.setId((int) id);
+        user.setLogin(login);
+        user.setAvatarUrl(avatar_url);
+        user.setType(type);
+        user.setName(name);
+        user.setCompany(company);
+        user.setBlog(blog);
+        user.setLocation(location);
+        user.setEmail(email);
+        user.setHireable(is_hireable);
+        user.setBio(bio);
+        user.setPublicRepos(public_repos);
+        user.setPublicGists(public_gists);
+        user.setFollowers(followers);
+        user.setFollowing(following);
+        user.setCreatedAt(created_at);
+        user.setTotalPrivateRepos(total_private_repos);
+        user.setOwnedPrivateRepos(owned_private_repos);
+        user.setPrivateGists(private_gists);
+        user.setDiskUsage(disk_usage);
+        user.setCollaborators(collaborators);
+        return user;
+    }
 }

app/src/main/java/com/github/mobile/core/issue/FullIssue.java

@@ -18,19 +18,14 @@
 import com.github.mobile.api.model.TimelineEvent;
 import com.github.mobile.api.model.ReactionSummary;
 
-import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.Collection;
 
-import org.eclipse.egit.github.core.Comment;
 import org.eclipse.egit.github.core.Issue;
 
 /**
  * Issue model with comments
  */
-public class FullIssue extends ArrayList<Comment> implements Serializable {
-
-    private static final long serialVersionUID = 4586476132467323827L;
+public class FullIssue {
 
     private final Issue issue;
 
@@ -43,23 +38,13 @@ public class FullIssue extends ArrayList<Comment> implements Serializable {
      *
      * @param issue
      * @param reactions
-     * @param comments
      * @param events
      */
     public FullIssue(final Issue issue, final ReactionSummary reactions,
-            final Collection<Comment> comments, final Collection<TimelineEvent> events) {
-        super(comments);
-
-        this.events = events;
-        this.reactions = reactions;
+            final Collection<TimelineEvent> events) {
         this.issue = issue;
-    }
-
-    /**
-     * Create empty wrapper
-     */
-    public FullIssue() {
-        this.issue = null;
+        this.reactions = reactions;
+        this.events = events;
     }
 
     /**