Compare commits
4 Commits
3e29054f82
...
9f36411511
Author | SHA1 | Date | |
---|---|---|---|
9f36411511 | |||
eb893a7f21 | |||
8788a89e48 | |||
bb10620883 |
@ -11,8 +11,8 @@ android {
|
|||||||
compileSdkVersion 33
|
compileSdkVersion 33
|
||||||
buildToolsVersion '29.0.2'
|
buildToolsVersion '29.0.2'
|
||||||
useLibrary 'org.apache.http.legacy'
|
useLibrary 'org.apache.http.legacy'
|
||||||
versionCode 139
|
versionCode 142
|
||||||
versionName "1.8"
|
versionName "1.8.1"
|
||||||
|
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
@ -66,7 +66,6 @@
|
|||||||
<uses-permission android:name="com.wireguard.android.permission.CONTROL_TUNNELS"/>
|
<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.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
|
||||||
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
|
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
|
||||||
<uses-permission android:name="android.permission.READ_CALENDAR" />
|
|
||||||
<uses-permission
|
<uses-permission
|
||||||
android:name="android.permission.WRITE_SECURE_SETTINGS"
|
android:name="android.permission.WRITE_SECURE_SETTINGS"
|
||||||
tools:ignore="ProtectedPermissions" />
|
tools:ignore="ProtectedPermissions" />
|
||||||
|
@ -1107,7 +1107,13 @@ public class Actions
|
|||||||
externalApplicationIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
externalApplicationIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||||
|
|
||||||
// Pack intents
|
// Pack intents
|
||||||
|
if(params.length >= 4)
|
||||||
|
{
|
||||||
|
if(Miscellaneous.isNumeric(params[3]))
|
||||||
|
externalApplicationIntent = packParametersIntoIntent(externalApplicationIntent, params, 4);
|
||||||
|
else
|
||||||
externalApplicationIntent = packParametersIntoIntent(externalApplicationIntent, params, 3);
|
externalApplicationIntent = packParametersIntoIntent(externalApplicationIntent, params, 3);
|
||||||
|
}
|
||||||
|
|
||||||
if (params[2].equals(ActivityManageActionStartActivity.startByActivityString))
|
if (params[2].equals(ActivityManageActionStartActivity.startByActivityString))
|
||||||
automationServerRef.startActivity(externalApplicationIntent);
|
automationServerRef.startActivity(externalApplicationIntent);
|
||||||
|
@ -654,7 +654,10 @@ public class ActivityManageRule extends Activity
|
|||||||
else if(types[i].toString().equals(Trigger_Enum.checkVariable.toString()))
|
else if(types[i].toString().equals(Trigger_Enum.checkVariable.toString()))
|
||||||
items.add(new Item(typesLong[i].toString(), R.drawable.variable));
|
items.add(new Item(typesLong[i].toString(), R.drawable.variable));
|
||||||
else if(types[i].toString().equals(Trigger_Enum.calendarEvent.toString()))
|
else if(types[i].toString().equals(Trigger_Enum.calendarEvent.toString()))
|
||||||
|
{
|
||||||
|
if(ActivityPermissions.isPermissionDeclaratedInManifest(ActivityManageRule.this, Manifest.permission.READ_CALENDAR))
|
||||||
items.add(new Item(typesLong[i].toString(), R.drawable.calendar));
|
items.add(new Item(typesLong[i].toString(), R.drawable.calendar));
|
||||||
|
}
|
||||||
else
|
else
|
||||||
items.add(new Item(typesLong[i].toString(), R.drawable.placeholder));
|
items.add(new Item(typesLong[i].toString(), R.drawable.placeholder));
|
||||||
}
|
}
|
||||||
|
@ -321,6 +321,8 @@ public class AutomationService extends Service implements OnInitListener
|
|||||||
ReceiverCoordinator.applySettingsAndRules();
|
ReceiverCoordinator.applySettingsAndRules();
|
||||||
|
|
||||||
DateTimeListener.setOrResetAlarms();
|
DateTimeListener.setOrResetAlarms();
|
||||||
|
|
||||||
|
if(Rule.isAnyRuleUsing(Trigger.Trigger_Enum.calendarEvent) && ActivityPermissions.isPermissionDeclaratedInManifest(AutomationService.getInstance(), Manifest.permission.READ_CALENDAR) && ActivityPermissions.havePermission(Manifest.permission.READ_CALENDAR, AutomationService.getInstance()))
|
||||||
CalendarReceiver.armOrRearmTimer();
|
CalendarReceiver.armOrRearmTimer();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package com.jens.automation2;
|
package com.jens.automation2;
|
||||||
|
|
||||||
|
import android.Manifest;
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
@ -212,7 +213,7 @@ public class ReceiverCoordinator
|
|||||||
if(Rule.isAnyRuleUsing(Trigger.Trigger_Enum.screenState))
|
if(Rule.isAnyRuleUsing(Trigger.Trigger_Enum.screenState))
|
||||||
ScreenStateReceiver.startScreenStateReceiver(AutomationService.getInstance());
|
ScreenStateReceiver.startScreenStateReceiver(AutomationService.getInstance());
|
||||||
|
|
||||||
if(Rule.isAnyRuleUsing(Trigger.Trigger_Enum.calendarEvent))
|
if(Rule.isAnyRuleUsing(Trigger.Trigger_Enum.calendarEvent) && ActivityPermissions.isPermissionDeclaratedInManifest(AutomationService.getInstance(), Manifest.permission.READ_CALENDAR) && ActivityPermissions.havePermission(Manifest.permission.READ_CALENDAR, AutomationService.getInstance()))
|
||||||
CalendarReceiver.startCalendarReceiver(AutomationService.getInstance());
|
CalendarReceiver.startCalendarReceiver(AutomationService.getInstance());
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -469,7 +470,7 @@ public class ReceiverCoordinator
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(Rule.isAnyRuleUsing(Trigger.Trigger_Enum.calendarEvent))
|
if(Rule.isAnyRuleUsing(Trigger.Trigger_Enum.calendarEvent) && ActivityPermissions.isPermissionDeclaratedInManifest(AutomationService.getInstance(), Manifest.permission.READ_CALENDAR) && ActivityPermissions.havePermission(Manifest.permission.READ_CALENDAR, AutomationService.getInstance()))
|
||||||
{
|
{
|
||||||
if(!CalendarReceiver.getInstance().isListenerRunning())
|
if(!CalendarReceiver.getInstance().isListenerRunning())
|
||||||
CalendarReceiver.getInstance().startListener(AutomationService.getInstance());
|
CalendarReceiver.getInstance().startListener(AutomationService.getInstance());
|
||||||
|
1
fastlane/metadata/android/de-DE/changelogs/141.txt
Normal file
1
fastlane/metadata/android/de-DE/changelogs/141.txt
Normal file
@ -0,0 +1 @@
|
|||||||
|
* Kalendar Funktion aus Google Version entfernt
|
3
fastlane/metadata/android/de-DE/changelogs/142.txt
Normal file
3
fastlane/metadata/android/de-DE/changelogs/142.txt
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
* Behoben: Kalender Auslöser wird jetzt in Play Version verborgen
|
||||||
|
* Behoben: Parameter wurde beim Starten anderer Apps nicht korrekt übergeben
|
||||||
|
* Behoben: Absturz beim Verlassen der Einstellungen
|
1
fastlane/metadata/android/en-US/changelogs/141.txt
Normal file
1
fastlane/metadata/android/en-US/changelogs/141.txt
Normal file
@ -0,0 +1 @@
|
|||||||
|
* Calendar trigger removed from Google version
|
3
fastlane/metadata/android/en-US/changelogs/142.txt
Normal file
3
fastlane/metadata/android/en-US/changelogs/142.txt
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
* Fixed: Calendar trigger hidden from Play version
|
||||||
|
* Fixed: Parameters not correctly supplied when starting other apps
|
||||||
|
* Fixed: Crash when exiting settings while service is running
|
1
fastlane/metadata/android/es-ES/changelogs/141.txt
Normal file
1
fastlane/metadata/android/es-ES/changelogs/141.txt
Normal file
@ -0,0 +1 @@
|
|||||||
|
* Eliminado el activador de calendario de la versión de Google
|
3
fastlane/metadata/android/es-ES/changelogs/142.txt
Normal file
3
fastlane/metadata/android/es-ES/changelogs/142.txt
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
* Corregido: Condición de calendario ahora es oculto en la versión Play
|
||||||
|
* Corregido: Los parámetros no se suministran correctamente al iniciar otras aplicaciones
|
||||||
|
* Corregido: Bloqueo al salir de la configuración mientras el servicio se está ejecutando
|
1
fastlane/metadata/android/fr-FR/changelogs/141.txt
Normal file
1
fastlane/metadata/android/fr-FR/changelogs/141.txt
Normal file
@ -0,0 +1 @@
|
|||||||
|
* Déclencheur d'agenda supprimé de la version Google
|
3
fastlane/metadata/android/fr-FR/changelogs/142.txt
Normal file
3
fastlane/metadata/android/fr-FR/changelogs/142.txt
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
* Correction : Déclencheur de calendrier caché dans la version Play
|
||||||
|
* Correction : Les paramètres n'étaient pas correctement fournis lors du démarrage d'autres applications
|
||||||
|
* Correction : Plantage lors de la fermeture des paramètres pendant l'exécution du service
|
1
fastlane/metadata/android/it-IT/changelogs/141.txt
Normal file
1
fastlane/metadata/android/it-IT/changelogs/141.txt
Normal file
@ -0,0 +1 @@
|
|||||||
|
* Il trigger del calendario è stato rimosso dalla versione Google
|
3
fastlane/metadata/android/it-IT/changelogs/142.txt
Normal file
3
fastlane/metadata/android/it-IT/changelogs/142.txt
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
* Risolto: trigger del calendario nascosto dalla versione Play
|
||||||
|
* Risolto: parametri non forniti correttamente all'avvio di altre app
|
||||||
|
* Risolto: arresto anomalo quando si esce dalle impostazioni mentre il servizio è in esecuzione
|
1
fastlane/metadata/android/nl-NL/changelogs/141.txt
Normal file
1
fastlane/metadata/android/nl-NL/changelogs/141.txt
Normal file
@ -0,0 +1 @@
|
|||||||
|
* Agendatrigger verwijderd uit Google-versie
|
3
fastlane/metadata/android/nl-NL/changelogs/142.txt
Normal file
3
fastlane/metadata/android/nl-NL/changelogs/142.txt
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
* Opgelost: kalendertrigger verborgen voor Play-versie
|
||||||
|
* Opgelost: parameters worden niet correct opgegeven bij het starten van andere apps
|
||||||
|
* Opgelost: crash bij het afsluiten van instellingen terwijl de service actief is
|
1
fastlane/metadata/android/pl-PL/changelogs/141.txt
Normal file
1
fastlane/metadata/android/pl-PL/changelogs/141.txt
Normal file
@ -0,0 +1 @@
|
|||||||
|
* Wyzwalacz kalendarza usunięty z wersji Google
|
3
fastlane/metadata/android/pl-PL/changelogs/142.txt
Normal file
3
fastlane/metadata/android/pl-PL/changelogs/142.txt
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
* Naprawiono: Wyzwalacz kalendarza ukryty w wersji Play
|
||||||
|
* Naprawiono: Parametry nie są poprawnie dostarczane podczas uruchamiania innych aplikacji
|
||||||
|
* Naprawiono: Awaria podczas wychodzenia z ustawień, gdy usługa jest uruchomiona
|
1
fastlane/metadata/android/ru-RU/changelogs/141.txt
Normal file
1
fastlane/metadata/android/ru-RU/changelogs/141.txt
Normal file
@ -0,0 +1 @@
|
|||||||
|
* Триггер календаря удален из версии Google
|
3
fastlane/metadata/android/ru-RU/changelogs/142.txt
Normal file
3
fastlane/metadata/android/ru-RU/changelogs/142.txt
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
* Исправлено: Триггер календаря скрыт в игровой версии
|
||||||
|
* Исправлено: Параметры неправильно указываются при запуске других приложений.
|
||||||
|
* Исправлено: Сбой при выходе из настроек во время работы сервиса
|
1
fastlane/metadata/android/zh-CN/changelogs/141.txt
Normal file
1
fastlane/metadata/android/zh-CN/changelogs/141.txt
Normal file
@ -0,0 +1 @@
|
|||||||
|
* 日历触发器已从 Google 版本中删除
|
3
fastlane/metadata/android/zh-CN/changelogs/142.txt
Normal file
3
fastlane/metadata/android/zh-CN/changelogs/142.txt
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
* 修复:播放版本中隐藏的日历触发器
|
||||||
|
* 修复:启动其他应用程序时未正确提供参数的问题
|
||||||
|
* 修复:服务运行时退出设置时崩溃
|
Loading…
Reference in New Issue
Block a user