From 030a5b85b4368562da9051948a45bea4a339cff2 Mon Sep 17 00:00:00 2001
From: ne1c <codeneic@gmail.com>
Date: Tue, 15 Dec 2015 00:27:33 +0200
Subject: [PATCH] Fix

---
 .../developerstalk/ui/fragments/ChatRoomFragment.java     | 4 ++--
 .../developerstalk/ui/fragments/RoomsListFragment.java    | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/ne1c/developerstalk/ui/fragments/ChatRoomFragment.java b/app/src/main/java/com/ne1c/developerstalk/ui/fragments/ChatRoomFragment.java
index 8e03c0f..ae391bc 100644
--- a/app/src/main/java/com/ne1c/developerstalk/ui/fragments/ChatRoomFragment.java
+++ b/app/src/main/java/com/ne1c/developerstalk/ui/fragments/ChatRoomFragment.java
@@ -369,9 +369,9 @@ public void showMessages(ArrayList<MessageModel> messages, boolean showProgress,
         if (mProgressBar.getVisibility() == View.VISIBLE) {
             mPtrFrameLayout.setVisibility(View.VISIBLE);
             mProgressBar.setVisibility(View.GONE);
-        }
 
-        isRefreshing = false;
+            isRefreshing = false;
+        }
     }
 
     @Override
diff --git a/app/src/main/java/com/ne1c/developerstalk/ui/fragments/RoomsListFragment.java b/app/src/main/java/com/ne1c/developerstalk/ui/fragments/RoomsListFragment.java
index 0975aab..61466af 100644
--- a/app/src/main/java/com/ne1c/developerstalk/ui/fragments/RoomsListFragment.java
+++ b/app/src/main/java/com/ne1c/developerstalk/ui/fragments/RoomsListFragment.java
@@ -73,7 +73,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
         mPresenter.bindView(this);
         mPresenter.loadCachedRooms();
-        mPresenter.loadRooms();
 
         return v;
     }
@@ -82,6 +81,13 @@ public boolean isEdit() {
         return mIsEdit;
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        mPresenter.loadRooms();
+    }
+
     public void setEdit(boolean edit) {
         mIsEdit = edit;
         if (edit) {