bagnacauda/Automation
1
0
Fork 0
forked from jens/Automation
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into development

Browse Source
This commit is contained in:
Jens 2021-03-21 22:30:20 +01:00
commit 8a43741b21
2 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -11,8 +11,8 @@ android {
compileSdkVersion 29
buildToolsVersion '29.0.2'
useLibrary 'org.apache.http.legacy'
versionCode 100
versionName "1.6.24"
versionCode 101
versionName "1.6.25"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

12
app/src/main/java/com/jens/automation2/ReceiverCoordinator.java
View File

@ -273,7 +273,10 @@ public class ReceiverCoordinator
if(Rule.isAnyRuleUsing(Trigger.Trigger_Enum.activityDetection))
{
boolean isRunning = (Boolean)Miscellaneous.runMethodReflective("ActivityDetectionReceiver", "isActivityDetectionReceiverRunning", null);
Object runResult = Miscellaneous.runMethodReflective("ActivityDetectionReceiver", "isActivityDetectionReceiverRunning", null);;
if(runResult instanceof Boolean)
{
boolean isRunning = (Boolean) runResult;
if (isRunning)
{
Miscellaneous.logEvent("i", "LocationProvider", "Restarting ActivityDetectionReceiver because used in a new/changed rule.", 4);
@ -291,9 +294,13 @@ public class ReceiverCoordinator
// ActivityDetectionReceiver.startActivityDetectionReceiver();
}
}
}
else
{
boolean isRunning = (Boolean)Miscellaneous.runMethodReflective("ActivityDetectionReceiver", "isActivityDetectionReceiverRunning", null);
Object runResult = Miscellaneous.runMethodReflective(activityDetectionClassPath, "isActivityDetectionReceiverRunning", null);
if(runResult instanceof Boolean)
{
boolean isRunning = (Boolean) runResult;
if (isRunning)
{
Miscellaneous.logEvent("i", "LocationProvider", "Shutting down ActivityDetectionReceiver because not used in any rule.", 4);
@ -301,6 +308,7 @@ public class ReceiverCoordinator
// ActivityDetectionReceiver.stopActivityDetectionReceiver();
}
}
}
if(Rule.isAnyRuleUsing(Trigger.Trigger_Enum.bluetoothConnection))
{