tomasz
/
urban-explorer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moving get last location to the proper util class.

master
Tomasz Półgrabia 2016-09-20 21:32:15 +02:00
parent 8d447ffb37
commit e6b54812a0
4 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/HomeFragment.java
View File

@ -1,9 +1,7 @@
package pl.tpolgrabia.urbanexplorer.fragments; package pl.tpolgrabia.urbanexplorer.fragments;
import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.location.Location; import android.location.Location;
import android.location.LocationManager;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.annotation.Nullable; 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.PanoramioCacheDto;
import pl.tpolgrabia.urbanexplorer.dto.panoramio.PanoramioImageInfo; import pl.tpolgrabia.urbanexplorer.dto.panoramio.PanoramioImageInfo;
import pl.tpolgrabia.urbanexplorer.utils.LocationUtils; import pl.tpolgrabia.urbanexplorer.utils.LocationUtils;
import pl.tpolgrabia.urbanexplorer.utils.NetUtils;
import pl.tpolgrabia.urbanexplorer.utils.PanoramioUtils; import pl.tpolgrabia.urbanexplorer.utils.PanoramioUtils;
import java.io.*; import java.io.*;
@ -119,7 +116,7 @@ public class HomeFragment extends Fragment implements Refreshable {
return; return;
} }
Location currLocation = NetUtils.getLastKnownLocation(getActivity()); Location currLocation = LocationUtils.getLastKnownLocation(getActivity());
lg.debug("Current location is {}", currLocation); lg.debug("Current location is {}", currLocation);
if (currLocation == null) { if (currLocation == null) {
lg.debug("Current location is not available"); 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) { if (location == null) {
lg.info("Location still not available"); lg.info("Location still not available");
@ -368,7 +365,7 @@ public class HomeFragment extends Fragment implements Refreshable {
MainActivity mainActivity = (MainActivity) getActivity(); MainActivity mainActivity = (MainActivity) getActivity();
final Location location = NetUtils.getLastKnownLocation(activity); final Location location = LocationUtils.getLastKnownLocation(activity);
if (location == null) { if (location == null) {
lg.info("Location is still not available"); lg.info("Location is still not available");
mainActivity.hideProgress(); mainActivity.hideProgress();
@ -464,7 +461,7 @@ public class HomeFragment extends Fragment implements Refreshable {
lg.warn("Activity should'nt be null. No headless fragment"); lg.warn("Activity should'nt be null. No headless fragment");
return; return;
} }
final Location currLocation = NetUtils.getLastKnownLocation(activity); final Location currLocation = LocationUtils.getLastKnownLocation(activity);
lg.trace("Current location: {}, locationInfo: {}", currLocation, locationInfo); lg.trace("Current location: {}, locationInfo: {}", currLocation, locationInfo);
locationInfo.setText(currentGeocodedLocation); locationInfo.setText(currentGeocodedLocation);
@ -490,7 +487,7 @@ public class HomeFragment extends Fragment implements Refreshable {
PanoramioCacheDto dto = new PanoramioCacheDto(); PanoramioCacheDto dto = new PanoramioCacheDto();
dto.setPanoramioImages(photos); dto.setPanoramioImages(photos);
Location location = NetUtils.getLastKnownLocation(getActivity()); Location location = LocationUtils.getLastKnownLocation(getActivity());
if (location != null) { if (location != null) {
dto.setLongitude(location.getLongitude()); dto.setLongitude(location.getLongitude());
dto.setLatitude(location.getLatitude()); dto.setLatitude(location.getLatitude());

6
app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/WikiLocationsFragment.java
View File

@ -150,7 +150,7 @@ public class WikiLocationsFragment extends Fragment implements Refreshable {
return; return;
} }
final Location location = NetUtils.getLastKnownLocation(activity); final Location location = LocationUtils.getLastKnownLocation(activity);
if (location == null) { if (location == null) {
lg.info("Sorry, location is still not available"); lg.info("Sorry, location is still not available");
@ -236,7 +236,7 @@ public class WikiLocationsFragment extends Fragment implements Refreshable {
return; return;
} }
Location location = NetUtils.getLastKnownLocation(getActivity()); Location location = LocationUtils.getLastKnownLocation(getActivity());
LocationUtils.getGeoCodedLocation(getActivity(), location.getLatitude(), location.getLongitude(), new LocationGeoCoderCallback() { LocationUtils.getGeoCodedLocation(getActivity(), location.getLatitude(), location.getLongitude(), new LocationGeoCoderCallback() {
@Override @Override
public void callback(int code, String message, String googleStatus, String geocodedLocation) { 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(); WikiCacheDto dto = new WikiCacheDto();
dto.setAppObject(appObjects); dto.setAppObject(appObjects);
if (getActivity() != null) { if (getActivity() != null) {
Location location = NetUtils.getLastKnownLocation(getActivity()); Location location = LocationUtils.getLastKnownLocation(getActivity());
if (location != null) { if (location != null) {
dto.setLongitude(location.getLongitude()); dto.setLongitude(location.getLongitude());
dto.setLatitude(location.getLatitude()); dto.setLatitude(location.getLatitude());

12
app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/LocationUtils.java
View File

@ -1,6 +1,7 @@
package pl.tpolgrabia.urbanexplorer.utils; package pl.tpolgrabia.urbanexplorer.utils;
import android.content.Context; import android.content.Context;
import android.location.Location;
import android.location.LocationManager; import android.location.LocationManager;
import com.androidquery.AQuery; import com.androidquery.AQuery;
import com.androidquery.callback.AjaxCallback; 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);
}
} }

13
app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/NetUtils.java
View File

@ -93,18 +93,7 @@ public class NetUtils {
AppConstants.DEF_HTTP_PROXY_ENABLED); AppConstants.DEF_HTTP_PROXY_ENABLED);
} }
public static Location getLastKnownLocation(Context ctx) { static LocationManager getSystemService(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) {
return (LocationManager) ctx.getSystemService(Context.LOCATION_SERVICE); return (LocationManager) ctx.getSystemService(Context.LOCATION_SERVICE);
} }
} }