Skip to content

Commit 28bd5ed

Browse files
committed
fix: fix allow lower logic
1 parent 9c85bdd commit 28bd5ed

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

app/src/main/java/com/klee/volumelockr/service/VolumeService.kt

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ class VolumeService : Service() {
7676
private var mMode: Int = 2
7777
private var mTimer: Timer? = null
7878
private var mAllowLower = false
79+
private var mAllowLowerListener: (() -> Unit)? = null
7980

8081
override fun onCreate() {
8182
super.onCreate()
@@ -85,8 +86,6 @@ class VolumeService : Service() {
8586

8687
loadPreferences()
8788

88-
mMode = Settings.Global.getInt(contentResolver, MODE_RINGER_SETTING)
89-
9089
registerObservers()
9190

9291
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -98,6 +97,8 @@ class VolumeService : Service() {
9897
val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
9998
mAllowLower = sharedPreferences.getBoolean(ALLOW_LOWER_PREFERENCE, false)
10099

100+
mMode = Settings.Global.getInt(contentResolver, MODE_RINGER_SETTING)
101+
101102
return START_STICKY
102103
}
103104

@@ -144,6 +145,14 @@ class VolumeService : Service() {
144145
mModeListener = null
145146
}
146147

148+
fun registerOnAllowLowerChangeListener(listener: () -> Unit) {
149+
mAllowLowerListener = listener
150+
}
151+
152+
fun unregisterOnAllowLowerChangeListener() {
153+
mAllowLowerListener = null
154+
}
155+
147156
@Synchronized
148157
fun addLock(stream: Int, volume: Int) {
149158
mVolumeLock[stream] = volume

app/src/main/java/com/klee/volumelockr/ui/VolumeSliderFragment.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,17 @@ class VolumeSliderFragment : Fragment() {
107107
mService?.registerOnModeChangeListener {
108108
mAdapter?.update()
109109
}
110+
111+
mService?.registerOnAllowLowerChangeListener {
112+
mAdapter?.update()
113+
}
110114
}
111115
}
112116

113117
private fun unbindServiceIfNeeded() {
114118
mService?.unregisterOnModeChangeListener()
115119
mService?.unregisterOnVolumeChangeListener()
120+
mService?.unregisterOnAllowLowerChangeListener()
116121

117122
if (isServiceBound) {
118123
context?.let {

0 commit comments

Comments
 (0)