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

# Conflicts:
#	fastlane/metadata/android/en-US/changelogs/134.txt
This commit is contained in:
Jens 2023-08-30 23:25:13 +02:00
commit 1a60c88f35
3 changed files with 35 additions and 33 deletions

View File

@ -36,7 +36,7 @@ android {
{ {
dimension "version" dimension "version"
versionNameSuffix "-googlePlay" versionNameSuffix "-googlePlay"
targetSdkVersion 31 targetSdkVersion 32
} }
/* /*

View File

@ -138,6 +138,7 @@ public class BatteryReceiver extends BroadcastReceiver implements AutomationList
this.actionCharging(context); this.actionCharging(context);
break; break;
case BatteryManager.BATTERY_STATUS_DISCHARGING: case BatteryManager.BATTERY_STATUS_DISCHARGING:
case BatteryManager.BATTERY_STATUS_NOT_CHARGING:
this.actionDischarging(context); this.actionDischarging(context);
break; break;
} }

View File

@ -1,3 +1,4 @@
* Fixed: Added overlay permission for start-phone-call action * Fixed: Added overlay permission for start-phone-call action
* Change: Icon changed in Play store version * Change: Icon changed in Play store version
* Change: Target-SDK raised in Play store version * Fixed: Trigger "battery is charging" would only fire once and not after disconnecting and connecting charger
* Change: Was forced to raise targetSdk to 32 for Google Play version. If that should break something, consider switching to the F-Droid or APK version.