edit issue details & pull request details to close #21, added label p…

…ullRequest, close pullRequest and lock converstaion for PullRequest. on my way to add milestone and assignees to release 1.0.5

app/build.gradle

@@ -86,7 +86,7 @@ dependencies {
     ext {
         supportVerion = "25.2.0"
         firebase = "10.2.0"
-        thirtyinchVersion = '0.8.0-rc3'
+        thirtyinchVersion = '0.8.0-rc2'
         retrofit = '2.1.0'
     }
     compile fileTree(include: ['*.jar'], dir: 'libs')

app/src/main/java/com/fastaccess/data/dao/CommitModel.java

@@ -139,8 +139,10 @@ protected CommitModel(Parcel in) {
         this.author = in.readParcelable(UserModel.class.getClassLoader());
         this.committer = in.readParcelable(UserModel.class.getClassLoader());
         this.user = in.readParcelable(UserModel.class.getClassLoader());
+        parents = new CommitListModel();
         in.readList(this.parents, this.parents.getClass().getClassLoader());
         this.stats = in.readParcelable(GithubState.class.getClassLoader());
+        files = new CommitFileListModel();
         in.readList(this.files, this.files.getClass().getClassLoader());
         this.htmlUrl = in.readString();
         this.login = in.readString();

app/src/main/java/com/fastaccess/data/dao/IssueRequestModel.java

@@ -27,8 +27,9 @@ public class IssueRequestModel implements Parcelable {
     private Integer milestone;
     private String assignee;
     private List<String> labels;
+    private String base;
 
-    public static IssueRequestModel clone(@NonNull IssueModel issue) {
+    public static IssueRequestModel clone(@NonNull IssueModel issue, boolean toClose) {
         IssueRequestModel model = new IssueRequestModel();
         if (issue.getLabels() != null) {
             model.setLabels(Stream.of(issue.getLabels()).filter(value -> value.getName() != null)
@@ -37,7 +38,22 @@ public static IssueRequestModel clone(@NonNull IssueModel issue) {
         model.setAssignee(issue.getAssignee() != null ? issue.getAssignee().getLogin() : null);
         model.setBody(issue.getBody());
         model.setMilestone(issue.getMilestone() != null ? issue.getMilestone().getNumber() : null);
-        model.setState(issue.getState() == IssueState.closed ? IssueState.open : IssueState.closed);
+        model.setState(toClose ? issue.getState() == IssueState.closed ? IssueState.open : IssueState.closed : issue.getState());
+        model.setTitle(issue.getTitle());
+        return model;
+    }
+
+    public static IssueRequestModel clone(@NonNull PullRequestModel issue, boolean toClose) {
+        IssueRequestModel model = new IssueRequestModel();
+        if (issue.getLabels() != null) {
+            model.setLabels(Stream.of(issue.getLabels()).filter(value -> value.getName() != null)
+                    .map(LabelModel::getName).collect(Collectors.toList()));
+        }
+        model.setBase(issue.getBase() != null ? issue.getBase().getRef() : "master");
+        model.setAssignee(issue.getAssignee() != null ? issue.getAssignee().getLogin() : null);
+        model.setBody(issue.getBody());
+        model.setMilestone(issue.getMilestone() != null ? issue.getMilestone().getNumber() : null);
+        model.setState(toClose ? issue.getState() == IssueState.closed ? IssueState.open : IssueState.closed : issue.getState());
         model.setTitle(issue.getTitle());
         return model;
     }

app/src/main/java/com/fastaccess/data/dao/PullRequestModel.java

@@ -7,7 +7,6 @@
 
 import com.fastaccess.R;
 import com.fastaccess.data.dao.types.IssueState;
-import com.fastaccess.helper.InputHelper;
 import com.fastaccess.helper.ParseDateFormat;
 import com.fastaccess.ui.widgets.SpannableBuilder;
 import com.siimkinks.sqlitemagic.Delete;
@@ -120,8 +119,8 @@ public static Observable<PullRequestModel> getPullRequest(int number, @NonNull S
     }
 
     @NonNull public static SpannableBuilder getMergeBy(@NonNull PullRequestModel pullRequest, @NonNull Context context) {
-        UserModel merger = pullRequest.getMergedBy() != null ? pullRequest.getMergedBy() : pullRequest.getBase().getUser();
-        boolean isMerge = pullRequest.isMerged() || !InputHelper.isEmpty(pullRequest.getMergedAt());
+        boolean isMerge = pullRequest.isMerged();
+        UserModel merger = (isMerge && pullRequest.getMergedBy() != null) ? pullRequest.getMergedBy() : pullRequest.getUser();
         String status = !isMerge ? context.getString(pullRequest.getState().getStatus()) : context.getString(R.string.merged);
         SpannableBuilder builder = SpannableBuilder.builder();
         builder.append(merger.getLogin())

app/src/main/java/com/fastaccess/data/service/PullRequestService.java

@@ -1,15 +1,17 @@
 package com.fastaccess.data.service;
 
 import com.fastaccess.data.dao.CommitModel;
-import com.fastaccess.data.dao.FilesListModel;
+import com.fastaccess.data.dao.IssueRequestModel;
 import com.fastaccess.data.dao.MergeRequestModel;
 import com.fastaccess.data.dao.MergeResponseModel;
 import com.fastaccess.data.dao.Pageable;
 import com.fastaccess.data.dao.PullRequestModel;
+import com.fastaccess.data.dao.RepoFilesModel;
 
 import retrofit2.Response;
 import retrofit2.http.Body;
 import retrofit2.http.GET;
+import retrofit2.http.PATCH;
 import retrofit2.http.PUT;
 import retrofit2.http.Path;
 import retrofit2.http.Query;
@@ -39,11 +41,16 @@ Observable<Pageable<CommitModel>> getPullRequestCommits(@Path("owner") String ow
                                                             @Query("page") int page);
 
     @GET("repos/{owner}/{repo}/pulls/{number}/files")
-    Observable<Pageable<FilesListModel>> getPullRequestFiles(@Path("owner") String owner, @Path("repo") String repo,
+    Observable<Pageable<RepoFilesModel>> getPullRequestFiles(@Path("owner") String owner, @Path("repo") String repo,
                                                              @Path("number") long number,
                                                              @Query("page") int page);
 
     @GET("repos/{owner}/{repo}/pulls/{number}/merge")
     Observable<Response<Boolean>> hasPullRequestBeenMerged(@Path("owner") String owner, @Path("repo") String repo,
                                                            @Path("number") long number);
+
+    @PATCH("repos/{owner}/{repo}/pulls/{number}")
+    Observable<PullRequestModel> editPullRequest(@Path("owner") String owner, @Path("repo") String repo,
+                                                 @Path("number") int number,
+                                                 @Body IssueRequestModel issue);
 }

app/src/main/java/com/fastaccess/provider/scheme/SchemeParser.java

@@ -1,5 +1,6 @@
 package com.fastaccess.provider.scheme;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -45,7 +46,12 @@ public static void launchUri(@NonNull Context context, @NonNull Uri data) {
         if (intent != null) {
             context.startActivity(intent);
         } else {
-            ActivityHelper.forceOpenInBrowser(context, data);
+            Activity activity = ActivityHelper.getActivity(context);
+            if (activity == null) {
+                ActivityHelper.forceOpenInBrowser(context, data);
+            } else {
+                ActivityHelper.startCustomTab(activity, data);
+            }
         }
     }
 
@@ -115,11 +121,11 @@ public static void launchUri(@NonNull Context context, @NonNull Uri data) {
         String owner;
         String repo;
         String number;
-        if ("pull".equals(segments.get(2))) {
+        if ("pull".equals(segments.get(2)) || "pulls".equals(segments.get(2))) {
             owner = segments.get(0);
             repo = segments.get(1);
             number = segments.get(3);
-        } else if ("pull".equals(segments.get(3))) {//notifications url.
+        } else if ("pull".equals(segments.get(3)) || "pulls".equals(segments.get(3))) {//notifications url.
             owner = segments.get(1);
             repo = segments.get(2);
             number = segments.get(4);

app/src/main/java/com/fastaccess/provider/scheme/StackBuilderSchemeParser.java

@@ -1,5 +1,6 @@
 package com.fastaccess.provider.scheme;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -47,7 +48,12 @@ public static void launchUri(@NonNull Context context, @NonNull Uri data) {
         if (intent != null) {
             intent.startActivities();
         } else {
-            ActivityHelper.forceOpenInBrowser(context, data);
+            Activity activity = ActivityHelper.getActivity(context);
+            if (activity == null) {
+                ActivityHelper.forceOpenInBrowser(context, data);
+            } else {
+                ActivityHelper.startCustomTab(activity, data);
+            }
         }
     }
 
@@ -119,11 +125,11 @@ public static void launchUri(@NonNull Context context, @NonNull Uri data) {
         String owner;
         String repo;
         String number;
-        if ("pull".equals(segments.get(2))) {
+        if ("pull".equals(segments.get(2)) || "pulls".equals(segments.get(2))) {
             owner = segments.get(0);
             repo = segments.get(1);
             number = segments.get(3);
-        } else if ("pull".equals(segments.get(3))) {//notifications url.
+        } else if ("pull".equals(segments.get(3)) || "pulls".equals(segments.get(3))) {//notifications url.
             owner = segments.get(1);
             repo = segments.get(2);
             number = segments.get(4);

app/src/main/java/com/fastaccess/ui/modules/notification/NotificationsMvp.java

@@ -23,6 +23,8 @@ interface View extends BaseMvp.FAView, SwipeRefreshLayout.OnRefreshListener {
         void onNotifyAdapter();
 
         void onTypeChanged(boolean unread);
+
+        void onClick(@NonNull String url);
     }
 
     interface Presenter extends BaseViewHolder.OnItemClickListener<NotificationThreadModel>,

app/src/main/java/com/fastaccess/ui/modules/notification/NotificationsPresenter.java

@@ -1,6 +1,5 @@
 package com.fastaccess.ui.modules.notification;
 
-import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.view.View;
@@ -9,7 +8,6 @@
 import com.fastaccess.data.dao.Pageable;
 import com.fastaccess.helper.RxHelper;
 import com.fastaccess.provider.rest.RestProvider;
-import com.fastaccess.provider.scheme.SchemeParser;
 import com.fastaccess.ui.base.mvp.BaseMvp;
 import com.fastaccess.ui.base.mvp.presenter.BasePresenter;
 
@@ -42,7 +40,7 @@ public class NotificationsPresenter extends BasePresenter<NotificationsMvp.View>
                     });
         }
         if (item.getSubject() != null && item.getSubject().getUrl() != null) {
-            SchemeParser.launchUri(v.getContext(), Uri.parse(item.getSubject().getUrl()));
+            if (getView() != null) getView().onClick(item.getSubject().getUrl());
         }
     }
 

app/src/main/java/com/fastaccess/ui/modules/notification/NotificationsView.java

@@ -1,5 +1,6 @@
 package com.fastaccess.ui.modules.notification;
 
+import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -10,7 +11,10 @@
 import android.view.View;
 
 import com.fastaccess.R;
+import com.fastaccess.helper.Logger;
 import com.fastaccess.provider.rest.loadmore.OnLoadMore;
+import com.fastaccess.provider.scheme.SchemeParser;
+import com.fastaccess.provider.scheme.StackBuilderSchemeParser;
 import com.fastaccess.ui.adapter.NotificationsAdapter;
 import com.fastaccess.ui.base.BaseFragment;
 import com.fastaccess.ui.widgets.AppbarRefreshLayout;
@@ -63,6 +67,15 @@ public static NotificationsView newInstance() {
         onRefresh();
     }
 
+    @Override public void onClick(@NonNull String url) {
+        Logger.e(getActivity().isTaskRoot());
+        if (getActivity().isTaskRoot()) {
+            StackBuilderSchemeParser.launchUri(getContext(), Uri.parse(url));
+        } else {
+            SchemeParser.launchUri(getContext(), Uri.parse(url));
+        }
+    }
+
     @Override protected int fragmentLayout() {
         return R.layout.small_grid_refresh_list;
     }

app/src/main/java/com/fastaccess/ui/modules/repos/issues/create/CreateIssueMvp.java

@@ -2,8 +2,10 @@
 
 import android.content.Intent;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 
 import com.fastaccess.data.dao.IssueModel;
+import com.fastaccess.data.dao.PullRequestModel;
 import com.fastaccess.ui.base.mvp.BaseMvp;
 
 /**
@@ -20,11 +22,14 @@ interface View extends BaseMvp.FAView {
         void onDescriptionError(boolean isEmptyDesc);
 
         void onSuccessSubmission(IssueModel issueModel);
+
+        void onSuccessSubmission(PullRequestModel issueModel);
     }
 
     interface Presenter extends BaseMvp.FAPresenter {
         void onActivityForResult(int resultCode, int requestCode, Intent intent);
 
-        void onSubmit(@NonNull String title, @NonNull CharSequence description, @NonNull String login, @NonNull String repo);
+        void onSubmit(@NonNull String title, @NonNull CharSequence description, @NonNull String login,
+                      @NonNull String repo, @Nullable IssueModel issueModel, @Nullable PullRequestModel pullRequestModel);
     }
 }

app/src/main/java/com/fastaccess/ui/modules/repos/issues/create/CreateIssuePresenter.java

@@ -3,9 +3,13 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 
 import com.fastaccess.R;
 import com.fastaccess.data.dao.CreateIssueModel;
+import com.fastaccess.data.dao.IssueModel;
+import com.fastaccess.data.dao.IssueRequestModel;
+import com.fastaccess.data.dao.PullRequestModel;
 import com.fastaccess.helper.BundleConstant;
 import com.fastaccess.helper.InputHelper;
 import com.fastaccess.provider.rest.RestProvider;
@@ -29,23 +33,55 @@ public class CreateIssuePresenter extends BasePresenter<CreateIssueMvp.View> imp
     }
 
     @Override public void onSubmit(@NonNull String title, @NonNull CharSequence description,
-                                   @NonNull String login, @NonNull String repo) {
+                                   @NonNull String login, @NonNull String repo,
+                                   @Nullable IssueModel issue, @Nullable PullRequestModel pullRequestModel) {
         boolean isEmptyTitle = InputHelper.isEmpty(title);
         if (getView() != null) {
             getView().onTitleError(isEmptyTitle);
         }
         if (!isEmptyTitle) {
-            CreateIssueModel createIssueModel = new CreateIssueModel();
-            createIssueModel.setBody(InputHelper.toString(description));
-            createIssueModel.setTitle(title);
-            makeRestCall(RestProvider.getIssueService().createIssue(login, repo, createIssueModel),
-                    issueModel -> {
-                        if (issueModel != null) {
-                            sendToView(view -> view.onSuccessSubmission(issueModel));
-                        } else {
-                            sendToView(view -> view.showMessage(R.string.error, R.string.error_creating_issue));
-                        }
-                    });
+            if (issue == null && pullRequestModel == null) {
+                CreateIssueModel createIssueModel = new CreateIssueModel();
+                createIssueModel.setBody(InputHelper.toString(description));
+                createIssueModel.setTitle(title);
+                makeRestCall(RestProvider.getIssueService().createIssue(login, repo, createIssueModel),
+                        issueModel -> {
+                            if (issueModel != null) {
+                                sendToView(view -> view.onSuccessSubmission(issueModel));
+                            } else {
+                                sendToView(view -> view.showMessage(R.string.error, R.string.error_creating_issue));
+                            }
+                        });
+            } else {
+                if (issue != null) {
+                    issue.setBody(InputHelper.toString(description));
+                    issue.setTitle(title);
+                    int number = issue.getNumber();
+                    IssueRequestModel requestModel = IssueRequestModel.clone(issue, false);
+                    makeRestCall(RestProvider.getIssueService().editIssue(login, repo, number, requestModel),
+                            issueModel -> {
+                                if (issueModel != null) {
+                                    sendToView(view -> view.onSuccessSubmission(issueModel));
+                                } else {
+                                    sendToView(view -> view.showMessage(R.string.error, R.string.error_creating_issue));
+                                }
+                            });
+                }
+                if (pullRequestModel != null) {
+                    int number = pullRequestModel.getNumber();
+                    pullRequestModel.setBody(InputHelper.toString(description));
+                    pullRequestModel.setTitle(title);
+                    IssueRequestModel requestModel = IssueRequestModel.clone(pullRequestModel, false);
+                    makeRestCall(RestProvider.getPullRequestSerice().editPullRequest(login, repo, number, requestModel),
+                            pr -> {
+                                if (pr != null) {
+                                    sendToView(view -> view.onSuccessSubmission(pr));
+                                } else {
+                                    sendToView(view -> view.showMessage(R.string.error, R.string.error_creating_issue));
+                                }
+                            });
+                }
+            }
         }
     }
 }