From 0463e0aa19cc388bf1bdc2ffc7cabeaa7c6cc922 Mon Sep 17 00:00:00 2001 From: jens Date: Mon, 27 Dec 2021 13:58:43 +0100 Subject: [PATCH] Silent mode bug --- app/build.gradle | 4 ++-- .../release/output-metadata.json | 4 ++-- .../main/java/com/jens/automation2/Actions.java | 16 ++++++++-------- .../jens/automation2/ActivityPermissions.java | 16 ++++------------ .../metadata/android/de-DE/changelogs/115.txt | 1 + .../metadata/android/en-US/changelogs/115.txt | 1 + .../metadata/android/es-ES/changelogs/115.txt | 1 + .../metadata/android/it-IT/changelogs/115.txt | 1 + .../metadata/android/nl-NL/changelogs/115.txt | 1 + 9 files changed, 21 insertions(+), 24 deletions(-) create mode 100644 fastlane/metadata/android/de-DE/changelogs/115.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/115.txt create mode 100644 fastlane/metadata/android/es-ES/changelogs/115.txt create mode 100644 fastlane/metadata/android/it-IT/changelogs/115.txt create mode 100644 fastlane/metadata/android/nl-NL/changelogs/115.txt diff --git a/app/build.gradle b/app/build.gradle index f051eb1..86555af 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { compileSdkVersion 29 buildToolsVersion '29.0.2' useLibrary 'org.apache.http.legacy' - versionCode 114 - versionName "1.7" + versionCode 115 + versionName "1.7.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/googlePlayFlavor/release/output-metadata.json b/app/googlePlayFlavor/release/output-metadata.json index d2a31df..fea03fb 100644 --- a/app/googlePlayFlavor/release/output-metadata.json +++ b/app/googlePlayFlavor/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 114, - "versionName": "1.7-googlePlay", + "versionCode": 115, + "versionName": "1.7.1-googlePlay", "outputFile": "app-googlePlayFlavor-release.apk" } ], diff --git a/app/src/main/java/com/jens/automation2/Actions.java b/app/src/main/java/com/jens/automation2/Actions.java index 0c7fb41..4df26e7 100644 --- a/app/src/main/java/com/jens/automation2/Actions.java +++ b/app/src/main/java/com/jens/automation2/Actions.java @@ -687,14 +687,14 @@ public class Actions AudioManager myAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE); - if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && desiredSoundSetting == AudioManager.RINGER_MODE_SILENT) - { - AudioManager am = (AudioManager) Miscellaneous.getAnyContext().getSystemService(Context.AUDIO_SERVICE); - am.setStreamVolume(AudioManager.STREAM_NOTIFICATION, 0, AudioManager.FLAG_PLAY_SOUND); - am.setVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER, AudioManager.VIBRATE_SETTING_OFF); - } - else - myAudioManager.setRingerMode(desiredSoundSetting); +// if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && desiredSoundSetting == AudioManager.RINGER_MODE_SILENT) +// { +// AudioManager am = (AudioManager) Miscellaneous.getAnyContext().getSystemService(Context.AUDIO_SERVICE); +// am.setStreamVolume(AudioManager.STREAM_NOTIFICATION, 0, AudioManager.FLAG_PLAY_SOUND); +// am.setVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER, AudioManager.VIBRATE_SETTING_OFF); +// } +// else +// myAudioManager.setRingerMode(desiredSoundSetting); } private static String getIPAddressUsb(final boolean useIPv4) diff --git a/app/src/main/java/com/jens/automation2/ActivityPermissions.java b/app/src/main/java/com/jens/automation2/ActivityPermissions.java index 72264d3..c64c363 100644 --- a/app/src/main/java/com/jens/automation2/ActivityPermissions.java +++ b/app/src/main/java/com/jens/automation2/ActivityPermissions.java @@ -301,8 +301,7 @@ public class ActivityPermissions extends Activity public static boolean haveDeviceAdmin() { DevicePolicyManager deviceManger = (DevicePolicyManager)Miscellaneous.getAnyContext().getSystemService(Context.DEVICE_POLICY_SERVICE); -// ComponentName compName = new ComponentName(ActivityPermissions.getInstance(), DeviceAdmin.class ) ; - ComponentName compName = new ComponentName(Miscellaneous.getAnyContext(), DeviceAdmin.class) ; + ComponentName compName = new ComponentName(Miscellaneous.getAnyContext(), DeviceAdmin.class); boolean active = deviceManger.isAdminActive(compName); return active; } @@ -311,11 +310,7 @@ public class ActivityPermissions extends Activity { if(!haveDeviceAdmin()) { -// deviceManger.removeActiveAdmin(compName); -// } -// else -// { - DevicePolicyManager deviceManger = (DevicePolicyManager)Miscellaneous.getAnyContext().getSystemService(Context.DEVICE_POLICY_SERVICE); +// DevicePolicyManager deviceManger = (DevicePolicyManager)Miscellaneous.getAnyContext().getSystemService(Context.DEVICE_POLICY_SERVICE); ComponentName compName = new ComponentName(ActivityPermissions.getInstance(), DeviceAdmin.class) ; Intent intent = new Intent(DevicePolicyManager.ACTION_ADD_DEVICE_ADMIN ); @@ -341,9 +336,6 @@ public class ActivityPermissions extends Activity addToArrayListUnique("android.permission.RECEIVE_BOOT_COMPLETED", requiredPermissions); */ -// if (!havePermission(ActivityPermissions.writeExternalStoragePermissionName, workingContext)) -// addToArrayListUnique(ActivityPermissions.writeExternalStoragePermissionName, requiredPermissions); - if(!havePermission(Manifest.permission.WRITE_SETTINGS, workingContext)) { for (Profile profile : Profile.getProfileCollection()) @@ -366,9 +358,9 @@ public class ActivityPermissions extends Activity singlePermission.equalsIgnoreCase(Manifest.permission.ACCESS_BACKGROUND_LOCATION) || - singlePermission.equalsIgnoreCase(Manifest.permission.ACCESS_FINE_LOCATION) + singlePermission.equalsIgnoreCase(Manifest.permission.ACCESS_FINE_LOCATION) || - singlePermission.equalsIgnoreCase(Manifest.permission.ACCESS_COARSE_LOCATION) + singlePermission.equalsIgnoreCase(Manifest.permission.ACCESS_COARSE_LOCATION) ) { if (!Miscellaneous.googleToBlameForLocation(true)) diff --git a/fastlane/metadata/android/de-DE/changelogs/115.txt b/fastlane/metadata/android/de-DE/changelogs/115.txt new file mode 100644 index 0000000..f4941a1 --- /dev/null +++ b/fastlane/metadata/android/de-DE/changelogs/115.txt @@ -0,0 +1 @@ +* Behoben: Stumm-Modus konnte nicht geschaltet werden. \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/115.txt b/fastlane/metadata/android/en-US/changelogs/115.txt new file mode 100644 index 0000000..793bc7c --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/115.txt @@ -0,0 +1 @@ +* Fixed: Silent mode did not set on newer phones. \ No newline at end of file diff --git a/fastlane/metadata/android/es-ES/changelogs/115.txt b/fastlane/metadata/android/es-ES/changelogs/115.txt new file mode 100644 index 0000000..ca2b8aa --- /dev/null +++ b/fastlane/metadata/android/es-ES/changelogs/115.txt @@ -0,0 +1 @@ +* Corregido: El modo silencioso no se configuró en los teléfonos más nuevos. \ No newline at end of file diff --git a/fastlane/metadata/android/it-IT/changelogs/115.txt b/fastlane/metadata/android/it-IT/changelogs/115.txt new file mode 100644 index 0000000..24f9f05 --- /dev/null +++ b/fastlane/metadata/android/it-IT/changelogs/115.txt @@ -0,0 +1 @@ +* Risolto: la modalità silenziosa non è stata impostata sui telefoni più recenti. \ No newline at end of file diff --git a/fastlane/metadata/android/nl-NL/changelogs/115.txt b/fastlane/metadata/android/nl-NL/changelogs/115.txt new file mode 100644 index 0000000..997272b --- /dev/null +++ b/fastlane/metadata/android/nl-NL/changelogs/115.txt @@ -0,0 +1 @@ +* Opgelost: Stille modus is niet ingesteld op nieuwere telefoons. \ No newline at end of file