Skip to content

[pull] master from henrichg:master #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Feb 24, 2021
Merged

[pull] master from henrichg:master #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b43a2f6
Call EventsHandler for Location sensor in for location scanning confi…
henrichg Feb 24, 2021
9bdb7ea
Call EventsHandler for Location sensor in for location scanning confi…
henrichg Feb 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/GeofencesScanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class GeofencesScanner
static boolean mTransitionsUpdated = false;

static final int INTERVAL_DIVIDE_VALUE = 6;
static final int INTERVAL_DIVIDE_VALUE_FOR_GPS = 12;
//static final int INTERVAL_DIVIDE_VALUE_FOR_GPS = 12;

GeofencesScanner(Context context) {
this.context = context;
Expand Down Expand Up @@ -268,9 +268,9 @@ void startLocationUpdates() {
int interval = 25; // seconds
if (ApplicationPreferences.applicationEventLocationUpdateInterval > 1) {
// interval is in minutes
if (provider.equals(LocationManager.GPS_PROVIDER))
interval = (ApplicationPreferences.applicationEventLocationUpdateInterval * 60) / INTERVAL_DIVIDE_VALUE_FOR_GPS;
else
//if (provider.equals(LocationManager.GPS_PROVIDER))
// interval = (ApplicationPreferences.applicationEventLocationUpdateInterval * 60) / INTERVAL_DIVIDE_VALUE_FOR_GPS;
//else
interval = (ApplicationPreferences.applicationEventLocationUpdateInterval * 60) / INTERVAL_DIVIDE_VALUE;
}
PPApplication.logE("##### GeofenceScanner.startLocationUpdates", "ApplicationPreferences.applicationEventLocationUpdateInterval="+ApplicationPreferences.applicationEventLocationUpdateInterval);
Expand All @@ -280,6 +280,7 @@ void startLocationUpdates() {
final long UPDATE_INTERVAL_IN_MILLISECONDS = (interval * 1000) / 2;

PPApplication.logE("##### GeofenceScanner.startLocationUpdates", "request location updates - provider=" + provider);
PPApplication.logE("##### GeofenceScanner.startLocationUpdates", "request location updates - interval=" + UPDATE_INTERVAL_IN_MILLISECONDS / 1000);
PPApplication.startHandlerThreadLocation();
mLocationManager.requestLocationUpdates(provider, UPDATE_INTERVAL_IN_MILLISECONDS, 0, mLocationListener, PPApplication.handlerThreadLocation.getLooper());

Expand Down
13 changes: 7 additions & 6 deletions phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/LocationSensorWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public LocationSensorWorker(
@Override
public Result doWork() {
try {
// PPApplication.logE("[IN_WORKER] LocationSensorWorker.doWork", "xxxx");
PPApplication.logE("[IN_WORKER] LocationSensorWorker.doWork", "xxxx");

if (Event.getGlobalEventsRunning()) {
EventsHandler eventsHandler = new EventsHandler(context);
Expand All @@ -57,6 +57,8 @@ public void run() {
}

static void enqueueWork(boolean immediate, Context context) {
PPApplication.logE("##### LocationSensorWorker.enqueueWork", "immediate=" + immediate);

OneTimeWorkRequest worker = null;

if (immediate) {
Expand All @@ -77,16 +79,15 @@ static void enqueueWork(boolean immediate, Context context) {
// interval is in minutes
interval = (ApplicationPreferences.applicationEventLocationUpdateInterval * 60);
}
PPApplication.logE("##### GeofenceScanner.startLocationUpdates", "ApplicationPreferences.applicationEventLocationUpdateInterval=" + ApplicationPreferences.applicationEventLocationUpdateInterval);
PPApplication.logE("##### GeofenceScanner.startLocationUpdates", "interval=" + interval);
PPApplication.logE("##### LocationSensorWorker.enqueueWork", "ApplicationPreferences.applicationEventLocationUpdateInterval=" + ApplicationPreferences.applicationEventLocationUpdateInterval);
if (isPowerSaveMode && applicationEventLocationUpdateInPowerSaveMode.equals("1"))
interval = 2 * interval;
final long UPDATE_INTERVAL_IN_MILLISECONDS = (interval * 1000) / 2;
PPApplication.logE("##### LocationSensorWorker.enqueueWork", "interval=" + interval);

worker =
new OneTimeWorkRequest.Builder(LocationSensorWorker.class)
.addTag(LOCATION_SENSOR_WORK_TAG)
.setInitialDelay(UPDATE_INTERVAL_IN_MILLISECONDS, TimeUnit.SECONDS)
.setInitialDelay(interval, TimeUnit.SECONDS)
.build();
}
}
Expand All @@ -106,7 +107,7 @@ static void enqueueWork(boolean immediate, Context context) {
// //}

if (worker != null) {
// PPApplication.logE("[WORKER_CALL] LocationSensorWorker.enqueueWork", "xxx");
PPApplication.logE("[WORKER_CALL] LocationSensorWorker.enqueueWork", "enqueue with REPLACE");
workManager.enqueueUniqueWork(LOCATION_SENSOR_WORK_TAG, ExistingWorkPolicy.REPLACE, worker);
}
}
Expand Down
1 change: 1 addition & 0 deletions phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ public class PPApplication extends Application
+"|GeofencesScannerSwitchGPSBroadcastReceiver.onReceive"
+"|GeofencesScannerSwitchGPSBroadcastReceiver.doWork"
+"|GeofenceScanner"
+"|LocationSensorWorker"
;

static final int ACTIVATED_PROFILES_FIFO_SIZE = 20;
Expand Down