diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/MainActivity.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/MainActivity.java index 97388b5..ce645ce 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/MainActivity.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/MainActivity.java @@ -248,7 +248,7 @@ public class MainActivity extends ActionBarActivity { String.valueOf(AppConstants.GPS_LOCATION_UPDATE_FREQ)); Log.d(CLASS_TAG, "Pref GPS location update frequency " + prefGpsUpdateFreq); - return NumberUtils.safeParseLong(prefGpsUpdateFreq); + return Math.round(NumberUtils.safeParseDouble(prefGpsUpdateFreq)* 60.0 * 1000.0); } @Override 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 e8bcfaf..c42d7fe 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/HomeFragment.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/HomeFragment.java @@ -8,6 +8,7 @@ import android.os.Bundle; import android.preference.PreferenceManager; import android.support.annotation.Nullable; import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentActivity; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -42,7 +43,6 @@ public class HomeFragment extends Fragment { private Long pageId; private Semaphore loading; private List photos; - private String locationProvider; private boolean noMorePhotos; public HomeFragment() { @@ -171,22 +171,23 @@ public class HomeFragment extends Fragment { return; } - if (locationProvider == null) { - Log.i(CLASS_TAG, "Location providers not available"); - Toast.makeText(getActivity(), "Location provicers not available", Toast.LENGTH_SHORT).show(); - return; - } if (getView() == null) { Log.v(CLASS_TAG, "Application still not initialized"); return; } - final Location location = locationService.getLastKnownLocation(locationProvider); + final FragmentActivity activity = getActivity(); + if (activity == null) { + Log.w(CLASS_TAG, "Activity shouldn't be null. No headless fragment"); + return; + } + + final Location location = locationService.getLastKnownLocation(LocationUtils.getDefaultLocation(activity)); if (location == null) { Log.i(CLASS_TAG, "Location still not available"); - Toast.makeText(getActivity(), "Location still not available", Toast.LENGTH_SHORT).show(); + Toast.makeText(activity, "Location still not available", Toast.LENGTH_SHORT).show(); return; } @@ -198,12 +199,10 @@ public class HomeFragment extends Fragment { int offset = photos.size(); - Log.v(CLASS_TAG, "Fetching additional photos offset: " + offset + ", count: " + PANORAMIA_BULK_DATA_SIZE); - Log.d(CLASS_TAG, "Fetching location using " + locationProvider + " provider"); PanoramioUtils.fetchPanoramioImages( - getActivity(), + activity, location.getLatitude(), location.getLongitude(), fetchRadiusX(), @@ -224,7 +223,7 @@ public class HomeFragment extends Fragment { photos.addAll(images); noMorePhotos = images.isEmpty(); if (adapter == null) { - locations.setAdapter(new PanoramioAdapter(getActivity(), R.id.list_item, images)); + locations.setAdapter(new PanoramioAdapter(activity, R.id.list_item, images)); } else { adapter.addAll(images); } @@ -243,11 +242,17 @@ public class HomeFragment extends Fragment { } private void fetchPanoramioPhotos() { - final Location location = locationService.getLastKnownLocation(LocationUtils.getDefaultLocation(getActivity())); + final FragmentActivity activity = getActivity(); + if (activity == null) { + Log.w(CLASS_TAG, "Activity shouldn't be null. It isn't headless fragment"); + return; + } + + final Location location = locationService.getLastKnownLocation(LocationUtils.getDefaultLocation(activity)); Double radiusX = fetchRadiusX(); Double radiusY = fetchRadiusY(); PanoramioUtils.fetchPanoramioImages( - getActivity(), + activity, location.getLatitude(), location.getLongitude(), radiusX, @@ -261,7 +266,7 @@ public class HomeFragment extends Fragment { Long start = (pageId - 1) * pageSize + 1; Long end = pageId * pageSize; - ArrayAdapter adapter = new PanoramioAdapter(getActivity(), + ArrayAdapter adapter = new PanoramioAdapter(activity, R.layout.location_item, images); ListView locations = (ListView)getView().findViewById(R.id.locations); @@ -299,7 +304,6 @@ public class HomeFragment extends Fragment { public void onResume() { super.onResume(); Log.v(CLASS_TAG, "onResume"); - locationProvider = LocationUtils.getDefaultLocation(getActivity()); updateLocationInfo(); } @@ -310,8 +314,13 @@ public class HomeFragment extends Fragment { return; } TextView locationInfo = (TextView) view.findViewById(R.id.locationInfo); - locationService = (LocationManager)getActivity().getSystemService(Context.LOCATION_SERVICE); - Location currLocation = locationService.getLastKnownLocation(LocationUtils.getDefaultLocation(getActivity())); + final FragmentActivity activity = getActivity(); + if (activity == null) { + Log.w(CLASS_TAG, "Activity should'nt be null. No headless fragment"); + return; + } + locationService = (LocationManager) activity.getSystemService(Context.LOCATION_SERVICE); + Location currLocation = locationService.getLastKnownLocation(LocationUtils.getDefaultLocation(activity)); Log.v(CLASS_TAG, "Current location: " + currLocation + ", locationInfo: " + locationInfo); if (currLocation != null && locationInfo != null) { // update home fragment's location info 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 b781faa..503ae01 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/WikiLocationsFragment.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/WikiLocationsFragment.java @@ -8,6 +8,7 @@ import android.location.LocationManager; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentActivity; import android.text.Editable; import android.util.Log; import android.view.LayoutInflater; @@ -40,7 +41,7 @@ public class WikiLocationsFragment extends Fragment { private static final String CLASS_TAG = WikiLocationsFragment.class.getSimpleName(); - private static final double WIKI_DEF_RADIUS = 10000.0; + private static final double WIKI_DEF_RADIUS = 10.0; private static final long WIKI_DEF_LIMIT = 100; private LocationManager locationService; private TextView currentLocation; @@ -72,11 +73,16 @@ public class WikiLocationsFragment extends Fragment { } private void fetchWikiLocations() { - final Location location = locationService.getLastKnownLocation(LocationUtils.getDefaultLocation(getActivity())); + final FragmentActivity activity = getActivity(); + if (activity == null) { + Log.w(CLASS_TAG, "Activity shouldn't be null. No headless fragment"); + return; + } + final Location location = locationService.getLastKnownLocation(LocationUtils.getDefaultLocation(activity)); if (location == null) { Log.i(CLASS_TAG, "Sorry, location is still not available"); - Toast.makeText(getActivity(), "Sorry, location is still not available", Toast.LENGTH_SHORT).show(); + Toast.makeText(activity, "Sorry, location is still not available", Toast.LENGTH_SHORT).show(); return; } @@ -85,7 +91,7 @@ public class WikiLocationsFragment extends Fragment { return; } - WikiUtils.fetchAppData(getActivity(), + WikiUtils.fetchAppData(activity, location.getLatitude(), location.getLongitude(), fetchRadiusLimit(), @@ -95,7 +101,7 @@ public class WikiLocationsFragment extends Fragment { public void callback(WikiStatus status, final List appObjects) { // handling here wiki locations if (status != WikiStatus.SUCCESS) { - Toast.makeText(getActivity(), "Sorry, currently we have problem with interfacing wiki" + + Toast.makeText(activity, "Sorry, currently we have problem with interfacing wiki" + ": " + status + ". Try again later", Toast.LENGTH_SHORT).show(); return; } @@ -104,7 +110,7 @@ public class WikiLocationsFragment extends Fragment { ListView locations = (ListView) getView().findViewById(R.id.wiki_places); locations.setOnItemLongClickListener(new FetchWikiLocationsCallback(WikiLocationsFragment.this, appObjects)); - locations.setAdapter(new WikiLocationsAdapter(getActivity(), appObjects)); + locations.setAdapter(new WikiLocationsAdapter(activity, appObjects)); } } ); @@ -131,7 +137,12 @@ public class WikiLocationsFragment extends Fragment { } public void updateLocationInfo() { - final Location location = locationService.getLastKnownLocation(LocationUtils.getDefaultLocation(getActivity())); + final FragmentActivity activity = getActivity(); + if (activity == null) { + Log.w(CLASS_TAG, "Activity shouldn't be null. No headless fragment"); + return; + } + final Location location = locationService.getLastKnownLocation(LocationUtils.getDefaultLocation(activity)); if (location != null) { currentLocation.setText("Your current location: (" + 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 cb64bd3..12b6b48 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/LocationUtils.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/LocationUtils.java @@ -2,12 +2,18 @@ package pl.tpolgrabia.urbanexplorer.utils; import android.content.Context; import android.location.LocationManager; +import android.util.Log; /** * Created by tpolgrabia on 28.08.16. */ public class LocationUtils { public static String getDefaultLocation(Context ctx) { + + if (ctx == null) { + throw new IllegalArgumentException("Context cannot be null"); + } + LocationManager locationService = (LocationManager) ctx.getSystemService(Context.LOCATION_SERVICE); if (locationService.isProviderEnabled(LocationManager.GPS_PROVIDER)) { return LocationManager.GPS_PROVIDER; diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/WikiUtils.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/WikiUtils.java index b5ab8f7..2c6061c 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/WikiUtils.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/WikiUtils.java @@ -179,7 +179,7 @@ public class WikiUtils { "?action=query" + "&list=geosearch" + "&gscoord=" + latitude + "%7C" + longitude + - "&gsradius=" + radius + + "&gsradius=" + String.format("%.2f", radius) + "&gslimit=" + limit + "&format=json", JSONObject.class, new AjaxCallback() { @Override