Merge remote-tracking branch 'refs/remotes/k0shk0sh/master'

# Conflicts:
#	app/src/main/java/com/fastaccess/ui/modules/editor/EditorActivity.java
This commit is contained in:
Jedi Burrell 2017-05-10 05:00:52 -04:00
commit 68ee7f55c8
2 changed files with 2 additions and 2 deletions

View File

@ -179,7 +179,7 @@ class EditorPresenter extends BasePresenter<EditorMvp.View> implements EditorMvp
CommentRequestModel requestModel = new CommentRequestModel();
requestModel.setBody(savedText.toString());
makeRestCall(RestProvider.getRepoService().editCommitComment(login, itemId, id, requestModel),
comment -> sendToView(view -> view.onSendResultAndFinish(comment, true)));
comment -> sendToView(view -> view.onSendResultAndFinish(comment, false)));
}
}
}

View File

@ -143,7 +143,7 @@ public class CommitCommentsFragments extends BaseFragment<CommitCommentsMvp.View
.put(BundleConstant.EXTRA_THREE, getPresenter().sha())
.put(BundleConstant.EXTRA_FOUR, item.getId())
.put(BundleConstant.EXTRA, item.getBody())
.put(BundleConstant.EXTRA_TYPE, BundleConstant.ExtraTYpe.EDIT_COMMIT_COMMENT_EXTRA)
.put(BundleConstant.EXTRA_TYPE, BundleConstant.ExtraTYpe.EDIT_ISSUE_COMMENT_EXTRA)
.end());
View view = getActivity() != null && getActivity().findViewById(R.id.fab) != null ? getActivity().findViewById(R.id.fab) : recycler;
ActivityHelper.startReveal(this, intent, view, BundleConstant.REQUEST_CODE);