Update Github SDK.

Fixes a missing issue event type mapping, and fixes the merge method
parameter when merging PRs.

Closes #866, #858

Author: maniac103

app/build.gradle

@@ -89,7 +89,7 @@ dependencies {
         exclude group: 'xpp3', module: 'xpp3'
     }
     implementation 'com.github.maniac103:rxloader:master-SNAPSHOT'
-    implementation 'com.github.maniac103:githubsdk:0.5.1.4'
+    implementation 'com.github.maniac103:githubsdk:0.5.1.6'
     implementation 'com.larswerkman:HoloColorPicker:1.5@aar'
     implementation 'com.caverock:androidsvg:1.2.2-beta-1@aar'
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.1.+'

app/src/main/java/com/gh4a/activities/IssueMilestoneEditActivity.java

@@ -56,6 +56,7 @@
 import com.meisolsson.githubsdk.model.IssueState;
 import com.meisolsson.githubsdk.model.Milestone;
 import com.meisolsson.githubsdk.model.request.issue.CreateMilestone;
+import com.meisolsson.githubsdk.model.request.issue.EditMilestone;
 import com.meisolsson.githubsdk.service.issues.IssueMilestoneService;
 
 import java.util.Calendar;
@@ -322,19 +323,37 @@ private void updateLabels() {
         }
     }
 
-    private void saveMilestone(String title, String desc) {
-        String errorMessage = getString(R.string.issue_error_create_milestone, title);
-        IssueMilestoneService service = ServiceFactory.get(IssueMilestoneService.class, false);
+    private Single<Response<Milestone>> createMilestone(String title, String desc,
+            IssueMilestoneService service) {
         CreateMilestone request = CreateMilestone.builder()
                 .title(title)
                 .description(desc)
                 .state(mMilestone.state())
                 .dueOn(mMilestone.dueOn())
                 .build();
 
+        return service.createMilestone(mRepoOwner, mRepoName, request);
+    }
+
+    private Single<Response<Milestone>> editMilestone(String title, String desc,
+            IssueMilestoneService service) {
+        EditMilestone request = EditMilestone.builder()
+                .title(title)
+                .description(desc)
+                .state(mMilestone.state())
+                .dueOn(mMilestone.dueOn())
+                .build();
+
+        return service.editMilestone(mRepoOwner, mRepoName, mMilestone.id(), request);
+    }
+
+    private void saveMilestone(String title, String desc) {
+        @StringRes int errorMessageResId = isInEditMode()
+                ? R.string.issue_error_edit_milestone : R.string.issue_error_create_milestone;
+        String errorMessage = getString(errorMessageResId, title);
+        IssueMilestoneService service = ServiceFactory.get(IssueMilestoneService.class, false);
         Single<Response<Milestone>> responseSingle = isInEditMode()
-                ? service.editMilestone(mRepoOwner, mRepoName, mMilestone.id(), request)
-                : service.createMilestone(mRepoOwner, mRepoName, request);
+                ? createMilestone(title, desc, service) : editMilestone(title, desc, service);
 
         responseSingle
                 .map(ApiHelpers::throwOnFailure)
@@ -363,7 +382,7 @@ private void setMilestoneState(boolean open) {
                 open ? R.string.issue_milestone_reopen_error : R.string.issue_milestone_close_error,
                 mMilestone.title());
         IssueMilestoneService service = ServiceFactory.get(IssueMilestoneService.class, false);
-        CreateMilestone request = CreateMilestone.builder()
+        EditMilestone request = EditMilestone.builder()
                 .state(open ? IssueState.Open : IssueState.Closed)
                 .build();
 

app/src/main/res/values/strings.xml

@@ -386,6 +386,7 @@
     <string name="issue_error_edit_label">Editing label \'%1$s\' failed</string>
     <string name="issue_error_delete_label">Deletion of label \'%1$s\' failed</string>
     <string name="issue_error_create_milestone">Creation of milestone \'%1$s\' failed.</string>
+    <string name="issue_error_edit_milestone">Editing milestone \'%1$s\' failed.</string>
     <string name="issue_error_delete_milestone">Deletion of milestone failed.</string>
     <string name="issue_error_milestone_title">Please enter a title</string>
     <string name="issue_label_new">New Label</string>