Fixed bug in broadcast receiver trigger

app/build.gradle

@@ -11,8 +11,8 @@ android {
         compileSdkVersion 31
         buildToolsVersion '29.0.2'
         useLibrary  'org.apache.http.legacy'
-        versionCode 136
-        versionName "1.7.19"
+        versionCode 138
+        versionName "1.7.21"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

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

@@ -1043,7 +1043,12 @@ public class Actions
 	{
 		Miscellaneous.logEvent("i", "StartOtherActivity", "Starting other Activity...", 4);
 
-		String params[] = param.split(";");
+		String params[];
+
+		if(param.contains(Action.actionParameter2Split))
+			params = param.split(Action.actionParameter2Split);
+		else
+			params = param.split(";");
 
 		try
 		{

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

@@ -58,10 +58,10 @@ public class ActivityManageActionStartActivity extends Activity
 	RadioButton rbStartAppSelectByActivity, rbStartAppSelectByAction, rbStartAppByActivity, rbStartAppByBroadcast, rbStartAppByService, rbStartAppByForegroundService;
 
 	final String urlShowExamples = "https://server47.de/automation/examples_startProgram.html";
-	final static String startByActivityString = "0";
-	final static String startByBroadcastString = "1";
-	final static String startByServiceString = "2";
-	final static String startByForegroundServiceString = "3";
+	public final static String startByActivityString = "0";
+	public final static String startByBroadcastString = "1";
+	public final static String startByServiceString = "2";
+	public final static String startByForegroundServiceString = "3";
 
 	final static int requestCodeForRequestQueryAllPackagesPermission = 4711;
 
@@ -234,29 +234,29 @@ public class ActivityManageActionStartActivity extends Activity
 					String parameter2 = "";
 
 					if (rbStartAppSelectByActivity.isChecked())
-						parameter2 += etPackageName.getText().toString() + ";" + etActivityOrActionPath.getText().toString();
+						parameter2 += etPackageName.getText().toString() + Action.actionParameter2Split + etActivityOrActionPath.getText().toString();
 					else
 					{
 						if (etPackageName.getText().toString() != null && etPackageName.getText().toString().length() > 0)
-							parameter2 += etPackageName.getText().toString() + ";" + etActivityOrActionPath.getText().toString();
+							parameter2 += etPackageName.getText().toString() + Action.actionParameter2Split + etActivityOrActionPath.getText().toString();
 						else
-							parameter2 += Actions.dummyPackageString + ";" + etActivityOrActionPath.getText().toString();
+							parameter2 += Actions.dummyPackageString + Action.actionParameter2Split + etActivityOrActionPath.getText().toString();
 
 //						if(etClassName.getText().toString().length() > 0)
-							parameter2 += ";" + etClassName.getText().toString();
+							parameter2 += Action.actionParameter2Split + etClassName.getText().toString();
 					}
 
 					if (rbStartAppByActivity.isChecked())
-						parameter2 += ";" + startByActivityString;
+						parameter2 += Action.actionParameter2Split + startByActivityString;
 					else if(rbStartAppByService.isChecked())
-						parameter2 += ";" + startByServiceString;
+						parameter2 += Action.actionParameter2Split + startByServiceString;
 					else if(rbStartAppByForegroundService.isChecked())
-						parameter2 += ";" + startByForegroundServiceString;
+						parameter2 += Action.actionParameter2Split + startByForegroundServiceString;
 					else
-						parameter2 += ";" + startByBroadcastString;
+						parameter2 += Action.actionParameter2Split + startByBroadcastString;
 
 					for (String s : intentPairList)
-						parameter2 += ";" + s;
+						parameter2 += Action.actionParameter2Split + s;
 
 					returnData.putExtra(ActivityManageRule.intentNameActionParameter2, parameter2);
 
@@ -628,7 +628,13 @@ public class ActivityManageActionStartActivity extends Activity
 		rbStartAppSelectByActivity.setChecked(!selectionByAction);
 		rbStartAppSelectByAction.setChecked(selectionByAction);
 
-		String[] params = input.getStringExtra(ActivityManageRule.intentNameActionParameter2).split(";");
+		String[] params;
+		String partsString = input.getStringExtra(ActivityManageRule.intentNameActionParameter2);
+
+		if(partsString.contains(Action.actionParameter2Split))
+			params = partsString.split(Action.actionParameter2Split);
+		else
+			params = partsString.split(";");
 
 		if(Miscellaneous.isNumeric(params[2]))	// old configuration file
 		{

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

@@ -650,7 +650,18 @@ public class ActivityPermissions extends Activity
 //                        )
 //                            addToArrayListUnique("net.kollnig.missioncontrol.permission.ADMIN", requiredPermissions);
                         if(Build.VERSION.SDK_INT >= 29)
+                        {
+                            String parts[];
+                            if(action.getParameter2().contains(Action.actionParameter2Split))
+                                parts = action.getParameter2().split(Action.actionParameter2Split);
+                            else
+                                parts = action.getParameter2().split(";");
+
+                            // Permission only required for starts of activity, not broadcasts or services
+
+                            if(parts[2].equals(ActivityManageActionStartActivity.startByActivityString))
                                 addToArrayListUnique(Manifest.permission.SYSTEM_ALERT_WINDOW, requiredPermissions);
+                        }
                         break;
                     case triggerUrl:
                         addToArrayListUnique(Manifest.permission.INTERNET, requiredPermissions);

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

@@ -223,6 +223,9 @@ public class AutomationService extends Service implements OnInitListener
 			startUpRoutine();
 
 			Intent myIntent = new Intent(this, ActivityMainTabLayout.class);
+			if(getApplicationContext().getApplicationInfo().targetSdkVersion >= 31)
+				myPendingIntent = PendingIntent.getActivity(this, 0, myIntent, PendingIntent.FLAG_MUTABLE);
+			else
 				myPendingIntent = PendingIntent.getActivity(this, 0, myIntent, 0);
 			notificationBuilder = createServiceNotificationBuilder();
 

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

@@ -145,6 +145,7 @@ public class ReceiverCoordinator
         }
 
         // startPhoneStateListener
+        if(!BuildConfig.FLAVOR.equals(AutomationService.flavor_name_googleplay))
             PhoneStatusListener.startPhoneStatusListener(AutomationService.getInstance());			// also used to mute anouncements during calls
 
         // startConnectivityReceiver

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

@@ -1286,20 +1286,24 @@ public class XmlFileInterface
 					else
 						newTag = tag.replace("/", Action.intentPairSeparator);
 
-					String[] newTagPieces = newTag.split(";");
+					String[] newTagPieces = new String[0];
+					if(newTag.contains(Action.actionParameter2Split))
+						newTagPieces = newTag.split(Action.actionParameter2Split);
+					else
+						newTag.split(";");
 
 					if(newTagPieces.length < 2 || (!newTagPieces[0].contains(Actions.dummyPackageString) && newTagPieces[1].contains(Action.intentPairSeparator)))
 					{
-						newTag = Actions.dummyPackageString + ";" + newTag;
-						newTagPieces = newTag.split(";");
+						newTag = Actions.dummyPackageString + Action.actionParameter2Split + newTag;
+						newTagPieces = newTag.split(Action.actionParameter2Split);
 					}
 
 					if(newTagPieces.length < 3)
-						newTag += ";" + ActivityManageActionStartActivity.startByActivityString;
+						newTag += Action.actionParameter2Split + ActivityManageActionStartActivity.startByActivityString;
 					else if(newTagPieces.length >= 3)
 					{
 						if(newTagPieces[2].contains(Action.intentPairSeparator))
-							newTag = newTagPieces[0] + ";" + newTagPieces[1] + ";" + ActivityManageActionStartActivity.startByActivityString + ";" + newTagPieces[2];
+							newTag = newTagPieces[0] + Action.actionParameter2Split + newTagPieces[1] + Action.actionParameter2Split + ActivityManageActionStartActivity.startByActivityString + Action.actionParameter2Split + newTagPieces[2];
 					}
 
 					newAction.setParameter2(newTag);

app/src/main/java/com/jens/automation2/location/LocationProvider.java

@@ -11,6 +11,7 @@ import android.util.Log;
 
 import com.jens.automation2.ActivityMainScreen;
 import com.jens.automation2.AutomationService;
+import com.jens.automation2.BuildConfig;
 import com.jens.automation2.Miscellaneous;
 import com.jens.automation2.PointOfInterest;
 import com.jens.automation2.R;
@@ -232,6 +233,7 @@ public class LocationProvider
 	public void startLocationService()
 	{
 		// startPhoneStateListener
+		if(!BuildConfig.FLAVOR.equals(AutomationService.flavor_name_googleplay))
 			PhoneStatusListener.startPhoneStatusListener(parentService);			// also used to mute anouncements during calls
 
 		// startConnectivityReceiver

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

@@ -134,7 +134,7 @@ public class BatteryReceiver extends BroadcastReceiver implements AutomationList
 				{
 					case BatteryManager.BATTERY_STATUS_CHARGING:
 					case BatteryManager.BATTERY_STATUS_FULL:
-						Miscellaneous.logEvent("i", "BatteryReceiver", "Device has been fully charged.", 5);
+//						Miscellaneous.logEvent("i", "BatteryReceiver", "Device has been fully charged.", 5);
 						this.actionCharging(context);
 						break;
 					case BatteryManager.BATTERY_STATUS_DISCHARGING:

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

@@ -52,10 +52,14 @@ public class BroadcastListener extends android.content.BroadcastReceiver impleme
     {
         broadcastsCollection.add(new EventOccurrence(Calendar.getInstance(), intent.getAction()));
 
-        for(String key : intent.getExtras().keySet())
+        Miscellaneous.logEvent("i", "Broadcast received", "Broadcast " + intent.getAction() + " received.", 4);
+        if(intent.getExtras() != null && intent.getExtras().size() > 0)
+        {
+            for (String key : intent.getExtras().keySet())
             {
                 Miscellaneous.logEvent("i", "Broadcast extra", "Broadcast " + intent.getAction() + " has extra " + key + " and type " + intent.getExtras().get(key).getClass().getName(), 4);
             }
+        }
 
         ArrayList<Rule> ruleCandidates = Rule.findRuleCandidates(Trigger.Trigger_Enum.broadcastReceived);
         for(int i=0; i<ruleCandidates.size(); i++)

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

@@ -11,6 +11,7 @@ import android.util.Log;
 import androidx.annotation.RequiresApi;
 
 import com.jens.automation2.AutomationService;
+import com.jens.automation2.BuildConfig;
 import com.jens.automation2.Miscellaneous;
 import com.jens.automation2.Rule;
 import com.jens.automation2.TimeFrame;
@@ -243,7 +244,12 @@ public class DateTimeListener extends BroadcastReceiver implements AutomationLis
 		}
 		
 		Intent alarmIntent = new Intent(automationServiceRef, DateTimeListener.class);
+		
+		if(Miscellaneous.getAnyContext().getApplicationContext().getApplicationInfo().targetSdkVersion >= 31)
+			alarmPendingIntent = PendingIntent.getBroadcast(automationServiceRef, 0, alarmIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+		else
 			alarmPendingIntent = PendingIntent.getBroadcast(automationServiceRef, 0, alarmIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+
 		centralAlarmManagerInstance.set(AlarmManager.RTC_WAKEUP, scheduleCandidate.time.getTimeInMillis(), alarmPendingIntent);
 
 		SimpleDateFormat sdf = new SimpleDateFormat("E dd.MM.yyyy HH:mm:ss");

fastlane/metadata/android/de-DE/changelogs/137.txt

@@ -0,0 +1 @@
+* Fixed: Crashes at service start that only affected the Google Play version because of a higher targetSdk

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

@@ -0,0 +1,2 @@
+* Fixed: Overlay permission for start other program action only required if startByActivity() is selected
+* Fixed: Broadcast receiver trigger would not trigger anything, but crash