pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Renamed LocationService to avoid confusing with android services.

Browse source
This commit is contained in:
Dmitry Yunitsky 2015-01-20 16:42:18 +03:00 • committed by Alex Zolotarev
parent cdb6ca444c
commit afb05fd523
13 changed files with 58 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/jni/com/mapswithme/maps/MWMActivity.cpp
View file

@ -72,7 +72,7 @@ extern "C"
#pragma clang pop_options
JNIEXPORT jfloatArray JNICALL
Java_com_mapswithme_maps_location_LocationService_nativeUpdateCompassSensor(
Java_com_mapswithme_maps_location_LocationHelper_nativeUpdateCompassSensor(
JNIEnv * env, jobject thiz, jint ind, jfloatArray arr)
{
int const count = 3;

14
android/src/com/mapswithme/maps/DownloadResourcesActivity.java
View file

@ -22,7 +22,7 @@ import com.mapswithme.maps.MapStorage.Index;
import com.mapswithme.maps.api.Const;
import com.mapswithme.maps.api.ParsedMmwRequest;
import com.mapswithme.maps.base.MWMFragmentActivity;
import com.mapswithme.maps.location.LocationService;
import com.mapswithme.maps.location.LocationHelper;
import com.mapswithme.util.ConnectionState;
import com.mapswithme.util.Constants;
import com.mapswithme.util.Utils;
@ -36,7 +36,7 @@ import java.io.OutputStream;
@SuppressLint("StringFormatMatches")
public class DownloadResourcesActivity extends MWMFragmentActivity
implements LocationService.LocationListener, MapStorage.Listener
implements LocationHelper.LocationListener, MapStorage.Listener
{
private static final String TAG = DownloadResourcesActivity.class.getName();
@ -182,7 +182,7 @@ public class DownloadResourcesActivity extends MWMFragmentActivity
mBtnNames[PROCEED_TO_MAP] = getString(R.string.download_resources_continue);
// Start listening the location.
LocationService.INSTANCE.addLocationListener(this);
LocationHelper.INSTANCE.addLocationListener(this);
}
private void setAction(int action)
@ -481,7 +481,7 @@ public class DownloadResourcesActivity extends MWMFragmentActivity
{
super.onDestroy();
LocationService.INSTANCE.removeLocationListener(this);
LocationHelper.INSTANCE.removeLocationListener(this);
if (mMapStorage != null)
mMapStorage.unsubscribe(mSlotId);
@ -492,7 +492,7 @@ public class DownloadResourcesActivity extends MWMFragmentActivity
{
super.onPause();
LocationService.INSTANCE.removeLocationListener(this);
LocationHelper.INSTANCE.removeLocationListener(this);
}
@Override
@ -500,7 +500,7 @@ public class DownloadResourcesActivity extends MWMFragmentActivity
{
super.onResume();
LocationService.INSTANCE.addLocationListener(this);
LocationHelper.INSTANCE.addLocationListener(this);
}
public void onDownloadProgress(int currentTotal, int currentProgress, int globalTotal, int globalProgress)
@ -563,7 +563,7 @@ public class DownloadResourcesActivity extends MWMFragmentActivity
checkBox.setText(checkBoxText);
}
LocationService.INSTANCE.removeLocationListener(this);
LocationHelper.INSTANCE.removeLocationListener(this);
}
}
}

20
android/src/com/mapswithme/maps/MWMActivity.java
View file

