diff --git a/app/src/main/res/raw/alarm.mp3 b/app/src/main/res/raw/alarm.mp3 index b15e5257..a9088be1 100644 Binary files a/app/src/main/res/raw/alarm.mp3 and b/app/src/main/res/raw/alarm.mp3 differ diff --git a/fix-279.patch b/fix-279.patch deleted file mode 100644 index ef8b8014..00000000 --- a/fix-279.patch +++ /dev/null @@ -1,323 +0,0 @@ -diff --git a/app/src/main/java/uk/org/openseizuredetector/SdServer.java b/app/src/main/java/uk/org/openseizuredetector/SdServer.java -index 0b45a18..59f4db3 100644 ---- a/app/src/main/java/uk/org/openseizuredetector/SdServer.java -+++ b/app/src/main/java/uk/org/openseizuredetector/SdServer.java -@@ -225,7 +225,18 @@ public class SdServer extends Service implements SdDataReceiver { - private OsdUtil mUtil; - private Handler mHandler; - private ToneGenerator mToneGenerator; // used for Alarm beeps only (STREAM_ALARM) -- private ToneGenerator mWarningToneGenerator; // used for Warning and FaultWarning beeps (STREAM_NOTIFICATION) -+ private ToneGenerator mWarningToneGenerator; // used for Warning and FaultWarning beeps -+ // Stream mWarningToneGenerator currently plays on - STREAM_ALARM by default, or -+ // STREAM_NOTIFICATION if the user has unchecked WarningOverrideSilentMode (see updatePrefs()). -+ private int mWarningToneStream = AudioManager.STREAM_ALARM; -+ private boolean mWarningOverrideSilentMode = true; -+ -+ // "Use Max Volume for Alerts?" support - see boostAlarmStreamVolume()/restoreAlarmStreamVolume() -+ private AudioManager mAudioManager; -+ private boolean mUseMaxVolumeForAlerts = true; -+ private int mSavedAlarmStreamVolume = -1; // -1 = Alarm stream volume is not currently boosted -+ private boolean mAlarmMp3VolumeBoosted = false; // whether the *current* MP3 playback boosted the volume -+ private final Runnable mAlarmToneVolumeRestore = this::restoreAlarmStreamVolume; - private android.media.MediaPlayer mMediaPlayer = null; // used for MP3 alarm sounds - private String mCurrentMp3Uri = null; // URI of currently playing MP3 - private long mMp3StartTimeMs = 0; // Time when current MP3 started playing -@@ -282,7 +293,8 @@ public class SdServer extends Service implements SdDataReceiver { - mSdData = new SdData(); - mSdDataHistory = new uk.org.openseizuredetector.data.SdDataHistory(); // Initialize history buffers - mToneGenerator = new ToneGenerator(AudioManager.STREAM_ALARM, 100); -- mWarningToneGenerator = new ToneGenerator(AudioManager.STREAM_NOTIFICATION, 100); -+ mWarningToneGenerator = new ToneGenerator(mWarningToneStream, 100); -+ mAudioManager = (AudioManager) getSystemService(AUDIO_SERVICE); - - mUtil = new OsdUtil(getApplicationContext(), mHandler); - Log.i(TAG, "SdServer.onCreate()"); -@@ -830,6 +842,8 @@ public class SdServer extends Service implements SdDataReceiver { - stopWebServer(); - - stopMp3(); // release MediaPlayer if active (must be before ToneGenerator release) -+ restoreAlarmStreamVolume(); // safety net: don't leave Alarm volume stuck at max if -+ // destroyed mid-alert (stopMp3() only covers MP3 playback) - Log.i(TAG, "SdServer.onDestroy() - releasing mToneGenerator"); - if (mToneGenerator != null) { - mToneGenerator.release(); -@@ -944,6 +958,12 @@ public class SdServer extends Service implements SdDataReceiver { - } - mCurrentMp3Uri = null; - mMp3StartTimeMs = 0; -+ // If the sound that just stopped was an Alarm MP3 we boosted the volume for, restore it. -+ // FaultWarning MP3 playback never sets this flag, so it's left untouched here. -+ if (mAlarmMp3VolumeBoosted) { -+ mAlarmMp3VolumeBoosted = false; -+ restoreAlarmStreamVolume(); -+ } - } - - /** -@@ -1649,6 +1669,53 @@ public class SdServer extends Service implements SdDataReceiver { - } - } - -+ /** -+ * "Use Max Volume for Alerts?" support (#333). Temporarily forces the Alarm stream to its -+ * maximum volume for the duration of one Alarm alert, ignoring both the phone's current -+ * Alarm volume setting and Silent mode. Safe to call repeatedly: if a boost is already in -+ * effect (mSavedAlarmStreamVolume != -1) it is a no-op, so back-to-back alerts don't -+ * overwrite the volume level we need to restore to. -+ * Paired with restoreAlarmStreamVolume(), which puts the phone's Alarm volume back to -+ * whatever it was immediately before this alert - so each alert independently saves and -+ * restores around itself. -+ */ -+ private void boostAlarmStreamVolume() { -+ if (!mUseMaxVolumeForAlerts || mAudioManager == null) return; -+ if (mSavedAlarmStreamVolume == -1) { -+ try { -+ mSavedAlarmStreamVolume = mAudioManager.getStreamVolume(AudioManager.STREAM_ALARM); -+ int maxVolume = mAudioManager.getStreamMaxVolume(AudioManager.STREAM_ALARM); -+ mAudioManager.setStreamVolume(AudioManager.STREAM_ALARM, maxVolume, 0); -+ Log.i(TAG, "boostAlarmStreamVolume() - boosted Alarm stream volume to max (" -+ + maxVolume + "), was " + mSavedAlarmStreamVolume); -+ } catch (SecurityException e) { -+ // Some OEMs refuse volume changes while another app holds DND priority, etc. -+ Log.w(TAG, "boostAlarmStreamVolume() - could not change Alarm stream volume: " -+ + e.getMessage()); -+ mSavedAlarmStreamVolume = -1; -+ } -+ } -+ } -+ -+ /** -+ * Restores the phone's Alarm stream volume to what it was before boostAlarmStreamVolume() -+ * was last called. No-op if no boost is currently in effect. -+ */ -+ private void restoreAlarmStreamVolume() { -+ mHandler.removeCallbacks(mAlarmToneVolumeRestore); -+ if (mAudioManager != null && mSavedAlarmStreamVolume != -1) { -+ try { -+ mAudioManager.setStreamVolume(AudioManager.STREAM_ALARM, mSavedAlarmStreamVolume, 0); -+ Log.i(TAG, "restoreAlarmStreamVolume() - restored Alarm stream volume to " -+ + mSavedAlarmStreamVolume); -+ } catch (SecurityException e) { -+ Log.w(TAG, "restoreAlarmStreamVolume() - could not restore Alarm stream volume: " -+ + e.getMessage()); -+ } -+ } -+ mSavedAlarmStreamVolume = -1; -+ } -+ - /** - * Returns the current phone battery level as a percentage (0–100), - * or -1 if it cannot be determined. -@@ -1690,11 +1757,13 @@ public class SdServer extends Service implements SdDataReceiver { - - /* - * beep, provided mAudibleFaultWarning is set. -- * FaultWarnings always use plain tone beeps on the Notification stream - like Warning, they -- * never play an MP3 file, even if "Use MP3 Alarm Sound" (mMp3Alarm) is enabled for Alarms. -+ * FaultWarnings always use plain tone beeps on mWarningToneGenerator's stream (Alarm by -+ * default, or Notification if the user has unchecked WarningOverrideSilentMode - see -+ * updatePrefs()) - like Warning, they never play an MP3 file, even if "Use MP3 Alarm Sound" -+ * (mMp3Alarm) is enabled for Alarms. - * To stay clearly distinguishable from the single Warning beep (see warningBeep()) without - * relying on a fragile difference in beep duration, FaultWarning plays a short double-beep -- * pattern instead: two 80ms beeps 120ms apart, both on the Notification stream. -+ * pattern instead: two 80ms beeps 120ms apart, both on mWarningToneGenerator's stream. - */ - public void faultWarningBeep() { - if (mCancelAudible || (mSdData != null && mSdData.mMute != 0)) { -@@ -1726,11 +1795,21 @@ public class SdServer extends Service implements SdDataReceiver { - Log.v(TAG, "alarmBeep() - CancelAudible Active - silent beep..."); - } else { - if (mAudibleAlarm) { -+ boostAlarmStreamVolume(); - if (mMp3Alarm) { - Log.i(TAG, "SdServer.alarmBeep() - playing MP3"); -+ // MP3 playback may loop or run long, so its volume restore happens when -+ // playback actually stops (see stopMp3()), not on a fixed timer. -+ mAlarmMp3VolumeBoosted = true; - playMp3(mMp3AlarmUri, "alarm"); - } else { - beep(3000); -+ // The tone is a fixed-length, fire-and-forget beep, so schedule the volume -+ // restore to fire once it finishes. A later alarmBeep() call re-boosts and -+ // re-schedules its own restore, so repeated alerts each save/restore around -+ // themselves independently. -+ mHandler.removeCallbacks(mAlarmToneVolumeRestore); -+ mHandler.postDelayed(mAlarmToneVolumeRestore, 3000); - } - Log.v(TAG, "alarmBeep()"); - Log.i(TAG, "SdServer.alarmBeep() - beeping"); -@@ -1742,9 +1821,10 @@ public class SdServer extends Service implements SdDataReceiver { - - /* - * beep, provided mAudibleWarning is set. -- * Warning always uses the plain tone beep on the Notification stream - it never plays an -- * MP3 file, even if "Use MP3 Alarm Sound" (mMp3Alarm) is enabled for Alarms. This -- * keeps the Warning sound tied to the Android Notification volume in all cases. -+ * Warning always uses the plain tone beep on mWarningToneGenerator's stream (Alarm by -+ * default, or Notification if the user has unchecked WarningOverrideSilentMode - see -+ * updatePrefs()) - it never plays an MP3 file, even if "Use MP3 Alarm Sound" (mMp3Alarm) -+ * is enabled for Alarms. - */ - public void warningBeep() { - if (mCancelAudible) { -@@ -2148,8 +2228,37 @@ public class SdServer extends Service implements SdDataReceiver { - - mAudibleAlarm = SP.getBoolean("AudibleAlarm", true); - Log.d(TAG, "updatePrefs() - mAudibleAlarm = " + mAudibleAlarm); -+ // #333: when enabled, alarmBeep() forces the Alarm stream to full volume for the -+ // duration of each alert, then restores the phone's previous Alarm volume afterwards -+ // - see boostAlarmStreamVolume()/restoreAlarmStreamVolume(). -+ mUseMaxVolumeForAlerts = SP.getBoolean("UseMaxVolumeForAlerts", true); -+ Log.d(TAG, "updatePrefs() - mUseMaxVolumeForAlerts = " + mUseMaxVolumeForAlerts); -+ - mAudibleWarning = SP.getBoolean("AudibleWarning", true); - Log.d(TAG, "updatePrefs() - mAudibleWarning = " + mAudibleWarning); -+ -+ // #333: Warning/FaultWarning beeps play on the Notification stream by default, -+ // which Android silences whenever the phone's ringer mode is set to Silent (the -+ // Alarm stream is deliberately exempt from that muting). "Override Silent Mode for -+ // all Warnings?" (checked by default) routes the shared Warning/FaultWarning tone -+ // generator onto the Alarm stream instead so both stay audible when the phone is -+ // silenced; unchecked keeps them tied to the Notification stream/volume. -+ mWarningOverrideSilentMode = SP.getBoolean("WarningOverrideSilentMode", true); -+ Log.d(TAG, "updatePrefs() - mWarningOverrideSilentMode = " + mWarningOverrideSilentMode); -+ int desiredWarningToneStream = mWarningOverrideSilentMode -+ ? AudioManager.STREAM_ALARM -+ : AudioManager.STREAM_NOTIFICATION; -+ if (desiredWarningToneStream != mWarningToneStream || mWarningToneGenerator == null) { -+ mWarningToneStream = desiredWarningToneStream; -+ if (mWarningToneGenerator != null) { -+ mWarningToneGenerator.release(); -+ } -+ mWarningToneGenerator = new ToneGenerator(mWarningToneStream, 100); -+ Log.i(TAG, "updatePrefs() - Warning/FaultWarning tone generator now using " -+ + (mWarningOverrideSilentMode -+ ? "STREAM_ALARM (silent-mode override enabled)" -+ : "STREAM_NOTIFICATION")); -+ } - mMp3Alarm = SP.getBoolean("UseMp3Alarm", false); - Log.d(TAG, "updatePrefs() - mMp3Alarm = " + mMp3Alarm); - // User-selected MP3 URIs — empty string means "use bundled sound" -diff --git a/app/src/main/java/uk/org/openseizuredetector/activity/settings/PrefActivity.java b/app/src/main/java/uk/org/openseizuredetector/activity/settings/PrefActivity.java -index 8edb756..be4cd93 100644 ---- a/app/src/main/java/uk/org/openseizuredetector/activity/settings/PrefActivity.java -+++ b/app/src/main/java/uk/org/openseizuredetector/activity/settings/PrefActivity.java -@@ -785,6 +785,12 @@ public class PrefActivity extends AppCompatActivity implements SharedPreferences - private static final String KEY_FAULT_URI = "Mp3FaultUri"; - private static final String KEY_USE_MP3 = "UseMp3Alarm"; - -+ // Keys for the two dependent checkboxes added by #333 -+ private static final String KEY_AUDIBLE_ALARM = "AudibleAlarm"; -+ private static final String KEY_USE_MAX_VOLUME = "UseMaxVolumeForAlerts"; -+ private static final String KEY_AUDIBLE_WARNING = "AudibleWarning"; -+ private static final String KEY_WARNING_OVERRIDE_SILENT = "WarningOverrideSilentMode"; -+ - // Request-code constants used with startActivityForResult (legacy path, but we use - // ActivityResultLauncher instead — these are kept as documentation only). - private ActivityResultLauncher mPickerWarning; -@@ -820,6 +826,8 @@ public class PrefActivity extends AppCompatActivity implements SharedPreferences - setPreferencesFromResource(R.xml.alarm_prefs, rootKey); - refreshSoundPickerVisibility(); - refreshSoundSummaries(); -+ refreshAudibleAlarmSubPrefVisibility(); -+ refreshAudibleWarningSubPrefVisibility(); - // Wire click listeners for the three file-picker prefs - // #246: Warning picker disabled - see onAttach() for details. - // wirePickerPref(KEY_WARNING_URI, mPickerWarning); -@@ -846,6 +854,12 @@ public class PrefActivity extends AppCompatActivity implements SharedPreferences - if (KEY_USE_MP3.equals(key)) { - refreshSoundPickerVisibility(); - } -+ if (KEY_AUDIBLE_ALARM.equals(key)) { -+ refreshAudibleAlarmSubPrefVisibility(); -+ } -+ if (KEY_AUDIBLE_WARNING.equals(key)) { -+ refreshAudibleWarningSubPrefVisibility(); -+ } - - // Forward critical changes to parent activity so it can orchestrate a restart - if ("SMSAlarm".equals(key)) { -@@ -858,18 +872,34 @@ public class PrefActivity extends AppCompatActivity implements SharedPreferences - // ----------------------------------------------------------------------------------------- - // Helpers - -+ /** Show/hide "Use Max Volume for Alerts?" based on the AudibleAlarm checkbox. */ -+ private void refreshAudibleAlarmSubPrefVisibility() { -+ SharedPreferences prefs = -+ PreferenceManager.getDefaultSharedPreferences(requireContext()); -+ boolean audibleAlarm = prefs.getBoolean(KEY_AUDIBLE_ALARM, true); -+ setPrefVisible(KEY_USE_MAX_VOLUME, audibleAlarm); -+ } -+ -+ /** Show/hide "Override Silent Mode for all Warnings?" based on the AudibleWarning checkbox. */ -+ private void refreshAudibleWarningSubPrefVisibility() { -+ SharedPreferences prefs = -+ PreferenceManager.getDefaultSharedPreferences(requireContext()); -+ boolean audibleWarning = prefs.getBoolean(KEY_AUDIBLE_WARNING, true); -+ setPrefVisible(KEY_WARNING_OVERRIDE_SILENT, audibleWarning); -+ } -+ - /** Show/hide the three sound-file pickers based on the UseMp3Alarm checkbox. */ - private void refreshSoundPickerVisibility() { - SharedPreferences prefs = - PreferenceManager.getDefaultSharedPreferences(requireContext()); - boolean useMp3 = prefs.getBoolean(KEY_USE_MP3, false); - // #246: Warning picker disabled - see onAttach() for details. -- // setPickerVisible(KEY_WARNING_URI, useMp3); -- setPickerVisible(KEY_ALARM_URI, useMp3); -- setPickerVisible(KEY_FAULT_URI, useMp3); -+ // setPrefVisible(KEY_WARNING_URI, useMp3); -+ setPrefVisible(KEY_ALARM_URI, useMp3); -+ setPrefVisible(KEY_FAULT_URI, useMp3); - } - -- private void setPickerVisible(String key, boolean visible) { -+ private void setPrefVisible(String key, boolean visible) { - Preference p = findPreference(key); - if (p != null) p.setVisible(visible); - } -diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml -index 9a81dd6..9b0e66d 100644 ---- a/app/src/main/res/values/strings.xml -+++ b/app/src/main/res/values/strings.xml -@@ -219,6 +219,10 @@ - Enable Audible Warnings - Issue an audible alarm if the system detects a fault (e.g. can not talk to watch). - Enable Audible System FaultWarnings -+ Alarms always play at the maximum possible volume, regardless of the Android Alarm volume setting. -+ Use Max Volume for Alerts? -+ If checked, Warnings will play like Alarms. When unchecked, they play like Notifications and will be muted in Silent mode. -+ Override Silent Mode for all Warnings? - Fault Timer Duration (sec) - Duration that fault alarms are muted before initiating. - Enable Data Sample Frequency Checks -diff --git a/app/src/main/res/xml/alarm_prefs.xml b/app/src/main/res/xml/alarm_prefs.xml -index df375c9..cff9c30 100644 ---- a/app/src/main/res/xml/alarm_prefs.xml -+++ b/app/src/main/res/xml/alarm_prefs.xml -@@ -6,11 +6,24 @@ - android:key="AudibleAlarm" - android:summary="@string/enable_audible_alarm_summary" - android:title="@string/enable_audible_alarm_title" /> -+ -+ - -+ -+ - '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum -warn ( ) { +warn () { echo "$*" -} +} >&2 -die ( ) { +die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -82,83 +131,118 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index aec99730..8508ef68 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,90 +1,82 @@ -@if "%DEBUG%" == "" @echo off +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants +if exist "%JAVA_EXE%" goto execute -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 -:mainEnd -if "%OS%"=="Windows_NT" endlocal +@rem Execute gradlew +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -:omega +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL%