From e3d37df77d228a4815d6ed6a1f579101e9fb7caa Mon Sep 17 00:00:00 2001
From: Kosh <kosh20111@gmail.com>
Date: Mon, 3 Apr 2017 00:50:34 +0800
Subject: [PATCH] releasing 1.5.0

---
 app/build.gradle                                    |  4 ++--
 .../gists/gist/comments/GistCommentsPresenter.java  | 13 +++++++++----
 .../issue/details/timeline/IssueTimelineView.java   |  2 --
 .../timeline/timeline/PullRequestTimelineView.java  |  2 --
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index afd42720..49f65f10 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,8 +27,8 @@ android {
         applicationId "com.fastaccess.github"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 141
-        versionName "1.4.1"
+        versionCode 150
+        versionName "1.5.0"
         signingConfig signingConfigs.signing
         buildConfigString "GITHUB_CLIENT_ID", (buildProperties.secrets['github_client_id'] | buildProperties.notThere['github_client_id']).string
         buildConfigString "GITHUB_SECRET", (buildProperties.secrets['github_secret'] | buildProperties.notThere['github_secret']).string
diff --git a/app/src/main/java/com/fastaccess/ui/modules/gists/gist/comments/GistCommentsPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/gists/gist/comments/GistCommentsPresenter.java
index a2182513..5271286b 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/gists/gist/comments/GistCommentsPresenter.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/gists/gist/comments/GistCommentsPresenter.java
@@ -113,12 +113,17 @@ class GistCommentsPresenter extends BasePresenter<GistCommentsMvp.View> implemen
     }
 
     @Override public void onItemClick(int position, View v, Comment item) {
-        if (item.getUser() != null) {
-            Login userModel = Login.getUser();
+        Login userModel = Login.getUser();
+        if (getView() == null) return;
+        if (v.getId() == R.id.delete) {
+            if (userModel != null && item.getUser().getLogin().equals(userModel.getLogin())) {
+                getView().onShowDeleteMsg(item.getId());
+            }
+        } else if (item.getId() == R.id.reply) {
+            if (getView() != null) getView().onTagUser(item.getUser());
+        } else if (item.getId() == R.id.edit) {
             if (userModel != null && item.getUser().getLogin().equals(userModel.getLogin())) {
                 if (getView() != null) getView().onEditComment(item);
-            } else {
-                if (getView() != null) getView().onTagUser(item.getUser());
             }
         }
     }
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/timeline/IssueTimelineView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/timeline/IssueTimelineView.java
index 4efe36b9..622c0527 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/timeline/IssueTimelineView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/timeline/IssueTimelineView.java
@@ -194,9 +194,7 @@ public class IssueTimelineView extends BaseFragment<IssueTimelineMvp.View, Issue
     }
 
     @Override public void onToggle(int position, boolean isCollapsed) {
-        getSparseBooleanArray().clear();
         getSparseBooleanArray().put(position, isCollapsed);
-        adapter.notifyDataSetChanged();
     }
 
     @Override public boolean isCollapsed(int position) {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/timeline/timeline/PullRequestTimelineView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/timeline/timeline/PullRequestTimelineView.java
index 9cce2df8..d32ffcb0 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/timeline/timeline/PullRequestTimelineView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/timeline/timeline/PullRequestTimelineView.java
@@ -117,9 +117,7 @@ public class PullRequestTimelineView extends BaseFragment<PullRequestTimelineMvp
     }
 
     @Override public void onToggle(int position, boolean isCollapsed) {
-        getSparseBooleanArray().clear();
         getSparseBooleanArray().put(position, isCollapsed);
-        adapter.notifyDataSetChanged();
     }
 
     @Override public boolean isCollapsed(int position) {