From bf8cd920535dea5cc99eb52229b13f7d9754d825 Mon Sep 17 00:00:00 2001
From: Kosh <kosh20111@gmail.com>
Date: Tue, 14 Mar 2017 21:39:27 +0800
Subject: [PATCH] this commit fixed #147 & adds missing dependency for travis.

---
 app/build.gradle                                             | 1 +
 .../ui/modules/profile/overview/ProfileOverviewMvp.java      | 2 +-
 .../modules/profile/overview/ProfileOverviewPresenter.java   | 5 +++--
 .../ui/modules/profile/overview/ProfileOverviewView.java     | 3 ++-
 build.gradle                                                 | 1 +
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 907c28b4..255547d1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,6 +4,7 @@ apply plugin: "com.neenbedankt.android-apt"
 apply plugin: 'com.siimkinks.sqlitemagic'
 apply plugin: 'com.google.firebase.firebase-crash'
 apply plugin: 'com.novoda.build-properties'
+apply plugin: "jacoco-android"
 
 buildProperties {
     notThere {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/overview/ProfileOverviewMvp.java b/app/src/main/java/com/fastaccess/ui/modules/profile/overview/ProfileOverviewMvp.java
index 801d66e6..e03ab345 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/profile/overview/ProfileOverviewMvp.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/profile/overview/ProfileOverviewMvp.java
@@ -15,12 +15,12 @@ interface ProfileOverviewMvp {
 
     interface View extends BaseMvp.FAView {
         void onInitViews(@Nullable UserModel userModel);
+
         void onInvalidateMenuItem();
     }
 
     interface Presenter extends BaseMvp.FAPresenter {
 
-
         void onFragmentCreated(@Nullable Bundle bundle);
 
         void onWorkOffline(@NonNull String login);
diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/overview/ProfileOverviewPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/profile/overview/ProfileOverviewPresenter.java
index 393588f5..35c71463 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/profile/overview/ProfileOverviewPresenter.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/profile/overview/ProfileOverviewPresenter.java
@@ -22,7 +22,6 @@ class ProfileOverviewPresenter extends BasePresenter<ProfileOverviewMvp.View> im
     private boolean isFollowing;
     private String login;
 
-
     @Override public void onCheckFollowStatus(@NonNull String login) {
         if (!TextUtils.equals(login, LoginModel.getUser().getLogin()))
             makeRestCall(RestProvider.getUserService().getFollowStatus(login),
@@ -69,9 +68,11 @@ class ProfileOverviewPresenter extends BasePresenter<ProfileOverviewMvp.View> im
             makeRestCall(RestProvider.getUserService().getUser(login),
                     userModel -> {
                         onSendUserToView(userModel);
-                        onCheckFollowStatus(login);
                         if (userModel != null) {
                             userModel.save();
+                            if (userModel.getType() != null && userModel.getType().equals("user")) {
+                                onCheckFollowStatus(login);
+                            }
                         }
                     });
         }
diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/overview/ProfileOverviewView.java b/app/src/main/java/com/fastaccess/ui/modules/profile/overview/ProfileOverviewView.java
index 3dc02eb1..479fa6fc 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/profile/overview/ProfileOverviewView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/profile/overview/ProfileOverviewView.java
@@ -90,8 +90,8 @@ public class ProfileOverviewView extends BaseFragment<ProfileOverviewMvp.View, P
             getPresenter().onFragmentCreated(getArguments());
         } else {
             if (userModel != null) {
-                onInitViews(userModel);
                 onInvalidateMenuItem();
+                onInitViews(userModel);
             } else {
                 getPresenter().onFragmentCreated(getArguments());
             }
@@ -109,6 +109,7 @@ public class ProfileOverviewView extends BaseFragment<ProfileOverviewMvp.View, P
         progress.setVisibility(View.GONE);
         if (userModel == null) return;
         this.userModel = userModel;
+        followBtn.setVisibility(!InputHelper.isEmpty(userModel.getType()) && userModel.getType().equalsIgnoreCase("user") ? View.VISIBLE : View.GONE);
         username.setText(userModel.getLogin());
         description.setText(userModel.getBio());
         avatarLayout.setUrl(userModel.getAvatarUrl(), null);
diff --git a/build.gradle b/build.gradle
index 556a0543..e732e2e0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,6 +14,7 @@ buildscript {
         classpath 'com.siimkinks.sqlitemagic:sqlitemagic-plugin:0.11.0'
         classpath 'com.google.firebase:firebase-plugins:1.0.5'
         classpath 'com.novoda:gradle-build-properties-plugin:0.3'
+        classpath "com.dicedmelon.gradle:jacoco-android:0.1.1"
     }
     configurations.classpath.exclude group: 'com.android.tools.external.lombok'
 }