Compare commits
4 Commits
054ab6d84b
...
56806f0349
Author | SHA1 | Date | |
---|---|---|---|
56806f0349 | |||
7127ac45bc | |||
8a43741b21 | |||
b7ebf2cdcd |
@ -11,8 +11,8 @@ android {
|
|||||||
compileSdkVersion 29
|
compileSdkVersion 29
|
||||||
buildToolsVersion '29.0.2'
|
buildToolsVersion '29.0.2'
|
||||||
useLibrary 'org.apache.http.legacy'
|
useLibrary 'org.apache.http.legacy'
|
||||||
versionCode 100
|
versionCode 101
|
||||||
versionName "1.6.24"
|
versionName "1.6.25"
|
||||||
|
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
@ -10,8 +10,8 @@
|
|||||||
{
|
{
|
||||||
"type": "SINGLE",
|
"type": "SINGLE",
|
||||||
"filters": [],
|
"filters": [],
|
||||||
"versionCode": 100,
|
"versionCode": 101,
|
||||||
"versionName": "1.6.24-googlePlay",
|
"versionName": "1.6.25-googlePlay",
|
||||||
"outputFile": "app-googlePlayFlavor-release.apk"
|
"outputFile": "app-googlePlayFlavor-release.apk"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
@ -273,7 +273,10 @@ public class ReceiverCoordinator
|
|||||||
|
|
||||||
if(Rule.isAnyRuleUsing(Trigger.Trigger_Enum.activityDetection))
|
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)
|
if (isRunning)
|
||||||
{
|
{
|
||||||
Miscellaneous.logEvent("i", "LocationProvider", "Restarting ActivityDetectionReceiver because used in a new/changed rule.", 4);
|
Miscellaneous.logEvent("i", "LocationProvider", "Restarting ActivityDetectionReceiver because used in a new/changed rule.", 4);
|
||||||
@ -291,9 +294,13 @@ public class ReceiverCoordinator
|
|||||||
// ActivityDetectionReceiver.startActivityDetectionReceiver();
|
// ActivityDetectionReceiver.startActivityDetectionReceiver();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
else
|
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)
|
if (isRunning)
|
||||||
{
|
{
|
||||||
Miscellaneous.logEvent("i", "LocationProvider", "Shutting down ActivityDetectionReceiver because not used in any rule.", 4);
|
Miscellaneous.logEvent("i", "LocationProvider", "Shutting down ActivityDetectionReceiver because not used in any rule.", 4);
|
||||||
@ -301,6 +308,7 @@ public class ReceiverCoordinator
|
|||||||
// ActivityDetectionReceiver.stopActivityDetectionReceiver();
|
// ActivityDetectionReceiver.stopActivityDetectionReceiver();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if(Rule.isAnyRuleUsing(Trigger.Trigger_Enum.bluetoothConnection))
|
if(Rule.isAnyRuleUsing(Trigger.Trigger_Enum.bluetoothConnection))
|
||||||
{
|
{
|
||||||
|
@ -5,7 +5,7 @@ buildscript {
|
|||||||
jcenter()
|
jcenter()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath "com.android.tools.build:gradle:4.1.2"
|
classpath 'com.android.tools.build:gradle:4.1.3'
|
||||||
|
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
// in the individual module build.gradle files
|
// in the individual module build.gradle files
|
||||||
|
1
fastlane/metadata/android/en-US/changelogs/101.txt
Normal file
1
fastlane/metadata/android/en-US/changelogs/101.txt
Normal file
@ -0,0 +1 @@
|
|||||||
|
Fixed bug that crashed the app when saving rules while the service was running.
|
Loading…
Reference in New Issue
Block a user