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

Fixing issues when location is not available.

master
Tomasz Półgrabia 2016-09-19 23:18:32 +02:00
parent 32ddf3fd4c
commit 1fc6c53117
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,10 +103,9 @@ public class MainActivity extends ActionBarActivity {
photoInfo = savedInstanceState != null ? (PanoramioImageInfo) savedInstanceState.getSerializable(AppConstants.PHOTO_INFO) : null; photoInfo = savedInstanceState != null ? (PanoramioImageInfo) savedInstanceState.getSerializable(AppConstants.PHOTO_INFO) : null;
savedConfiguration = savedInstanceState != null ? savedInstanceState.getBoolean(AppConstants.SAVED_CONFIG_KEY) : false; savedConfiguration = savedInstanceState != null ? savedInstanceState.getBoolean(AppConstants.SAVED_CONFIG_KEY) : false;
if (HelperUtils.checkForLocalicatonEnabled(this)) return;
switchFragment(); switchFragment();
updateSwipeHandler(); updateSwipeHandler();
HelperUtils.firstTimeNotification(this); if (HelperUtils.checkForLocalicatonEnabled(this)) return;
} }
@Override @Override
@ -151,12 +150,14 @@ public class MainActivity extends ActionBarActivity {
final String tag = fragTags.get(currFrag); final String tag = fragTags.get(currFrag);
if (tag == null) { if (tag == null) {
lg.warn("Unknown fragment id"); lg.warn("Unknown fragment id");
hideProgress();
return; return;
} }
final Fragment fragment = getSupportFragmentManager().findFragmentByTag(tag); final Fragment fragment = getSupportFragmentManager().findFragmentByTag(tag);
if (fragment == null) { if (fragment == null) {
lg.warn("There is no fragment with the given tag"); lg.warn("There is no fragment with the given tag");
hideProgress();
return; return;
} }
@ -300,6 +301,7 @@ public class MainActivity extends ActionBarActivity {
} }
savedConfiguration = false; savedConfiguration = false;
HelperUtils.firstTimeNotification(this);
} }
@Override @Override

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

@ -270,13 +270,14 @@ public class WikiLocationsFragment extends Fragment implements Refreshable {
WikiCacheDto dto = new WikiCacheDto(); WikiCacheDto dto = new WikiCacheDto();
dto.setAppObject(appObjects); dto.setAppObject(appObjects);
LocationManager locationService = (LocationManager) getActivity().getSystemService(LOCATION_SERVICE); if (getActivity() != null) {
Location location = locationService.getLastKnownLocation(LocationUtils.getDefaultLocation(getActivity())); Location location = NetUtils.getLastKnownLocation(getActivity());
if (location != null) { if (location != null) {
dto.setLongitude(location.getLongitude()); dto.setLongitude(location.getLongitude());
dto.setLatitude(location.getLatitude()); dto.setLatitude(location.getLatitude());
dto.setAltitude(location.getAltitude()); dto.setAltitude(location.getAltitude());
} }
}
dto.setFetchedAt(new GregorianCalendar().getTime()); dto.setFetchedAt(new GregorianCalendar().getTime());
// FIXME should be a fetched time, not persist time // FIXME should be a fetched time, not persist time