Mercurial > 510Connectbot

diff app/src/main/java/com/five_ten_sg/connectbot/service/TerminalManager.java @ 470:2cc170e3fc9b stable-1.9.3-8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
audible bell checkbox enables/disables bell volume setting; monitor init string is now a url socket://target/initstring
author Carl Byington <carl@five-ten-sg.com>
date Fri, 04 Oct 2019 16:44:44 -0700
parents d29cce60f393
children f698820bffdf
line wrap: on
line diff
--- a/app/src/main/java/com/five_ten_sg/connectbot/service/TerminalManager.java	Thu Sep 12 16:08:16 2019 -0700
+++ b/app/src/main/java/com/five_ten_sg/connectbot/service/TerminalManager.java	Fri Oct 04 16:44:44 2019 -0700
@@ -106,6 +106,7 @@
     private volatile boolean wantKeyVibration;
     public static final long VIBRATE_DURATION = 30;
 
+    private boolean wantBell;
     private boolean wantBellVibration;
 
     private boolean resizeAllowed = true;
@@ -146,8 +147,9 @@
 
         vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
         wantKeyVibration = prefs.getBoolean(PreferenceConstants.BUMPY_ARROWS, true);
+        wantBell          = prefs.getBoolean(PreferenceConstants.BELL, true);
         wantBellVibration = prefs.getBoolean(PreferenceConstants.BELL_VIBRATE, true);
-        enableMediaPlayer();
+        if (wantBell) enableMediaPlayer();
         hardKeyboardHidden = (res.getConfiguration().hardKeyboardHidden ==
                               Configuration.HARDKEYBOARDHIDDEN_YES);
         final boolean lockingWifi = prefs.getBoolean(PreferenceConstants.WIFI_LOCK, true);
@@ -602,12 +604,11 @@
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
                                           String key) {
         if (PreferenceConstants.BELL.equals(key)) {
-            boolean wantAudible = sharedPreferences.getBoolean(
-                                      PreferenceConstants.BELL, true);
+            wantBell = sharedPreferences.getBoolean(PreferenceConstants.BELL, true);
 
-            if (wantAudible && mediaPlayer == null)
+            if (wantBell && mediaPlayer == null)
                 enableMediaPlayer();
-            else if (!wantAudible && mediaPlayer != null)
+            else if (!wantBell && mediaPlayer != null)
                 disableMediaPlayer();
         }
         else if (PreferenceConstants.BELL_VOLUME.equals(key)) {