From 0d188d630c256c670636f2bfe465655f9ac1df4b Mon Sep 17 00:00:00 2001 From: misaochan Date: Mon, 8 Feb 2016 15:39:42 +1300 Subject: [PATCH] onResume() method for calling registerLocationManager --- .../free/nrw/commons/upload/GPSExtractor.java | 4 ++-- .../nrw/commons/upload/ShareActivity.java | 19 +++++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java b/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java index 3db6460ec..ef97963eb 100644 --- a/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java +++ b/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java @@ -38,12 +38,12 @@ public class GPSExtractor { return gpsPref; } - private void registerLocationManager() { + protected void registerLocationManager() { locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE); criteria = new Criteria(); provider = locationManager.getBestProvider(criteria, true); myLocationListener = new MyLocationListener(); - + locationManager.requestLocationUpdates(provider, 400, 1, myLocationListener); } diff --git a/commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java b/commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java index f07dce191..27f4ec091 100644 --- a/commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java +++ b/commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java @@ -34,6 +34,8 @@ public class ShareActivity implements SingleUploadFragment.OnUploadActionInitiated, CategorizationFragment.OnCategoriesSaveHandler { + private static final String TAG = ShareActivity.class.getName(); + private SingleUploadFragment shareView; private CategorizationFragment categorizationFragment; @@ -44,17 +46,14 @@ public class ShareActivity private String mediaUriString; private Uri mediaUri; - private Contribution contribution; - private ImageView backgroundImageView; - private UploadController uploadController; private CommonsApplication cacheObj; private boolean cacheFound; - private static final String TAG = ShareActivity.class.getName(); + private GPSExtractor imageObj; public ShareActivity() { super(WikiAccountAuthenticator.COMMONS_ACCOUNT_TYPE); @@ -197,11 +196,10 @@ public class ShareActivity String filePath = FileUtils.getPath(this, mediaUri); Log.d(TAG, "Filepath: " + filePath); - if (filePath != null && !filePath.equals("")) { - //extract the coordinates of image in decimal degrees - Log.d(TAG, "Calling GPSExtractor"); - GPSExtractor imageObj = new GPSExtractor(filePath, this); + Log.d(TAG, "Calling GPSExtractor"); + imageObj = new GPSExtractor(filePath, this); + if (filePath != null && !filePath.equals("")) { //Gets image coords if exist, otherwise gets last known coords String decimalCoords = imageObj.getCoords(); @@ -240,6 +238,11 @@ public class ShareActivity requestAuthToken(); } + @Override + public void onResume() { + super.onResume(); + imageObj.registerLocationManager(); + } @Override protected void onDestroy() {