Compare commits

...

225 Commits

Author SHA1 Message Date
9f36411511 New version 2024-05-23 23:03:43 +02:00
eb893a7f21 Fixed crash when exiting settings while service is running 2024-05-23 16:02:58 +02:00
8788a89e48 Removed calendar trigger from Google version and fixed bug in startOtherActivity 2024-05-23 15:02:12 +02:00
bb10620883 Removed calendar trigger from Google version 2024-05-07 09:49:32 +02:00
3e29054f82 New version 2024-05-05 23:39:46 +02:00
9d5f0a3cef Merge remote-tracking branch 'origin/development-stable' into development-stable 2024-04-17 23:48:58 +02:00
695b1f2481 New version prepared 2024-04-17 23:48:43 +02:00
d7357b0b0f date time repetition 2024-03-29 15:31:32 +01:00
e272338cc6 Date time repetition 2024-02-12 23:15:05 +01:00
3dd84220a3 date time repetition 2024-02-11 17:25:42 +01:00
4bc2781ee7 Date time repetition 2024-02-08 23:53:15 +01:00
62bfbbb064 date time repetition 2024-02-08 20:25:54 +01:00
31d167a93f New version prep, fix attempt in notification listener 2024-02-07 23:24:03 +01:00
500610fb98 Merge branch 'development' into development-stable 2024-02-02 23:09:23 +01:00
5ca7295c30 date time repetition 2024-01-27 17:03:27 +01:00
e2027a457a Merge remote-tracking branch 'origin/development' into development 2024-01-25 16:54:00 +01:00
6c31b67b14 Battery charging type differentiation and other fixes 2024-01-25 16:53:43 +01:00
04fe674cf6 Battery charging type differentiation 2024-01-25 14:03:39 +01:00
17b3b8fafc New version prep, fix attempt in notification listener 2024-01-24 23:16:24 +01:00
0d38c8bbe0 New version prep, fix attempt in notification listener 2024-01-24 14:00:34 +01:00
f7ff8a38e1 New version prep, fix attempt in notification listener 2024-01-21 23:46:08 +01:00
b7677bdcce Calendar trigger 2024-01-20 23:47:32 +01:00
1ff4a15818 Calendar trigger 2024-01-18 16:28:42 +01:00
bd42507521 Bugfix in triggerUrl action 2024-01-15 16:42:16 +01:00
fe924f6fe9 Calendar trigger 2024-01-14 23:18:12 +01:00
dfe8594f06 Calendar trigger 2024-01-14 15:56:44 +01:00
553d14b05f Calendar trigger 2024-01-10 20:01:24 +01:00
b38ca31df5 Calendar trigger 2024-01-09 22:56:42 +01:00
6e566c664d Calendar trigger 2024-01-08 23:10:27 +01:00
8c4b75232e Calendar trigger 2024-01-07 23:56:55 +01:00
4521bc7d4e Calendar trigger 2024-01-07 15:15:56 +01:00
eaecf63724 Calendar trigger 2024-01-06 23:57:52 +01:00
ec62b91449 Calendar trigger 2024-01-06 17:25:27 +01:00
223cca442d wifi trigger 2024-01-06 11:49:49 +01:00
f3613f8eb0 triggerUrl with POST params 2024-01-03 16:24:21 +01:00
8b193aa89c triggerUrl with POST params 2024-01-02 16:36:10 +01:00
58ec35aae5 calendar trigger 2024-01-01 13:35:21 +01:00
c61c5ba14c if brackets 2023-12-31 16:53:59 +01:00
d75cf137ba Merge branch 'calendar_trigger' into development 2023-12-31 16:00:13 +01:00
5e3d268815 date time trigger set to wakeup 2023-12-31 15:59:02 +01:00
3bcf90277f calendar trigger 2023-12-31 15:54:24 +01:00
81a205a8db Calendar trigger 2023-12-30 23:26:27 +01:00
97a3344e81 calendar trigger 2023-12-29 19:43:50 +01:00
cd47b33449 calendar trigger 2023-12-28 17:17:08 +01:00
2ba25a9e65 Calendar trigger 2023-12-28 00:25:55 +01:00
d2606b72cd calendar trigger 2023-12-27 14:48:27 +01:00
584495ef61 Calendar trigger 2023-12-27 13:33:09 +01:00
9b28aeef8b calendar trigger 2023-12-26 11:56:02 +01:00
b6bf31589a calendar trigger 2023-12-25 14:28:48 +01:00
67238bd2f0 Calendar trigger 2023-12-25 11:57:55 +01:00
5f278a6ba0 calendar trigger 2023-12-23 13:55:02 +01:00
a21f90acb5 Wifi receiver 2023-12-21 23:16:21 +01:00
5f8ed5765a TriggerUrl result stored in variable 2023-12-21 16:40:11 +01:00
605f85d215 Howto for write_secure_settings linked and translations updated 2023-12-21 15:37:55 +01:00
21f4a7fd5c Set location service 2023-12-20 23:54:36 +01:00
2219164869 Set location service 2023-12-19 23:52:28 +01:00
a8646ef61d Merge branch 'accessibility_api' into development
# Conflicts:
#	app/src/main/java/com/jens/automation2/Actions.java
2023-12-19 16:54:52 +01:00
f641de9893 Take screenshot action added 2023-12-19 16:54:10 +01:00
bca8b44ad6 Bugfix for Android 14 for auto dialing mmi codes 2023-12-18 23:13:18 +01:00
c34dfa4af4 Bugfix for Android 14 for auto dialing mmi codes 2023-12-18 22:55:18 +01:00
38644cee28 Take screenshot action added 2023-12-16 13:52:18 +01:00
47898e84ea Comment added 2023-12-14 17:46:55 +01:00
ac74b52aed Accessibility API 2023-12-14 00:15:59 +01:00
3f76813e80 Http method selectable 2023-12-12 23:40:12 +01:00
1b8dc5de5f Http method selectable 2023-12-11 22:50:07 +01:00
3c8c0f14f2 Fixed bug in broadcast receiver trigger 2023-12-06 23:44:40 +01:00
6e73c74b60 Added changelog for v137 2023-12-03 23:27:23 +01:00
9ead47bdf7 Permissions for startActivity() reduced 2023-12-03 23:24:58 +01:00
e4828a9720 Fixes for Google Play version 2023-11-30 00:00:34 +01:00
4f971e8a1b New version 2023-11-25 23:23:58 +01:00
34fbc1d005 New version prepared 2023-11-24 23:57:26 +01:00
b72049defc Start other service bugfix attempt 2023-11-22 23:20:26 +01:00
54f3cc84c4 Start other service bugfix attempt 2023-11-19 23:44:10 +01:00
7884358564 Start other service bugfix attempt 2023-11-08 00:15:39 +01:00
f24c9f99dc startService() experiments 2023-11-05 16:20:48 +01:00
64b97c650d Small changes 2023-10-28 23:20:07 +02:00
9daf4c4747 Small changes 2023-10-27 23:59:12 +02:00
94f7936c4a ActivityDetection permission fixed 2023-10-26 23:30:45 +02:00
02f7b642cf Wifi trigger hint 2023-10-23 23:44:21 +02:00
8d10bf05af Escaped variables when triggering 2023-10-19 22:30:13 +02:00
8c0cee9589 Wifi trigger fix attempt 2023-10-15 23:54:27 +02:00
6b23bd6733 Icon restored 2023-08-31 15:21:55 +02:00
1a60c88f35 Merge remote-tracking branch 'origin/development' into development
# Conflicts:
#	fastlane/metadata/android/en-US/changelogs/134.txt
2023-08-30 23:25:13 +02:00
3312d99177 Changes icon in Play store version 2023-08-30 23:23:58 +02:00
ea01806915 Charging trigger bug fixed 2023-08-24 20:04:05 +02:00
36173f2fcb device admin permission added for start phone call action 2023-08-01 22:59:05 +02:00
4c66fe906e Merge remote-tracking branch 'origin/development-stable' 2023-07-30 22:24:40 +02:00
60cfa150b5 Missing translations added 2023-07-25 23:31:32 +02:00
bd2231b075 Changelogs translated 2023-07-24 23:52:25 +02:00
158f5f2e04 Merge remote-tracking branch 'origin/development' into development 2023-07-23 20:10:52 +02:00
f1315dc742 Chinese translation added. 2023-07-23 18:57:38 +02:00
28aa0c3e4b Imports optimized 2023-07-11 00:07:07 +02:00
6b9dbca7ab Merge remote-tracking branch 'origin/development' into development
# Conflicts:
#	fastlane/metadata/android/en-US/changelogs/133.txt
2023-07-02 00:33:59 +02:00
291e0c41af Fixed bug 2023-07-02 00:31:09 +02:00
c9eedd5d87 Chinese translation added. 2023-06-08 19:43:41 +02:00
2470321e15 Merge remote-tracking branch 'origin/development-stable' 2023-06-05 14:46:05 +02:00
d85a199117 New version 2023-05-21 23:24:54 +02:00
b047cde4ea Minor corrections 2023-05-21 14:21:09 +02:00
9a1796f2eb Merge remote-tracking branch 'origin/development' into development 2023-05-17 23:24:24 +02:00
7e8a6b121e Minor fix for seconds variable missing leading zero 2023-05-17 23:22:32 +02:00
810c7488c4 Polish translation 2023-05-15 11:53:32 +02:00
8af24695fd Polish translated added 2023-05-11 23:30:10 +02:00
533a9bf54d Comment added 2023-05-10 23:24:47 +02:00
8653e4853b Close notification fix 2023-05-08 23:21:44 +02:00
c464a9d71f Battery receiver toasts removed 2023-05-07 22:59:45 +02:00
26e4851c0d Russian translation updated 2023-05-07 22:28:00 +02:00
11f0ee25bf bugfixes 2023-05-06 23:32:43 +02:00
a76cafc6e2 Enabled variables as intent parameters 2023-05-05 23:26:32 +02:00
bd2920e6d9 Russian translation updated 2023-05-05 22:54:16 +02:00
5caf33b45d revert 6a74d070eb
revert Fixed: Crash when managing phone call action in the F-Droid version
2023-05-05 22:48:39 +02:00
6a74d070eb Fixed: Crash when managing phone call action in the F-Droid version 2023-05-05 22:38:17 +02:00
eba02ade08 Fixed: Crash when managing phone call action in the F-Droid version 2023-04-29 01:14:52 +02:00
394effea36 New version 2023-04-24 23:43:08 +02:00
4d51f1890a Merge branch 'development-stable' into development 2023-04-24 23:09:43 +02:00
a8b2c3bf7d New version 2023-04-24 23:08:21 +02:00
d1c6abaa91 - 2023-04-17 23:26:48 +02:00
587ed5803e - 2023-04-17 23:26:22 +02:00
Jens
49d272be1e PhoneStatusListener 2023-04-16 22:31:01 +02:00
Jens
d9e54c7780 PhoneStatusListener 2023-04-14 23:16:47 +02:00
Jens
170dbbc7e8 PhoneStatusListener 2023-04-13 00:10:21 +02:00
3fc1dd1a26 Telephony receiver 2023-04-12 18:05:00 +02:00
Jens
0acb52099c Added overlay permission 2023-03-31 23:58:11 +02:00
Jens
b6015a3f2e New versions prepared 2023-03-23 22:59:05 +01:00
Jens
ae1e767fa6 copy to clipboard action 2023-03-17 23:22:42 +01:00
Jens
6e12e71133 copy to clipboard action 2023-03-16 23:35:38 +01:00
Jens
e4e3faea06 copy to clipboard action 2023-03-15 23:27:27 +01:00
Jens
7c42250e13 copy to clipboard action 2023-03-12 23:57:54 +01:00
Jens
ebb0724b28 Android 13 wifi permission text 2023-03-08 23:11:58 +01:00
Jens
a7ae0c6588 Android 13 wifi permission 2023-03-01 23:35:19 +01:00
Jens
e5433bf2ec Possibility to pick custom language 2023-02-26 18:12:47 +01:00
Jens
fd8ffd4f7d translation error fixed 2023-02-19 00:09:20 +01:00
Jens
f49455712a Hint for notification access on Android 13 2023-02-18 23:59:29 +01:00
Jens
132f64114e Bug fixed: Editing variable action was not possible 2023-02-12 23:57:37 +01:00
Jens
27e9b3e0d1 New release 2023-02-09 23:24:29 +01:00
a6c6dfc6ba Bug fixed in TTS 2023-02-06 14:24:46 +01:00
Jens
6a7875cc61 Bugfix release 2023-02-01 23:29:26 +01:00
Jens
6f80caa1c6 Bugfix release 2023-01-17 22:38:49 +01:00
Jens
a9646cbf28 Autostart error fixed 2023-01-16 23:44:28 +01:00
52edfa32df Fixed bug with multiple time frames with reoccurrence configured 2023-01-16 16:54:54 +01:00
Jens
ca81e6a7bd Log improvements 2023-01-15 23:18:42 +01:00
Jens
49e4c20ab6 Allow negative integers as intents 2023-01-14 22:50:43 +01:00
Jens
ab98b4d1db Build number changed because of Google Play version 2023-01-14 22:20:31 +01:00
Jens
6b32301894 New version prepared 2023-01-14 21:55:52 +01:00
Jens
d9cdfab828 French translation updated 2023-01-13 22:52:45 +01:00
62a8723344 Setting ringtones from profiles works again 2023-01-13 18:48:00 +01:00
2b69938ad5 corrected date variables 2023-01-09 20:13:17 +01:00
c42f65bd3a corrected date variables 2023-01-05 20:39:29 +01:00
Jens
ad0d9962b5 trim()s inserted 2023-01-01 23:51:51 +01:00
58f24953f3 startByService() 2023-01-01 20:13:34 +01:00
3d212456e6 tests 2022-12-24 02:27:35 +01:00
Jens
fff0a28310 mms 2022-11-16 22:42:25 +01:00
48da91cb40 send mms with attachment 2022-11-13 17:49:02 +01:00
Jens
98df050f42 mms 2022-11-10 23:06:07 +01:00
Jens
93cb72ac2f cosmetics 2022-11-05 23:10:23 +01:00
713228c06e send mms with attachment 2022-10-30 15:04:09 +01:00
c868d45896 variables as triggers and actions 2022-10-09 17:14:02 +02:00
4abce042eb stop phone call action 2022-10-03 20:16:56 +02:00
62034e1b10 stop phone call action 2022-10-03 13:22:25 +02:00
Jens
135f4594be call phone 2022-10-02 23:26:27 +02:00
900aaf3c8c Merge remote-tracking branch 'origin/development' into development 2022-10-02 19:00:40 +02:00
5baa40ed59 make phone call action 2022-10-02 18:59:54 +02:00
Jens
759e8076c3 translation syntax 2022-09-30 22:37:30 +02:00
Jens
17b9f19dc2 Description text about run executable improved 2022-09-22 23:15:53 +02:00
Jens
374a5c4263 confirmation dialog for deletions 2022-09-21 23:29:54 +02:00
Jens
2fd79140cb possible fix 2022-09-05 23:53:22 +02:00
a0910e620f cosmetics 2022-09-02 19:31:00 +02:00
Jens
475c1719d7 translation 2022-08-29 23:06:08 +02:00
baa39c7a77 new version prepared 2022-08-28 02:23:39 +02:00
e11cc09da2 Bluetooth button disabled as not functional, yet 2022-08-27 02:13:46 +02:00
eff04037a1 Tethering 2022-08-27 02:07:47 +02:00
Jens
b73a45f4cd tethering type 2022-08-27 00:09:20 +02:00
Jens
fad6050c7a tethering type 2022-08-23 22:43:44 +02:00
8a00529991 french translation 2022-08-23 16:44:15 +02:00
Jens
1d7cf00b94 tethering type 2022-08-18 23:32:57 +02:00
Jens
d74e2eae68 tethering type 2022-08-17 23:36:30 +02:00
Jens
4f7c36c4f7 compile fix 2022-08-17 23:04:35 +02:00
Jens
b0df3efa27 Merge branch 'tmp' into development 2022-08-17 22:42:12 +02:00
Jens
f99418fda3 started to adapt tethering trigger to check a specific type 2022-08-17 22:32:14 +02:00
e05a42f5d6 multidex 2022-08-06 02:13:39 +02:00
Jens
83a27dcfdb started to adapt tethering trigger to check a specific type 2022-07-27 23:00:34 +02:00
Jens
bdc89a855b translations and libraries updated 2022-07-27 22:11:35 +02:00
Jens
7ce203a679 translations and libraries updated 2022-07-27 22:10:07 +02:00
Jens
57bc666453 translations 2022-07-25 23:29:02 +02:00
c966981eae translations 2022-07-25 20:31:35 +02:00
Jens
7a05b9a95b device is starting-trigger enhanced 2022-07-24 22:50:11 +02:00
7fdbf74906 service is starting can be inverted 2022-07-24 19:53:45 +02:00
d17e8b70fe notification dismiss with button 2022-07-24 14:22:17 +02:00
Jens
f97bfbb732 close notification with button 2022-07-21 23:05:51 +02:00
937c6ffe1d Merge remote-tracking branch 'origin/development' into development
# Conflicts:
#	app/src/main/res/values/strings.xml
2022-07-19 17:58:41 +02:00
1ecc61452f notification dismiss with button 2022-07-19 17:57:47 +02:00
Jens
19fd2d098b wifi trigger needs location permission 2022-07-17 23:40:17 +02:00
Jens
d07c1a05e4 set wifi with root fix 2022-07-15 22:37:55 +02:00
Jens
f9f9b30116 su changes 2022-07-14 22:55:54 +02:00
d154a3d64f wifi trigger - enabled regex 2022-07-12 17:03:32 +02:00
Jens
eeb4f4a39e battery level trigger fixed 2022-07-11 22:56:43 +02:00
53e62068a5 close notification with button 2022-07-09 14:22:33 +02:00
922807d903 meta data changed 2022-07-07 20:40:29 +02:00
Jens
a7d294c115 translations 2022-07-04 23:02:46 +02:00
Jens
2d2fd901a1 translations 2022-07-04 22:57:07 +02:00
536a5e22f9 wakelock action 2022-07-02 12:46:34 +02:00
99faa2f7ef wakelock action 2022-07-02 01:38:39 +02:00
f3fac2f4e8 wakelock 2022-07-01 20:24:58 +02:00
Jens
b3b713e454 email tetx 2022-06-30 23:01:26 +02:00
Jens
b0d509aafe Merge remote-tracking branch 'origin/development-stable' into development
# Conflicts:
#	app/src/main/res/values-de/strings.xml
#	app/src/main/res/values/strings.xml
2022-06-27 23:04:33 +02:00
Jens
efb4919a1e regex where comparisons are made 2022-06-27 23:02:53 +02:00
Jens
7bc858fee3 number format fix attempt 2022-06-27 22:42:55 +02:00
647d5bd511 fix attempt number format 2022-06-27 20:07:06 +02:00
f1f3be56cb new version prep 2022-06-25 02:36:33 +02:00
5856c93fc8 Merge branch 'development' into development-stable
# Conflicts:
#	app/src/main/res/values-it/strings.xml
2022-06-25 02:07:14 +02:00
8201b1d4e4 new version prep 2022-06-25 01:44:24 +02:00
Jens
ce9480d188 bug manage startOtherActivity 2022-06-13 23:15:25 +02:00
a69bbb1e05 translations 2022-06-13 19:59:14 +02:00
16817e6f53 function cleanup 2022-06-11 14:00:03 +02:00
26ed906521 function cleanup 2022-06-11 13:59:15 +02:00
d1ca9ab56b removed function 2022-06-11 13:55:02 +02:00
9c76340f24 bluetooth not present notice 2022-06-11 13:25:13 +02:00
aca5572f40 translation updates 2022-06-11 13:09:37 +02:00
944e165dd0 Merge remote-tracking branch 'origin/development' into development 2022-06-11 01:27:48 +02:00
7f2fc4b5de russia translation and bugfix in tethering trigger management 2022-06-11 01:27:34 +02:00
cd163afc47 Merge pull request 'Italian translation' (#1) from bagnacauda/Automation:italian into development
Reviewed-on: jens/Automation#1
2022-06-11 01:24:51 +02:00
Simone Dotto
6179f0e9ae translated new strings 2022-06-10 17:27:17 +02:00
Simone Dotto
581cdafb87 improved Italian translation 2022-06-10 17:00:59 +02:00
9162bcb451 Merge remote-tracking branch 'origin/development' into development-stable 2022-06-07 17:21:07 +02:00
5272b56032 send broadcast with intents 2022-06-07 17:18:35 +02:00
92e58149a7 run executable action 2022-06-02 17:43:46 +02:00
306 changed files with 13432 additions and 1722 deletions

2
.gitignore vendored
View File

@ -145,7 +145,7 @@ fabric.properties
# End of https://www.toptal.com/developers/gitignore/api/androidstudio
output-metadata.json
/app/app-release.apk
Automation_settings.xml
/app/googlePlayFlavor/

View File

@ -8,11 +8,11 @@ android {
defaultConfig {
applicationId "com.jens.automation2"
minSdkVersion 16
compileSdkVersion 31
compileSdkVersion 33
buildToolsVersion '29.0.2'
useLibrary 'org.apache.http.legacy'
versionCode 120
versionName "1.7.6"
versionCode 142
versionName "1.8.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
@ -36,9 +36,15 @@ android {
{
dimension "version"
versionNameSuffix "-googlePlay"
targetSdkVersion 30
targetSdkVersion 33
}
/*
targetSdkVersion is kept at 28 for as long as possible.
If raised wifi cannot be switched on or off anymore without root permissions.
In the Google version I'm forced to raise the value regularly.
*/
fdroidFlavor
{
dimension "version"
@ -72,9 +78,9 @@ dependencies {
//implementation "androidx.security:security-crypto:1.0.0"
//implementation "androidx.security:security-identity-credential:1.0.0-alpha02"
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'com.google.android.material:material:1.3.0'
testImplementation 'junit:junit:4.+'
implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'com.google.android.material:material:1.6.1'
testImplementation 'junit:junit:4'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
}

View File

@ -1,20 +0,0 @@
{
"version": 3,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.jens.automation2",
"variantName": "googlePlayFlavorRelease",
"elements": [
{
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 119,
"versionName": "1.7.5-googlePlay",
"outputFile": "app-googlePlayFlavor-release.apk"
}
],
"elementType": "File"
}

View File

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<supports-screens
android:anyDensity="true"
@ -50,7 +52,6 @@
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<!-- <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />-->
<uses-permission android:name="android.permission.GET_TASKS" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.NFC" />
@ -66,6 +67,18 @@
<uses-permission android:name="com.wireguard.android.permission.CONTROL_TUNNELS"/>
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
<uses-permission android:name="android.permission.CALL_PHONE" />
<uses-permission android:name="android.permission.ANSWER_PHONE_CALLS" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<uses-permission android:name="android.permission.READ_CALL_LOG" />
<uses-permission android:name="android.permission.READ_CALENDAR" />
<uses-permission
android:name="android.permission.WRITE_SECURE_SETTINGS"
tools:ignore="ProtectedPermissions" />
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
<!--android:maxSdkVersion="32" />
<uses-permission android:name="android.permission.USE_EXACT_ALARM" />-->
<uses-feature
android:name="android.hardware.telephony"
@ -83,7 +96,7 @@
<application
android:allowBackup="true"
android:allowClearUserData="true"
android:icon="@drawable/gears"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme"
android:networkSecurityConfig="@xml/network_security_config">
@ -126,6 +139,7 @@
</intent-filter>
</receiver>
<receiver android:name=".receivers.PackageReplacedReceiver"
android:exported="true"
android:enabled="true">
<intent-filter>
<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
@ -134,9 +148,11 @@
<receiver android:name=".receivers.DateTimeListener" />
<receiver android:name=".receivers.ConnectivityReceiver" />
<receiver android:name=".receivers.TimeZoneListener" />
<receiver android:name=".receivers.CalendarReceiver" />
<receiver
android:name=".DeviceAdmin"
android:exported="true"
android:description="@string/app_name"
android:label="@string/app_name"
android:permission= "android.permission.BIND_DEVICE_ADMIN" >
@ -169,8 +185,18 @@
<activity android:name=".ActivityManageActionRunExecutable" />
<activity android:name=".ActivityManageActionWifi" />
<activity android:name=".ActivityManageTriggerTethering" />
<activity android:name=".ActivityManageActionWakeLock" />
<activity android:name=".ActivityManageTriggerSubSystemState" />
<activity android:name=".ActivityManageActionMakePhoneCall" />
<activity android:name=".ActivityManageActionSetVariable" />
<activity android:name=".ActivityManageTriggerCheckVariable" />
<activity android:name=".ActivityManageActionCopyToClipboard" />
<activity android:name=".ActivityManageActionLocationService" />
<activity android:name=".ActivityManageTriggerCharging" />
<activity
android:name=".ActivityMainTabLayout"
android:exported="true"
android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@ -216,9 +242,11 @@
<activity android:name=".ActivityVolumeTest" />
<activity android:name=".ActivityPermissions"></activity>
<activity android:name=".ActivityManageTriggerNotification" />
<activity android:name=".ActivityManageTriggerCalendar" />
<service
android:name=".receivers.NotificationListener"
android:exported="true"
android:label="@string/app_name"
android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE" >
<intent-filter>
@ -250,6 +278,17 @@
android:exported="true"
/>
<service android:name=".MyAccessibilityService"
android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
<intent-filter>
<action android:name="android.accessibilityservice.AccessibilityService" />
</intent-filter>
<meta-data
android:name="android.accessibilityservice"
android:resource="@xml/config_accessibility_service" />
</service>
</application>
</manifest>

View File

@ -18,7 +18,7 @@ public class MyGoogleApiClient
public com.google.android.gms.appindexing.Action getIndexApiAction()
{
Thing object = new Thing.Builder()
.setName("ActivityMainScreen Page") // TODO: Define a title for the content shown.
.setName("ActivityMainScreen Page")
// TODO: Make sure this auto-generated URL is correct.
.setUrl(Uri.parse("http://[ENTER-YOUR-URL-HERE]"))
.build();

View File

@ -10,9 +10,12 @@ import android.os.Looper;
import android.util.Log;
import android.widget.Toast;
import androidx.annotation.Nullable;
import com.google.android.gms.location.DetectedActivity;
import com.jens.automation2.receivers.ActivityDetectionReceiver;
import com.jens.automation2.receivers.BroadcastListener;
import com.jens.automation2.receivers.CalendarReceiver;
import java.util.ArrayList;
import java.util.Calendar;
@ -107,7 +110,7 @@ public class Rule implements Comparable<Rule>
}
public void setName(String name)
{
this.name = name;
this.name = name.trim();
}
public static void readFromFile()
@ -347,7 +350,16 @@ public class Rule implements Comparable<Rule>
if(oneTrigger.getTriggerType().equals(Trigger.Trigger_Enum.timeFrame))
{
if(oneTrigger.getTimeFrame().repetition > 0)
return true;
{
if(this.getLastExecution() != null)
{
Calendar now = Calendar.getInstance();
if (this.getLastExecution().getTimeInMillis() + oneTrigger.getTimeFrame().getRepetition() * 1000 <= now.getTimeInMillis())
return true;
}
else
return true;
}
}
else if(oneTrigger.getTriggerType().equals(Trigger.Trigger_Enum.broadcastReceived))
{
@ -364,23 +376,28 @@ public class Rule implements Comparable<Rule>
{
if(hasNotAppliedSinceLastExecution())
{
Miscellaneous.logEvent("i", "getsGreenLight()", "Rule " + getName() + " applies and has flipped since its last execution.", 4);
Miscellaneous.logEvent("i", "getsGreenLight()", "Rule \"" + getName() + "\" applies and has flipped since its last execution.", 4);
return true;
}
else if(hasTriggerOfType(Trigger.Trigger_Enum.calendarEvent) && CalendarReceiver.mayRuleStillBeActivatedForPendingCalendarEvents(this))
{
Miscellaneous.logEvent("i", "getsGreenLight()", "Rule \"" + getName() + "\" applies, has not flipped since its last execution, but may still be executed for other calendar events.", 4);
return true;
}
else
Miscellaneous.logEvent("i", "getsGreenLight()", "Rule " + getName() + " has not flipped since its last execution.", 4);
Miscellaneous.logEvent("i", "getsGreenLight()", "Rule \"" + getName() + "\" has not flipped since its last execution.", 4);
}
else
Miscellaneous.logEvent("i", "getsGreenLight()", "Rule " + getName() + " does not apply.", 4);
Miscellaneous.logEvent("i", "getsGreenLight()", "Rule \"" + getName() + "\" does not apply.", 4);
return false;
}
public boolean applies(Context context)
{
if(AutomationService.getInstance() == null)
{
Miscellaneous.logEvent("i", "RuleCheck", "Automation service not running. Rule " + getName() + " cannot apply.", 3);
Miscellaneous.logEvent("i", "RuleCheck", "Automation service not running. Rule \"" + getName() + "\" cannot apply.", 3);
return false;
}
@ -392,11 +409,11 @@ public class Rule implements Comparable<Rule>
return false;
}
Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), String.format("Rule %1$s generally applies currently. Checking if it's really due, yet will be done separately.", this.getName()), 3);
Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), String.format("Rule \"%1$s\" generally applies currently. Checking if it's really due, yet will be done separately.", this.getName()), 3);
return true;
}
Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), String.format(context.getResources().getString(R.string.ruleIsDeactivatedCantApply), this.getName()), 3);
Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), String.format(context.getResources().getString(R.string.ruleIsDeactivatedCantApply), this.getName()), 4);
return false;
}
@ -467,7 +484,9 @@ public class Rule implements Comparable<Rule>
{
AutomationService service = AutomationService.getInstance();
service.speak(messages[0], false);
Toast.makeText(service, messages[0], Toast.LENGTH_LONG).show();
if(Settings.showToasts)
Toast.makeText(service, messages[0], Toast.LENGTH_LONG).show();
super.onProgressUpdate(messages);
}
@ -496,7 +515,7 @@ public class Rule implements Comparable<Rule>
{
boolean isActuallyToggleable = isActuallyToggable();
boolean notLastActive = getLastActivatedRule() == null || !getLastActivatedRule().equals(Rule.this);
// boolean notLastActive = getLastActivatedRule() == null || !getLastActivatedRule().equals(Rule.this);
boolean doToggle = ruleToggle && isActuallyToggleable;
String message;
@ -510,6 +529,29 @@ public class Rule implements Comparable<Rule>
if(Settings.startNewThreadForRuleActivation)
publishProgress(message);
/*
Make a note of Rule/CalendarEvent executed combinations
*/
if(Rule.this.hasTriggerOfType(Trigger.Trigger_Enum.calendarEvent))
{
for(CalendarReceiver.CalendarEvent event : CalendarReceiver.getApplyingCalendarEvents(Rule.this))
{
if(!CalendarReceiver.hasEventBeenUsedInRule(Rule.this, event))
{
/*
Record only the first calendar event that matched because the rule may
be executed once for every matching event.
*/
Miscellaneous.logEvent("i", "Rule", "Executing this rule run for calender event: " + event, 5);
CalendarReceiver.addUsedPair(new CalendarReceiver.RuleEventPair(Rule.this, event));
break;
}
}
}
/*
Run actions one after another
*/
for(int i = 0; i< Rule.this.getActionSet().size(); i++)
{
try
@ -769,4 +811,71 @@ public class Rule implements Comparable<Rule>
return null;
}
@Override
public boolean equals(@Nullable Object obj)
{
return this.getName().equals(((Rule)obj).getName());
}
public boolean hasTriggerOfType(Trigger.Trigger_Enum queryType)
{
for(Trigger t : getTriggerSet())
{
if(t.getTriggerType().equals(queryType))
return true;
}
return false;
}
public boolean hasActionOfType(Action.Action_Enum queryType)
{
for(Action a : getActionSet())
{
if(a.getAction().equals(queryType))
return true;
}
return false;
}
public int getAmountOfTriggersForType(Trigger.Trigger_Enum type)
{
int amount = 0;
for(Trigger t : getTriggerSet())
{
if(t.getTriggerType().equals(type))
amount++;
}
return amount;
}
public int getAmountOfActionsForType(Action.Action_Enum type)
{
int amount = 0;
for(Action a : getActionSet())
{
if(a.getAction().equals(type))
amount++;
}
return amount;
}
public static int getAmountOfActivatedRules()
{
int amount = 0;
<