Charging trigger bug fixed

app/build.gradle

@@ -11,8 +11,8 @@ android {
         compileSdkVersion 31
         buildToolsVersion '29.0.2'
         useLibrary  'org.apache.http.legacy'
-        versionCode 133
-        versionName "1.7.17"
+        versionCode 134
+        versionName "1.7.18"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -36,7 +36,7 @@ android {
         {
             dimension "version"
             versionNameSuffix "-googlePlay"
-            targetSdkVersion 31
+            targetSdkVersion 32
         }
 
         /*

app/src/main/java/com/jens/automation2/ActivityPermissions.java

@@ -706,6 +706,7 @@ public class ActivityPermissions extends Activity
                     case startPhoneCall:
                         addToArrayListUnique(Manifest.permission.CALL_PHONE, requiredPermissions);
 //                        addToArrayListUnique(Manifest.permission.SYSTEM_ALERT_WINDOW, requiredPermissions);
+                        addToArrayListUnique(Manifest.permission.BIND_DEVICE_ADMIN, requiredPermissions);
                         break;
                     case stopPhoneCall:
                         addToArrayListUnique(Manifest.permission.ANSWER_PHONE_CALLS, requiredPermissions);
@@ -950,6 +951,8 @@ public class ActivityPermissions extends Activity
             case Manifest.permission.BIND_DEVICE_ADMIN:
                 for(String ruleName : getRulesUsing(Action.Action_Enum.turnScreenOnOrOff))
                     usingElements.add(String.format(getResources().getString(R.string.ruleXrequiresThis), ruleName));
+                for(String ruleName : getRulesUsing(Action.Action_Enum.startPhoneCall))
+                    usingElements.add(String.format(getResources().getString(R.string.ruleXrequiresThis), ruleName));
                 break;
             case Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS:
                 usingElements.add(getResources().getString(R.string.recommendedForBetterReliability));

app/src/main/java/com/jens/automation2/receivers/BatteryReceiver.java

@@ -41,8 +41,8 @@ public class BatteryReceiver extends BroadcastReceiver implements AutomationList
 				batteryIntentFilter = new IntentFilter();
 				batteryIntentFilter.addAction(Intent.ACTION_BATTERY_CHANGED);
 				batteryIntentFilter.addAction(Intent.ACTION_BATTERY_LOW);
-		//		batteryIntentFilter.addAction(Intent.ACTION_POWER_CONNECTED);
-		//		batteryIntentFilter.addAction(Intent.ACTION_POWER_DISCONNECTED);
+				//		batteryIntentFilter.addAction(Intent.ACTION_POWER_CONNECTED);
+				//		batteryIntentFilter.addAction(Intent.ACTION_POWER_DISCONNECTED);
 			}
 
 			batteryStatus = automationServiceRef.registerReceiver(batteryInfoReceiverInstance, batteryIntentFilter);
@@ -105,12 +105,12 @@ public class BatteryReceiver extends BroadcastReceiver implements AutomationList
 			try
 			{
 				batteryLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);
-		//		int scale = -1;
-		//	    int voltage = -1;
-		//	    int temp = -1;
-		//      scale = intent.getIntExtra(BatteryManager.EXTRA_SCALE, -1);
-		//      temp = intent.getIntExtra(BatteryManager.EXTRA_TEMPERATURE, -1);
-		//      voltage = intent.getIntExtra(BatteryManager.EXTRA_VOLTAGE, -1);
+				//		int scale = -1;
+				//	    int voltage = -1;
+				//	    int temp = -1;
+				//      scale = intent.getIntExtra(BatteryManager.EXTRA_SCALE, -1);
+				//      temp = intent.getIntExtra(BatteryManager.EXTRA_TEMPERATURE, -1);
+				//      voltage = intent.getIntExtra(BatteryManager.EXTRA_VOLTAGE, -1);
 				Log.i("Battery", "Level: " + String.valueOf(batteryLevel));
 				this.actionBatteryLevel(context);
 
@@ -121,7 +121,7 @@ public class BatteryReceiver extends BroadcastReceiver implements AutomationList
 				switch(statusPlugged)
 				{
 					case BatteryManager.BATTERY_PLUGGED_AC:
-	//					Toast.makeText(context, "Regular charging", Toast.LENGTH_LONG).show();
+						//					Toast.makeText(context, "Regular charging", Toast.LENGTH_LONG).show();
 						Miscellaneous.logEvent("i", "BatteryReceiver", "Regular charging.", 5);
 						this.actionCharging(context);
 						break;
@@ -138,6 +138,7 @@ public class BatteryReceiver extends BroadcastReceiver implements AutomationList
 						this.actionCharging(context);
 						break;
 					case BatteryManager.BATTERY_STATUS_DISCHARGING:
+					case BatteryManager.BATTERY_STATUS_NOT_CHARGING:
 						this.actionDischarging(context);
 						break;
 				}

fastlane/metadata/android/en-US/changelogs/134.txt

@@ -0,0 +1,3 @@
+* Fixed: Added device admin permission for start-phone-call action
+* 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.