From 23da6515ce1852ed7603fc25fc968065c2ba6325 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20P=C3=B3=C5=82grabia?= <tomasz.polgrabia@gmail.com>
Date: Sun, 9 Oct 2016 22:33:20 +0200
Subject: [PATCH] Fixing issue (not hiding progress dialo) on manual refresh.

---
 .../urbanexplorer/fragments/PlacesFragment.java      | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/PlacesFragment.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/PlacesFragment.java
index ace0c23..fef5fc5 100644
--- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/PlacesFragment.java
+++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/PlacesFragment.java
@@ -33,6 +33,7 @@ import pl.tpolgrabia.urbanexplorer.events.LocationChangedEvent;
 import pl.tpolgrabia.urbanexplorer.handlers.GooglePlacesLongClickItemHandler;
 import pl.tpolgrabia.urbanexplorer.handlers.GooglePlacesScrollListener;
 import pl.tpolgrabia.urbanexplorer.worker.GooglePlacesWorker;
+import pl.tpolgrabia.urbanexplorerutils.events.DataLoadingFinishEvent;
 import pl.tpolgrabia.urbanexplorerutils.events.RefreshEvent;
 import pl.tpolgrabia.urbanexplorerutils.utils.LocationUtils;
 import pl.tpolgrabia.urbanexplorerutils.utils.SettingsUtils;
@@ -79,6 +80,7 @@ public class PlacesFragment extends Fragment {
         final ListView placesWidget = (ListView) inflatedView.findViewById(R.id.google_places);
         placesWidget.setOnItemLongClickListener(new GooglePlacesLongClickItemHandler(this, placesWidget));
         placesWidget.setOnScrollListener(new GooglePlacesScrollListener(this));
+        placesWidget.setAdapter(new PlacesAdapter(getActivity(), places));
 
         return inflatedView;
     }
@@ -214,8 +216,10 @@ public class PlacesFragment extends Fragment {
         if (!semaphore.tryAcquire()) {
             // running
             lg.debug("Active fetching nearby, quitting...");
+            EventBus.getDefault().post(new DataLoadingFinishEvent(this));
             return;
         }
+
         Toast.makeText(getActivity(),
             String.format(AppConstants.DEF_APP_LOCALE,
                 "Fetching nearby places %.3f,%.3f",
@@ -289,8 +293,7 @@ public class PlacesFragment extends Fragment {
             noMoreResults = true;
         }
 
-        MainActivity activity = (MainActivity) getActivity();
-        activity.hideProgress();
+        EventBus.getDefault().post(new DataLoadingFinishEvent(this));
         semaphore.release();
     }
 
@@ -339,6 +342,7 @@ public class PlacesFragment extends Fragment {
 
         if (getView() == null) {
             lg.debug("Sorry, headless fragment");
+            EventBus.getDefault().post(new DataLoadingFinishEvent(this));
             return;
         }
 
@@ -354,7 +358,9 @@ public class PlacesFragment extends Fragment {
     private void cleanAdapter() {
         ListView plagesWidget = (ListView) getView().findViewById(R.id.google_places);
         PlacesAdapter adapter = (PlacesAdapter) plagesWidget.getAdapter();
-        adapter.clear();
+        if (adapter != null) {
+            adapter.clear();
+        }
     }
 
 }