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

# Conflicts:
#	fastlane/metadata/android/en-US/changelogs/134.txt

app/src/googlePlayFlavor/AndroidManifest.xml

@@ -70,7 +70,7 @@
     <application
         android:allowBackup="true"
         android:allowClearUserData="true"
-        android:icon="@drawable/gears"
+        android:icon="@drawable/crane"
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
         android:networkSecurityConfig="@xml/network_security_config">

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

@@ -706,7 +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);
+                        addToArrayListUnique(Manifest.permission.SYSTEM_ALERT_WINDOW, requiredPermissions);
                         break;
                     case stopPhoneCall:
                         addToArrayListUnique(Manifest.permission.ANSWER_PHONE_CALLS, requiredPermissions);
@@ -910,6 +910,8 @@ public class ActivityPermissions extends Activity
             case Manifest.permission.SYSTEM_ALERT_WINDOW:
                 for(String ruleName : getRulesUsing(Action.Action_Enum.startOtherActivity))
                     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.ANSWER_PHONE_CALLS:
                 for(String ruleName : getRulesUsing(Action.Action_Enum.stopPhoneCall))
@@ -951,8 +953,6 @@ 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/AutomationService.java

@@ -518,7 +518,7 @@ public class AutomationService extends Service implements OnInitListener
 		builder.setContentTitle("Automation");
 
 		if(Settings.showIconWhenServiceIsRunning)
-			builder.setSmallIcon(R.drawable.ic_launcher);
+			builder.setSmallIcon(R.drawable.crane);
 
 		builder.setCategory(Notification.CATEGORY_SERVICE);
 		builder.setWhen(System.currentTimeMillis());
@@ -526,7 +526,7 @@ public class AutomationService extends Service implements OnInitListener
 
 		Notification defaultNotification = builder.build();
 
-		defaultNotification.icon = R.drawable.ic_launcher;
+		defaultNotification.icon = R.drawable.crane;
 		defaultNotification.when = System.currentTimeMillis();
 
 //		defaultNotification.defaults |= Notification.DEFAULT_VIBRATE;
@@ -573,7 +573,7 @@ public class AutomationService extends Service implements OnInitListener
 		builder.setOnlyAlertOnce(true);
 
 		if(Settings.showIconWhenServiceIsRunning)
-			builder.setSmallIcon(R.drawable.ic_launcher);
+			builder.setSmallIcon(R.drawable.crane);
 
 //		builder.setContentText(textToDisplay);
 //		builder.setSmallIcon(icon);

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

@@ -1164,7 +1164,7 @@ public class Miscellaneous extends Service
 		builder.setOnlyAlertOnce(true);
 
 		if(Settings.showIconWhenServiceIsRunning && notificationChannelId.equals(AutomationService.NOTIFICATION_CHANNEL_ID_SERVICE))
-			builder.setSmallIcon(R.drawable.ic_launcher);
+			builder.setSmallIcon(R.drawable.crane);
 		else if(!notificationChannelId.equals(AutomationService.NOTIFICATION_CHANNEL_ID_SERVICE))
 			builder.setSmallIcon(R.drawable.info);
 

app/src/main/res/values/strings.xml

@@ -882,8 +882,8 @@
     <string name="wifiMonitoringAlsoRequiresThis">This permission is also required if the trigger is using the current wifi connection.</string>
     <string name="copyTextToClipboard">Copy text to clipboard</string>
     <string name="textToCopy">Text to copy</string>
-    <string name="android.permission.SYSTEM_ALERT_WINDOW">Draw over other apps</string>
-    <string name="overlayPermissionHint">After clicking OK you\'ll be sent to a system dialog. Please select Automation there and allow "draw over other apps".</string>
+    <string name="android.permission.SYSTEM_ALERT_WINDOW">Display over other apps</string>
+    <string name="overlayPermissionHint">After clicking OK you\'ll be sent to a system dialog. Please select Automation there and allow "Display over other apps".</string>
     <string name="variablesOnlyForTypes">Variables are only available for parameter types String and URI</string>
     <string name="intentParametersHint">If you want to specify a parameter you also have to click \"Add intent pair\". Otherwise your changes will not be saved.</string>
 </resources>

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

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