@ -60,8 +60,8 @@ import com.mapswithme.maps.bookmarks.data.BookmarkManager;
import com.mapswithme.maps.bookmarks.data.MapObject;
import com.mapswithme.maps.bookmarks.data.MapObject.ApiPoint;
import com.mapswithme.maps.bookmarks.data.ParcelablePoint;
import com.mapswithme.maps.location.LocationHelper;
import com.mapswithme.maps.location.LocationPredictor;
import com.mapswithme.maps.location.LocationService;
import com.mapswithme.maps.search.SearchActivity;
import com.mapswithme.maps.search.SearchController;
import com.mapswithme.maps.search.SearchFragment;
@ -94,7 +94,7 @@ import java.util.Stack;
import java.util.concurrent.TimeUnit;
public class MWMActivity extends NvEventQueueActivity
implements LocationService.LocationListener, OnBalloonListener, OnVisibilityChangedListener,
implements LocationHelper.LocationListener, OnBalloonListener, OnVisibilityChangedListener,
OnClickListener, RoutingListener
{
public static final String EXTRA_TASK = "map_task";
@ -194,14 +194,14 @@ public class MWMActivity extends NvEventQueueActivity
private void pauseLocation()
{
LocationService.INSTANCE.removeLocationListener(this);
LocationHelper.INSTANCE.removeLocationListener(this);
// Enable automatic turning screen off while app is idle
Utils.automaticIdleScreen(true, getWindow());
}
private void listenLocationUpdates()
{
LocationService.INSTANCE.addLocationListener(this);
LocationHelper.INSTANCE.addLocationListener(this);
// Do not turn off the screen while displaying position
Utils.automaticIdleScreen(false, getWindow());
}
@ -572,7 +572,7 @@ public class MWMActivity extends NvEventQueueActivity
}
else
{
final Location l = LocationService.INSTANCE.getLastLocation();
final Location l = LocationHelper.INSTANCE.getLastLocation();
if (l != null && nativeIsInChina(l.getLatitude(), l.getLongitude()))
return true;
else
@ -752,7 +752,7 @@ public class MWMActivity extends NvEventQueueActivity
private void shareMyLocation()
{
final Location loc = LocationService.INSTANCE.getLastLocation();
final Location loc = LocationHelper.INSTANCE.getLastLocation();
if (loc != null)
{
final String geoUrl = Framework.nativeGetGe0Url(loc.getLatitude(), loc.getLongitude(), Framework.getDrawScale(), "");
@ -1069,7 +1069,7 @@ public class MWMActivity extends NvEventQueueActivity
nativeOnLocationError(errorCode);
// Notify user about turned off location services
if (errorCode == LocationService.ERROR_DENIED)
if (errorCode == LocationHelper.ERROR_DENIED)
{
LocationState.INSTANCE.turnOff();
@ -1113,7 +1113,7 @@ public class MWMActivity extends NvEventQueueActivity
.show();
}
}
else if (errorCode == LocationService.ERROR_GPS_OFF)
else if (errorCode == LocationHelper.ERROR_GPS_OFF)
{
Toast.makeText(this, R.string.gps_is_disabled_long_text, Toast.LENGTH_LONG).show();
}
@ -1122,7 +1122,7 @@ public class MWMActivity extends NvEventQueueActivity
@Override
public void onLocationUpdated(final Location l)
{
if (!l.getProvider().equals(LocationService.LOCATION_PREDICTOR_PROVIDER))
if (!l.getProvider().equals(LocationHelper.LOCATION_PREDICTOR_PROVIDER))
mLocationPredictor.reset(l);
nativeLocationUpdated(
@ -1807,7 +1807,7 @@ public class MWMActivity extends NvEventQueueActivity
@Override
public void onClick(DialogInterface dialog, int which)
{
final Location location = LocationService.INSTANCE.getLastLocation();
final Location location = LocationHelper.INSTANCE.getLastLocation();
if (location != null)
{
final Index currentIndex = Framework.nativeGetCountryIndex(location.getLatitude(), location.getLongitude());

10
android/src/com/mapswithme/maps/bookmarks/BookmarkListAdapter.java
View file

@ -16,7 +16,7 @@ import com.mapswithme.maps.bookmarks.data.Bookmark;
import com.mapswithme.maps.bookmarks.data.BookmarkCategory;
import com.mapswithme.maps.bookmarks.data.DistanceAndAzimut;
import com.mapswithme.maps.bookmarks.data.Track;
import com.mapswithme.maps.location.LocationService;
import com.mapswithme.maps.location.LocationHelper;
import com.mapswithme.util.UiUtils;
import java.util.ArrayList;
@ -26,7 +26,7 @@ import java.util.Map;
public class BookmarkListAdapter extends BaseAdapter
implements LocationService.LocationListener
implements LocationHelper.LocationListener
{
private final Activity mActivity;
private final BookmarkCategory mCategory;
@ -42,12 +42,12 @@ public class BookmarkListAdapter extends BaseAdapter
public void startLocationUpdate()
{
LocationService.INSTANCE.addLocationListener(this);
LocationHelper.INSTANCE.addLocationListener(this);
}
public void stopLocationUpdate()
{
LocationService.INSTANCE.removeLocationListener(this);
LocationHelper.INSTANCE.removeLocationListener(this);
}
@Override
@ -186,7 +186,7 @@ public class BookmarkListAdapter extends BaseAdapter
void setDistance(Bookmark bmk)
{
final Location loc = LocationService.INSTANCE.getLastLocation();
final Location loc = LocationHelper.INSTANCE.getLastLocation();
if (loc != null)
{
final DistanceAndAzimut daa = bmk.getDistanceAndAzimut(loc.getLatitude(), loc.getLongitude(), 0.0);

20
android/src/com/mapswithme/maps/location/AndroidNativeProvider.java
View file

@ -29,26 +29,26 @@ public class AndroidNativeProvider extends BaseLocationProvider implements andro
final List<String> providers = getFilteredProviders();
if (providers.size() == 0)
LocationService.INSTANCE.notifyLocationError(LocationService.ERROR_DENIED);
LocationHelper.INSTANCE.notifyLocationError(LocationHelper.ERROR_DENIED);
else
{
for (final String provider : providers)
mLocationManager.requestLocationUpdates(provider, LOCATION_UPDATE_INTERVAL, 0, this);
LocationService.INSTANCE.registerSensorListeners();
LocationHelper.INSTANCE.registerSensorListeners();
// Choose best location from available
final Location newLocation = findBestNotExpiredLocation(providers);
if (isLocationBetterThanLast(newLocation))
LocationService.INSTANCE.setLastLocation(newLocation);
LocationHelper.INSTANCE.setLastLocation(newLocation);
else
{
final Location lastLocation = LocationService.INSTANCE.getLastLocation();
if (lastLocation != null && !LocationUtils.isExpired(lastLocation, LocationService.INSTANCE.getLastLocationTime(),
final Location lastLocation = LocationHelper.INSTANCE.getLastLocation();
if (lastLocation != null && !LocationUtils.isExpired(lastLocation, LocationHelper.INSTANCE.getLastLocationTime(),
LocationUtils.LOCATION_EXPIRATION_TIME_MILLIS_SHORT))
LocationService.INSTANCE.setLastLocation(lastLocation);
LocationHelper.INSTANCE.setLastLocation(lastLocation);
else
LocationService.INSTANCE.setLastLocation(null);
LocationHelper.INSTANCE.setLastLocation(null);
}
}
}
@ -87,7 +87,7 @@ public class AndroidNativeProvider extends BaseLocationProvider implements andro
if (!mLocationManager.isProviderEnabled(prov))
{
if (LocationManager.GPS_PROVIDER.equals(prov))
LocationService.INSTANCE.notifyLocationError(LocationService.ERROR_GPS_OFF);
LocationHelper.INSTANCE.notifyLocationError(LocationHelper.ERROR_GPS_OFF);
continue;
}
@ -111,8 +111,8 @@ public class AndroidNativeProvider extends BaseLocationProvider implements andro
if (isLocationBetterThanLast(l))
{
LocationService.INSTANCE.initMagneticField(l);
LocationService.INSTANCE.setLastLocation(l);
LocationHelper.INSTANCE.initMagneticField(l);
LocationHelper.INSTANCE.setLastLocation(l);
}
}

2
android/src/com/mapswithme/maps/location/BaseLocationProvider.java
View file

@ -24,7 +24,7 @@ public abstract class BaseLocationProvider
if (newLocation == null)
return false;
final Location lastLocation = LocationService.INSTANCE.getLastLocation();
final Location lastLocation = LocationHelper.INSTANCE.getLastLocation();
if (lastLocation == null)
return true;

12
android/src/com/mapswithme/maps/location/GoogleFusedLocationProvider.java
View file

@ -58,7 +58,7 @@ public class GoogleFusedLocationProvider extends BaseLocationProvider
if (newLocation == null)
return false;
Location lastLocation = LocationService.INSTANCE.getLastLocation();
Location lastLocation = LocationHelper.INSTANCE.getLastLocation();
if (lastLocation == null)
return true;
@ -73,10 +73,10 @@ public class GoogleFusedLocationProvider extends BaseLocationProvider
{
mLogger.d("Fused onConnected. Bundle " + bundle);
LocationServices.FusedLocationApi.requestLocationUpdates(mGoogleApiClient, mLocationRequest, this);
LocationService.INSTANCE.registerSensorListeners();
LocationHelper.INSTANCE.registerSensorListeners();
final Location l = LocationServices.FusedLocationApi.getLastLocation(mGoogleApiClient);
if (l != null)
LocationService.INSTANCE.setLastLocation(l);
LocationHelper.INSTANCE.setLastLocation(l);
}
@Override
@ -90,7 +90,7 @@ public class GoogleFusedLocationProvider extends BaseLocationProvider
{
mLogger.d("Fused onConnectionFailed. Fall back to native provider. ConnResult " + connectionResult);
// TODO handle error in a smarter way
LocationService.INSTANCE.initLocationProvider(true);
LocationHelper.INSTANCE.initLocationProvider(true);
}
@Override
@ -102,8 +102,8 @@ public class GoogleFusedLocationProvider extends BaseLocationProvider
if (isLocationBetterThanLast(location))
{
LocationService.INSTANCE.initMagneticField(location);
LocationService.INSTANCE.setLastLocation(location);
LocationHelper.INSTANCE.initMagneticField(location);
LocationHelper.INSTANCE.setLastLocation(location);
}
}
}

8
android/src/com/mapswithme/maps/location/LocationService.java → android/src/com/mapswithme/maps/location/LocationHelper.java
View file

@ -23,7 +23,7 @@ import com.mapswithme.util.log.SimpleLogger;
import java.util.HashSet;
public enum LocationService implements SensorEventListener
public enum LocationHelper implements SensorEventListener
{
INSTANCE;
@ -62,9 +62,9 @@ public enum LocationService implements SensorEventListener
private final float[] mI = new float[9];
private final float[] mOrientation = new float[3];
private LocationService()
private LocationHelper()
{
mLogger = SimpleLogger.get(LocationService.class.getName());
mLogger = SimpleLogger.get(LocationHelper.class.getName());
initLocationProvider(false);
mSensorManager = (SensorManager) MWMApplication.get().getSystemService(Context.SENSOR_SERVICE);
if (mSensorManager != null)
@ -163,7 +163,7 @@ public enum LocationService implements SensorEventListener
// Reset current parameters to force initialize in the next addLocationListener
mMagneticField = null;
if (mSensorManager != null)
mSensorManager.unregisterListener(LocationService.this);
mSensorManager.unregisterListener(LocationHelper.this);
}
}

6
android/src/com/mapswithme/maps/location/LocationPredictor.java
View file

@ -14,14 +14,14 @@ public class LocationPredictor
private Runnable mRunnable;
private Handler mHandler;
private LocationService.LocationListener mListener;
private LocationHelper.LocationListener mListener;
private Location mLastLocation;
private boolean mGeneratePredictions;
// TODO variable ISNT really changed anywhere.
private int mPredictionCount;
private int mConnectionSlot;
public LocationPredictor(Handler handler, LocationService.LocationListener listener)
public LocationPredictor(Handler handler, LocationHelper.LocationListener listener)
{
mHandler = handler;
mListener = listener;
@ -57,7 +57,7 @@ public class LocationPredictor
{
mLastLocation = new Location(location);
mLastLocation.setTime(System.currentTimeMillis());
mLastLocation.setProvider(LocationService.LOCATION_PREDICTOR_PROVIDER);
mLastLocation.setProvider(LocationHelper.LOCATION_PREDICTOR_PROVIDER);
}
else
mLastLocation = null;

9
android/src/com/mapswithme/maps/search/SearchFragment.java
View file

@ -18,12 +18,11 @@ import android.widget.ListView;
import android.widget.ProgressBar;
import android.widget.TextView;
import com.mapswithme.maps.BuildConfig;
import com.mapswithme.maps.MWMActivity;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.MWMListFragment;
import com.mapswithme.maps.base.OnBackPressListener;
import com.mapswithme.maps.location.LocationService;
import com.mapswithme.maps.location.LocationHelper;
import com.mapswithme.util.InputUtils;
import com.mapswithme.util.Language;
import com.mapswithme.util.UiUtils;
@ -31,7 +30,7 @@ import com.mapswithme.util.Utils;
import com.mapswithme.util.statistics.Statistics;
public class SearchFragment extends MWMListFragment implements View.OnClickListener, LocationService.LocationListener, OnBackPressListener
public class SearchFragment extends MWMListFragment implements View.OnClickListener, LocationHelper.LocationListener, OnBackPressListener
{
// These constants should be equal with
// Java_com_mapswithme_maps_SearchActivity_nativeRunSearch routine.
@ -212,7 +211,7 @@ public class SearchFragment extends MWMListFragment implements View.OnClickListe
mFlags = 0;
mNorth = -1.0;
LocationService.INSTANCE.addLocationListener(this);
LocationHelper.INSTANCE.addLocationListener(this);
// do the search immediately after resume
Utils.setTextAndCursorToEnd(mSearchEt, getLastQuery());
@ -222,7 +221,7 @@ public class SearchFragment extends MWMListFragment implements View.OnClickListe
@Override
public void onPause()
{
LocationService.INSTANCE.removeLocationListener(this);
LocationHelper.INSTANCE.removeLocationListener(this);
super.onPause();
}

7
android/src/com/mapswithme/maps/widget/MapInfoView.java
View file

@ -39,7 +39,6 @@ import android.widget.TextView;
import android.widget.ToggleButton;
import com.mapswithme.maps.Framework;
import com.mapswithme.maps.MWMApplication;
import com.mapswithme.maps.R;
import com.mapswithme.maps.api.ParsedMmwRequest;
import com.mapswithme.maps.bookmarks.BookmarkActivity;
@ -52,7 +51,7 @@ import com.mapswithme.maps.bookmarks.data.MapObject;
import com.mapswithme.maps.bookmarks.data.MapObject.MapObjectType;
import com.mapswithme.maps.bookmarks.data.MapObject.Poi;
import com.mapswithme.maps.bookmarks.data.MapObject.SearchResult;
import com.mapswithme.maps.location.LocationService;
import com.mapswithme.maps.location.LocationHelper;
import com.mapswithme.util.ShareAction;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.UiUtils.SimpleAnimationListener;
@ -531,7 +530,7 @@ public class MapInfoView extends LinearLayout implements View.OnClickListener
mTvLon = (TextView) mGeoLayout.findViewById(R.id.info_box_lon);
mTvLon.setOnClickListener(this);
final Location lastKnown = LocationService.INSTANCE.getLastLocation();
final Location lastKnown = LocationHelper.INSTANCE.getLastLocation();
updateLocation(lastKnown);
updateCoords();
@ -594,7 +593,7 @@ public class MapInfoView extends LinearLayout implements View.OnClickListener
{
if (mGeoLayout != null && mMapObject != null && mMapObject.getType() != MapObjectType.MY_POSITION)
{
final Location l = LocationService.INSTANCE.getLastLocation();
final Location l = LocationHelper.INSTANCE.getLastLocation();
if (l != null)
{
final DistanceAndAzimut da = Framework.nativeGetDistanceAndAzimutFromLatLon(

4
android/src/com/mapswithme/util/LocationUtils.java
View file

@ -5,7 +5,7 @@ import android.os.Build;
import android.os.SystemClock;
import android.view.Surface;
import com.mapswithme.maps.location.LocationService;
import com.mapswithme.maps.location.LocationHelper;
public class LocationUtils
{
@ -85,7 +85,7 @@ public class LocationUtils
// Do compare current and previous system times in case when
// we have incorrect time settings on a device.
time = System.currentTimeMillis();
lastTime = LocationService.INSTANCE.getLastLocationTime();
lastTime = LocationHelper.INSTANCE.getLastLocationTime();
}
return (time - lastTime) * 1.0E-3;

4
android/src/com/mapswithme/util/Yota.java
View file

@ -6,7 +6,7 @@ import android.location.Location;
import android.os.Build;
import android.text.TextUtils;
import com.mapswithme.maps.location.LocationService;
import com.mapswithme.maps.location.LocationHelper;
public class Yota
{
@ -59,7 +59,7 @@ public class Yota
if (addLastKnow)
{
final Location lastLocation = LocationService.INSTANCE.getLastLocation();
final Location lastLocation = LocationHelper.INSTANCE.getLastLocation();
if (lastLocation != null)
{
i.putExtra(EXTRA_HAS_LOCATION, true)