From 255aef771b0e4f485c96240e5a370ff05fcd2bd2 Mon Sep 17 00:00:00 2001
From: Anastasia Repina <anastasiya.repina2012@yandex.ru>
Date: Thu, 11 Jan 2018 19:17:37 +0300
Subject: [PATCH] Fixed the date bug

---
 .../main/java/com/github/mobile/api/model/Milestone.java   | 6 ++++--
 .../github/mobile/ui/milestone/EditMilestoneActivity.java  | 7 +++++--
 .../com/github/mobile/ui/milestone/MilestoneFragment.java  | 2 +-
 3 files changed, 10 insertions(+), 5 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
index 6b01970fa..4200e2d70 100644
--- a/app/src/main/java/com/github/mobile/api/model/Milestone.java
+++ b/app/src/main/java/com/github/mobile/api/model/Milestone.java
@@ -43,6 +43,8 @@ public class Milestone implements Serializable {
 
     public Date due_on;
 
+    private String url;
+
     public Milestone() {
     }
 
@@ -59,6 +61,7 @@ public Milestone(org.eclipse.egit.github.core.Milestone milestone) {
         this.open_issues = milestone.getOpenIssues();
         this.closed_issues = milestone.getClosedIssues();
         this.created_at = milestone.getCreatedAt();
+        this.url = milestone.getUrl();
         //todo this.updated_at=???
         this.due_on = milestone.getDueOn();
     }
@@ -73,8 +76,7 @@ public org.eclipse.egit.github.core.Milestone getOldModel() {
         milestone.setDescription(description);
         milestone.setState(state);
         milestone.setTitle(title);
-        //todo milestone.setUrl();
-        //no url in this class
+        milestone.setUrl(url);
         milestone.setCreator(creator.getOldModel());
 
         return milestone;
diff --git a/app/src/main/java/com/github/mobile/ui/milestone/EditMilestoneActivity.java b/app/src/main/java/com/github/mobile/ui/milestone/EditMilestoneActivity.java
index 9b9f141f7..27d73c163 100644
--- a/app/src/main/java/com/github/mobile/ui/milestone/EditMilestoneActivity.java
+++ b/app/src/main/java/com/github/mobile/ui/milestone/EditMilestoneActivity.java
@@ -37,6 +37,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.GregorianCalendar;
 
 import static com.github.mobile.Intents.EXTRA_MILESTONE;
 import static com.github.mobile.Intents.EXTRA_REPOSITORY_NAME;
@@ -232,8 +233,10 @@ private void updateMilestone() {
                     dateText.setText(date.toString());
                 }
                 catch (ParseException e){
-                    e.printStackTrace(); //todo fix the unparseable date
-                    dateText.setText(dueOn.toString());
+                    Calendar cal = new GregorianCalendar();
+                    cal.setTime(dueOn);
+                    dateText.setText(sd.format(cal.getTime()));
+                    //dateText.setText(dueOn.toString());
                 }
             } else {
                 dateText.setText("");
diff --git a/app/src/main/java/com/github/mobile/ui/milestone/MilestoneFragment.java b/app/src/main/java/com/github/mobile/ui/milestone/MilestoneFragment.java
index 37af35319..1c52f072b 100644
--- a/app/src/main/java/com/github/mobile/ui/milestone/MilestoneFragment.java
+++ b/app/src/main/java/com/github/mobile/ui/milestone/MilestoneFragment.java
@@ -34,7 +34,7 @@ public class MilestoneFragment extends DialogFragment {
     public void onAttach(Context context) {
         super.onAttach(context);
 
-        milestone = (Milestone) getSerializableExtra(EXTRA_MILESTONE);
+        milestone = ((com.github.mobile.api.model.Milestone)getSerializableExtra(EXTRA_MILESTONE)).getOldModel();
     }
 
     @Override