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

Code refactoring.

master
Tomasz Półgrabia 2016-09-19 21:23:11 +02:00
parent 6182d3b042
commit 66dc09bdb7
2 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,29 +165,33 @@ public class MainActivity extends ActionBarActivity {
case R.id.refresh: case R.id.refresh:
progressDlg.setMessage("Refreshing results"); progressDlg.setMessage("Refreshing results");
progressDlg.show(); progressDlg.show();
switch (currentFragmentId) { refreshFragment();
case HOME_FRAGMENT_ID:
HomeFragment homeFragment = (HomeFragment) getSupportFragmentManager()
.findFragmentByTag(HomeFragment.TAG);
homeFragment.fetchPanoramioPhotos();
break;
case WIKI_FRAGMENT_ID:
WikiLocationsFragment wikiLocationsFragment = (WikiLocationsFragment)
getSupportFragmentManager()
.findFragmentByTag(WikiLocationsFragment.TAG);
wikiLocationsFragment.clearData();
wikiLocationsFragment.fetchWikiLocations();
break;
default:
lg.warn("Unknown current fragment ID");
break;
}
return true; return true;
default: default:
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
} }
private void refreshFragment() {
switch (currentFragmentId) {
case HOME_FRAGMENT_ID:
HomeFragment homeFragment = (HomeFragment) getSupportFragmentManager()
.findFragmentByTag(HomeFragment.TAG);
homeFragment.fetchPanoramioPhotos();
break;
case WIKI_FRAGMENT_ID:
WikiLocationsFragment wikiLocationsFragment = (WikiLocationsFragment)
getSupportFragmentManager()
.findFragmentByTag(WikiLocationsFragment.TAG);
wikiLocationsFragment.clearData();
wikiLocationsFragment.fetchWikiLocations();
break;
default:
lg.warn("Unknown current fragment ID");
break;
}
}
public void resetPhotoInfo() { public void resetPhotoInfo() {
this.photoInfo = null; this.photoInfo = null;
} }
@ -347,12 +351,16 @@ public class MainActivity extends ActionBarActivity {
private boolean checkForLocalicatonEnabled() { private boolean checkForLocalicatonEnabled() {
lg.trace("Check for location enabled");
final String locationProvider = LocationUtils.getDefaultLocation(this); final String locationProvider = LocationUtils.getDefaultLocation(this);
lg.debug("Location provider {}", locationProvider);
if (locationProvider == null) { if (locationProvider == null) {
lg.debug("Location provider is null. Prompting for enabling location services");
Intent locationSettingsIntent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS); Intent locationSettingsIntent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
startActivityForResult(locationSettingsIntent, LOCATION_SETTINGS_REQUEST_ID); startActivityForResult(locationSettingsIntent, LOCATION_SETTINGS_REQUEST_ID);
return true; return true;
} }
return false; return false;
} }
@ -415,14 +423,7 @@ public class MainActivity extends ActionBarActivity {
switch (requestCode) { switch (requestCode) {
case LOCATION_SETTINGS_REQUEST_ID: case LOCATION_SETTINGS_REQUEST_ID:
String locationProvider = LocationUtils.getDefaultLocation(this); refreshFragment();
if (locationProvider == null) {
// launching settings activity to allow the user switching on location service
Intent intent = new Intent(this, SettingsActivity.class);
startActivity(intent);
}
break; break;
case SETTINGS_ID_INTENT_REQUEST_ID: case SETTINGS_ID_INTENT_REQUEST_ID:
NetUtils.setGlobalProxyAuth(this); NetUtils.setGlobalProxyAuth(this);

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

@ -2,11 +2,15 @@ package pl.tpolgrabia.urbanexplorer.utils;
import android.content.Context; import android.content.Context;
import android.location.LocationManager; import android.location.LocationManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* Created by tpolgrabia on 28.08.16. * Created by tpolgrabia on 28.08.16.
*/ */
public class LocationUtils { public class LocationUtils {
private static final Logger lg = LoggerFactory.getLogger(LocationUtils.class);
public static String getDefaultLocation(Context ctx) { public static String getDefaultLocation(Context ctx) {
if (ctx == null) { if (ctx == null) {
@ -15,13 +19,19 @@ public class LocationUtils {
LocationManager locationService = (LocationManager) ctx.getSystemService(Context.LOCATION_SERVICE); LocationManager locationService = (LocationManager) ctx.getSystemService(Context.LOCATION_SERVICE);
if (locationService.isProviderEnabled(LocationManager.GPS_PROVIDER)) { if (locationService.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
lg.debug("GPS location provider is enabled");
return LocationManager.GPS_PROVIDER; return LocationManager.GPS_PROVIDER;
} }
if (locationService.isProviderEnabled(LocationManager.NETWORK_PROVIDER)) { if (locationService.isProviderEnabled(LocationManager.NETWORK_PROVIDER)) {
lg.debug("Network location provider is enabled");
return LocationManager.NETWORK_PROVIDER; return LocationManager.NETWORK_PROVIDER;
} }
lg.trace("All provider: {}", locationService.getAllProviders());
lg.debug("All location providers all disabled");
return null; return null;
} }
} }