From e6b54812a03a7e9f9bb0859138a7538466a4cb9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20P=C3=B3=C5=82grabia?= Date: Tue, 20 Sep 2016 21:32:15 +0200 Subject: [PATCH] Moving get last location to the proper util class. --- .../urbanexplorer/fragments/HomeFragment.java | 13 +++++-------- .../fragments/WikiLocationsFragment.java | 6 +++--- .../urbanexplorer/utils/LocationUtils.java | 12 ++++++++++++ .../pl/tpolgrabia/urbanexplorer/utils/NetUtils.java | 13 +------------ 4 files changed, 21 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/HomeFragment.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/HomeFragment.java index 75c9608..b6827ac 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/HomeFragment.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/HomeFragment.java @@ -1,9 +1,7 @@ package pl.tpolgrabia.urbanexplorer.fragments; -import android.content.Context; import android.content.SharedPreferences; import android.location.Location; -import android.location.LocationManager; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.annotation.Nullable; @@ -24,7 +22,6 @@ import pl.tpolgrabia.urbanexplorer.callbacks.*; import pl.tpolgrabia.urbanexplorer.dto.panoramio.PanoramioCacheDto; import pl.tpolgrabia.urbanexplorer.dto.panoramio.PanoramioImageInfo; import pl.tpolgrabia.urbanexplorer.utils.LocationUtils; -import pl.tpolgrabia.urbanexplorer.utils.NetUtils; import pl.tpolgrabia.urbanexplorer.utils.PanoramioUtils; import java.io.*; @@ -119,7 +116,7 @@ public class HomeFragment extends Fragment implements Refreshable { return; } - Location currLocation = NetUtils.getLastKnownLocation(getActivity()); + Location currLocation = LocationUtils.getLastKnownLocation(getActivity()); lg.debug("Current location is {}", currLocation); if (currLocation == null) { lg.debug("Current location is not available"); @@ -283,7 +280,7 @@ public class HomeFragment extends Fragment implements Refreshable { } - final Location location = NetUtils.getLastKnownLocation(activity); + final Location location = LocationUtils.getLastKnownLocation(activity); if (location == null) { lg.info("Location still not available"); @@ -368,7 +365,7 @@ public class HomeFragment extends Fragment implements Refreshable { MainActivity mainActivity = (MainActivity) getActivity(); - final Location location = NetUtils.getLastKnownLocation(activity); + final Location location = LocationUtils.getLastKnownLocation(activity); if (location == null) { lg.info("Location is still not available"); mainActivity.hideProgress(); @@ -464,7 +461,7 @@ public class HomeFragment extends Fragment implements Refreshable { lg.warn("Activity should'nt be null. No headless fragment"); return; } - final Location currLocation = NetUtils.getLastKnownLocation(activity); + final Location currLocation = LocationUtils.getLastKnownLocation(activity); lg.trace("Current location: {}, locationInfo: {}", currLocation, locationInfo); locationInfo.setText(currentGeocodedLocation); @@ -490,7 +487,7 @@ public class HomeFragment extends Fragment implements Refreshable { PanoramioCacheDto dto = new PanoramioCacheDto(); dto.setPanoramioImages(photos); - Location location = NetUtils.getLastKnownLocation(getActivity()); + Location location = LocationUtils.getLastKnownLocation(getActivity()); if (location != null) { dto.setLongitude(location.getLongitude()); dto.setLatitude(location.getLatitude()); diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/WikiLocationsFragment.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/WikiLocationsFragment.java index 50483bf..907411c 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/WikiLocationsFragment.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/WikiLocationsFragment.java @@ -150,7 +150,7 @@ public class WikiLocationsFragment extends Fragment implements Refreshable { return; } - final Location location = NetUtils.getLastKnownLocation(activity); + final Location location = LocationUtils.getLastKnownLocation(activity); if (location == null) { lg.info("Sorry, location is still not available"); @@ -236,7 +236,7 @@ public class WikiLocationsFragment extends Fragment implements Refreshable { return; } - Location location = NetUtils.getLastKnownLocation(getActivity()); + Location location = LocationUtils.getLastKnownLocation(getActivity()); LocationUtils.getGeoCodedLocation(getActivity(), location.getLatitude(), location.getLongitude(), new LocationGeoCoderCallback() { @Override public void callback(int code, String message, String googleStatus, String geocodedLocation) { @@ -287,7 +287,7 @@ public class WikiLocationsFragment extends Fragment implements Refreshable { WikiCacheDto dto = new WikiCacheDto(); dto.setAppObject(appObjects); if (getActivity() != null) { - Location location = NetUtils.getLastKnownLocation(getActivity()); + Location location = LocationUtils.getLastKnownLocation(getActivity()); if (location != null) { dto.setLongitude(location.getLongitude()); dto.setLatitude(location.getLatitude()); diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/LocationUtils.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/LocationUtils.java index 229abc7..589546f 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/LocationUtils.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/LocationUtils.java @@ -1,6 +1,7 @@ package pl.tpolgrabia.urbanexplorer.utils; import android.content.Context; +import android.location.Location; import android.location.LocationManager; import com.androidquery.AQuery; import com.androidquery.callback.AjaxCallback; @@ -122,4 +123,15 @@ public class LocationUtils { } }); } + + public static Location getLastKnownLocation(Context ctx) { + String locationProvider = getDefaultLocation(ctx); + + if (locationProvider == null) { + lg.info("Location not available"); + return null; + } + + return NetUtils.getSystemService(ctx).getLastKnownLocation(locationProvider); + } } diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/NetUtils.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/NetUtils.java index 046007e..f0b0bc9 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/NetUtils.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/NetUtils.java @@ -93,18 +93,7 @@ public class NetUtils { AppConstants.DEF_HTTP_PROXY_ENABLED); } - public static Location getLastKnownLocation(Context ctx) { - String locationProvider = LocationUtils.getDefaultLocation(ctx); - - if (locationProvider == null) { - lg.info("Location not available"); - return null; - } - - return getSystemService(ctx).getLastKnownLocation(locationProvider); - } - - private static LocationManager getSystemService(Context ctx) { + static LocationManager getSystemService(Context ctx) { return (LocationManager) ctx.getSystemService(Context.LOCATION_SERVICE); } }