From ab2b0ce34c2e6c37a7e716d18c9d9a047445fa21 Mon Sep 17 00:00:00 2001 From: jens Date: Sat, 3 Oct 2026 17:00:11 +0200 Subject: [PATCH] Removed contacts permission from Google Play version --- app/src/googlePlayFlavor/AndroidManifest.xml | 4 +++- .../jens/automation2/ActivityManageTriggerPhoneCall.java | 6 ++++++ .../main/java/com/jens/automation2/AutomationService.java | 2 +- app/src/main/res/values/strings.xml | 2 +- fastlane/metadata/android/en-US/changelogs/150.txt | 3 ++- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/src/googlePlayFlavor/AndroidManifest.xml b/app/src/googlePlayFlavor/AndroidManifest.xml index 1e5f305..640276a 100644 --- a/app/src/googlePlayFlavor/AndroidManifest.xml +++ b/app/src/googlePlayFlavor/AndroidManifest.xml @@ -60,7 +60,9 @@ - + diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerPhoneCall.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerPhoneCall.java index ba12e41..2bb562b 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerPhoneCall.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageTriggerPhoneCall.java @@ -102,6 +102,12 @@ public class ActivityManageTriggerPhoneCall extends Activity @Override public void onClick(View view) { + if(BuildConfig.FLAVOR.equals(AutomationService.flavor_name_googleplay)) + { + Miscellaneous.messageBox(getResources().getString(R.string.info), getResources().getString(R.string.featureNotInGooglePlayVersion), ActivityManageTriggerPhoneCall.this).show(); + return; + } + if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !ActivityPermissions.havePermission("android.permission.READ_CONTACTS", ActivityManageTriggerPhoneCall.this)) { requestPermissions("android.permission.READ_CONTACTS"); diff --git a/app/src/main/java/com/jens/automation2/AutomationService.java b/app/src/main/java/com/jens/automation2/AutomationService.java index 10c4a05..8aef24b 100644 --- a/app/src/main/java/com/jens/automation2/AutomationService.java +++ b/app/src/main/java/com/jens/automation2/AutomationService.java @@ -469,7 +469,7 @@ public class AutomationService extends Service implements OnInitListener if(displayNotification) { Intent intent = new Intent(AutomationService.this, ActivityPermissions.class); - PendingIntent pi = PendingIntent.getActivity(AutomationService.this, 0, intent, 0); + PendingIntent pi = PendingIntent.getActivity(AutomationService.this, 0, intent, FLAG_IMMUTABLE); Miscellaneous.logEvent("w", "Features disabled", "Features disabled because of rule " + rule, 5); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 49f88f1..a4f20e9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -698,7 +698,7 @@ Bottom Position of tab bar Choose where the tabs bar should be placed. - Because Google screwed up yet another part of Android, starting with API 30 only the currently visible wifis can be displayed, not all the ones your device has connected to anymore. + Because Google screwed up yet another part of Android, starting with API 30 only the currently visible Wi-Fi can be displayed, not all the ones your device has connected to anymore. REMARK: The silent mode often triggers Do-Not-Disturb on newer devices. If that happens on your device, I recommend using the normal mode instead and lowering all volumes to zero. Tones Miscellaneous diff --git a/fastlane/metadata/android/en-US/changelogs/150.txt b/fastlane/metadata/android/en-US/changelogs/150.txt index 0f5c7c1..bd9d380 100644 --- a/fastlane/metadata/android/en-US/changelogs/150.txt +++ b/fastlane/metadata/android/en-US/changelogs/150.txt @@ -1,3 +1,4 @@ * Added: Triggers and actions can now be cloned * Added: URL checker for triggerUrl action -* Fixed: Crash when starting to add/edit a triggerURL action while the app or the system are set to the German language \ No newline at end of file +* Fixed: Crash when starting to add/edit a triggerURL action while the app or the system are set to the German language +* Fixed: Crash when starting service in Google Play version \ No newline at end of file