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

[android] Added Mytracker configure location methods call

Browse source
This commit is contained in:
Dmitry Donskoy 2018-10-01 15:09:40 +03:00 • committed by Aleksandr Zatsepin
parent be5ebfb4c0
commit 3a808c199f
2 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
android/src/com/mapswithme/maps/analytics/MyTrackerEventLogger.java
View file

@ -7,7 +7,7 @@ import android.support.annotation.Nullable;
import com.mapswithme.maps.BuildConfig;
import com.mapswithme.maps.PrivateVariables;
import com.mapswithme.maps.analytics.ContextDependentEventLogger;
import com.mapswithme.util.LocationUtils;
import com.my.tracker.MyTracker;
import com.my.tracker.MyTrackerParams;
@ -56,7 +56,15 @@ class MyTrackerEventLogger extends ContextDependentEventLogger
MyTracker.createTracker(PrivateVariables.myTrackerKey(), getApplication());
final MyTrackerParams myParams = MyTracker.getTrackerParams();
if (myParams != null)
myParams.setDefaultVendorAppPackage();
initParams(myParams);
MyTracker.initTracker();
}
private void initParams(@NonNull MyTrackerParams myParams)
{
myParams.setDefaultVendorAppPackage();
boolean isProviderAvailable = LocationUtils.checkProvidersAvailability(getApplication());
myParams.setTrackingLocationEnabled(isProviderAvailable);
myParams.setTrackingEnvironmentEnabled(isProviderAvailable);
}
}

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

@ -1,6 +1,7 @@
package com.mapswithme.util;
import android.annotation.SuppressLint;
import android.app.Application;
import android.content.ContentResolver;
import android.content.Context;
import android.location.Location;
@ -8,6 +9,7 @@ import android.location.LocationManager;
import android.os.Build;
import android.os.SystemClock;
import android.provider.Settings;
import android.support.annotation.NonNull;
import android.text.TextUtils;
import android.view.Surface;
@ -135,10 +137,20 @@ public class LocationUtils
LOGGER.i(TAG, sb.toString());
}
/**
*
* Use {@link #checkProvidersAvailability(Application)} instead.
*/
@SuppressWarnings("DeprecatedIsStillUsed")
@Deprecated
public static boolean checkProvidersAvailability()
{
Context context = MwmApplication.get();
LocationManager locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
return checkProvidersAvailability(MwmApplication.get());
}
public static boolean checkProvidersAvailability(@NonNull Application application)
{
LocationManager locationManager = (LocationManager) application.getSystemService(Context.LOCATION_SERVICE);
if (locationManager == null)
{
LOGGER.e(TAG, "This device doesn't support the location service.");