Fix crashes found by ui tests

jonan · Feb 7, 2018 · cf31ab7 · cf31ab7
1 parent 02863ad
commit cf31ab7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/src/main/java/com/github/mobile/api/model/Milestone.java b/app/src/main/java/com/github/mobile/api/model/Milestone.java
@@ -57,7 +57,8 @@ public Milestone(org.eclipse.egit.github.core.Milestone milestone) {
         this.state = milestone.getState();
         this.title = milestone.getTitle();
         this.description = milestone.getDescription();
-        this.creator = new User(milestone.getCreator());
+        org.eclipse.egit.github.core.User creator = milestone.getCreator();
+        this.creator = creator == null ? null : new User(creator);
         this.open_issues = milestone.getOpenIssues();
         this.closed_issues = milestone.getClosedIssues();
         this.created_at = milestone.getCreatedAt();

diff --git a/app/src/main/java/com/github/mobile/ui/issue/EditIssuesFilterActivity.java b/app/src/main/java/com/github/mobile/ui/issue/EditIssuesFilterActivity.java
@@ -236,9 +236,9 @@ private void updateLabels() {
     }
 
     private void updateMilestone() {
-        Milestone selected = filter.getMilestone().getOldModel();
+        com.github.mobile.api.model.Milestone selected = filter.getMilestone();
         if (selected != null)
-            milestoneText.setText(selected.getTitle());
+            milestoneText.setText(selected.getOldModel().getTitle());
         else
             milestoneText.setText(R.string.none);
     }