fenix/Simple-Dialer
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Dialer.git synced 2025-03-20 13:20:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make sure dialpad tone length is at least >150ms

Browse Source
This commit is contained in:
Naveen 2022-09-19 00:42:58 +05:30
parent 46cc66466b
commit f5b88a9ee5
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt
View File

@ -24,6 +24,7 @@ import com.simplemobiletools.commons.models.SimpleContact
import com.simplemobiletools.dialer.R import com.simplemobiletools.dialer.R
import com.simplemobiletools.dialer.adapters.ContactsAdapter import com.simplemobiletools.dialer.adapters.ContactsAdapter
import com.simplemobiletools.dialer.extensions.* import com.simplemobiletools.dialer.extensions.*
import com.simplemobiletools.dialer.helpers.DIALPAD_TONE_LENGTH_MS
import com.simplemobiletools.dialer.helpers.ToneGeneratorHelper import com.simplemobiletools.dialer.helpers.ToneGeneratorHelper
import com.simplemobiletools.dialer.models.SpeedDial import com.simplemobiletools.dialer.models.SpeedDial
import kotlinx.android.synthetic.main.activity_dialpad.* import kotlinx.android.synthetic.main.activity_dialpad.*
@ -55,9 +56,9 @@ class DialpadActivity : SimpleActivity() {
setupOptionsMenu() setupOptionsMenu()
speedDialValues = config.getSpeedDialValues() speedDialValues = config.getSpeedDialValues()
privateCursor = getMyContactsCursor(false, true) privateCursor = getMyContactsCursor(favoritesOnly = false, withPhoneNumbersOnly = true)
toneGeneratorHelper = ToneGeneratorHelper(this) toneGeneratorHelper = ToneGeneratorHelper(this, DIALPAD_TONE_LENGTH_MS)
if (hasRussianLocale) { if (hasRussianLocale) {
initRussianChars() initRussianChars()

17
app/src/main/kotlin/com/simplemobiletools/dialer/helpers/ToneGeneratorHelper.kt
View File

@ -4,16 +4,20 @@ import android.content.Context
import android.media.AudioManager import android.media.AudioManager
import android.media.AudioManager.STREAM_DTMF import android.media.AudioManager.STREAM_DTMF
import android.media.ToneGenerator import android.media.ToneGenerator
import android.os.Handler
import android.os.Looper
class ToneGeneratorHelper(context: Context) { class ToneGeneratorHelper(context: Context, private val minToneLengthMs: Long) {
private val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager private val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
private val toneGenerator = ToneGenerator(DIAL_TONE_STREAM_TYPE, TONE_RELATIVE_VOLUME) private val toneGenerator = ToneGenerator(DIAL_TONE_STREAM_TYPE, TONE_RELATIVE_VOLUME)
private var toneStartTimeMs = 0L
private fun isSilent(): Boolean { private fun isSilent(): Boolean {
return audioManager.ringerMode in arrayOf(AudioManager.RINGER_MODE_SILENT, AudioManager.RINGER_MODE_VIBRATE) return audioManager.ringerMode in arrayOf(AudioManager.RINGER_MODE_SILENT, AudioManager.RINGER_MODE_VIBRATE)
} }
fun startTone(char: Char) { fun startTone(char: Char) {
toneStartTimeMs = System.currentTimeMillis()
startTone(charToTone[char] ?: -1) startTone(charToTone[char] ?: -1)
} }
@ -23,7 +27,16 @@ class ToneGeneratorHelper(context: Context) {
} }
} }
fun stopTone() = toneGenerator.stopTone() fun stopTone() {
val timeSinceStartMs = System.currentTimeMillis() - toneStartTimeMs
if (timeSinceStartMs < minToneLengthMs) {
Handler(Looper.getMainLooper()).postDelayed({
toneGenerator.stopTone()
}, minToneLengthMs - timeSinceStartMs)
} else {
toneGenerator.stopTone()
}
}
companion object { companion object {
const val TONE_RELATIVE_VOLUME = 80 // The DTMF tone volume relative to other sounds in the stream const val TONE_RELATIVE_VOLUME = 80 // The DTMF tone volume relative to other sounds in the stream