Skip to content

Fix volume shortcut with stale preferred flashlight levels #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cyb3rko merged 2 commits into from
Aug 11, 2026
Merged

Fix volume shortcut with stale preferred flashlight levels #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a7cfcf
Clamp stale preferred flashlight levels
isaacweber613 Aug 2, 2026
0d0ee14
Keep level validation in camera handling
isaacweber613 Aug 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions app/src/main/kotlin/com/cyb3rko/flashdim/Camera.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,30 @@ internal class Camera(activity: AppCompatActivity) {
fun doesDeviceHaveFlash(packageManager: PackageManager): Boolean =
packageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA_FLASH)

fun getValidFlashLevel(
cameraManager: CameraManager,
cameraId: String,
requestedLevel: Int
): Int {
if (requestedLevel < 1) return -1

val maxLevel = cameraManager.getCameraCharacteristics(cameraId)
.get(CameraCharacteristics.FLASH_INFO_STRENGTH_MAXIMUM_LEVEL)
?: return -1
return requestedLevel.coerceAtMost(maxLevel)
}

fun sendLightLevel(context: Context, level: Int, activate: Boolean) {
try {
val cameraManager = context.getSystemService(Context.CAMERA_SERVICE)
as CameraManager
val cameraId = cameraManager.cameraIdList[0]
if (activate) {
if (level == -1) {
val validLevel = getValidFlashLevel(cameraManager, cameraId, level)
if (validLevel == -1) {
cameraManager.setTorchMode(cameraId, true)
} else {
cameraManager.turnOnTorchWithStrengthLevel(cameraId, level)
cameraManager.turnOnTorchWithStrengthLevel(cameraId, validLevel)
}
} else {
cameraManager.setTorchMode(cameraId, false)
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/kotlin/com/cyb3rko/flashdim/activities/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ class MainActivity : AppCompatActivity() {
maxLevel = camera.maxLevel
Safe.initialize(this)
Safe.writeInt(Safe.MAX_LEVEL, maxLevel)
if (Safe.getInt(Safe.PREFERRED_LEVEL, -1) == -1) {
val preferredLevel = Safe.getInt(Safe.PREFERRED_LEVEL, -1)
if (maxLevel > 0 && preferredLevel !in 1..maxLevel) {
Safe.writeInt(Safe.PREFERRED_LEVEL, maxLevel)
}

Expand Down
11 changes: 7 additions & 4 deletions app/src/main/kotlin/com/cyb3rko/flashdim/quicksettings/SettingsTile.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import android.os.Looper
import android.service.quicksettings.Tile
import android.service.quicksettings.TileService
import android.util.Log
import com.cyb3rko.flashdim.Camera
import com.cyb3rko.flashdim.handleFlashlightException
import com.cyb3rko.flashdim.utils.Safe

Expand Down Expand Up @@ -192,14 +193,16 @@ class SettingsTile : TileService() {
}

private fun sendFlashlightSignal(cameraManager: CameraManager, level: Int, activate: Boolean) {
val cameraId = cameraManager.cameraIdList[0]
if (activate) {
if (level == -1) {
cameraManager.setTorchMode(cameraManager.cameraIdList[0], true)
val validLevel = Camera.getValidFlashLevel(cameraManager, cameraId, level)
if (validLevel == -1) {
cameraManager.setTorchMode(cameraId, true)
} else {
cameraManager.turnOnTorchWithStrengthLevel(cameraManager.cameraIdList[0], level)
cameraManager.turnOnTorchWithStrengthLevel(cameraId, validLevel)
}
} else {
cameraManager.setTorchMode(cameraManager.cameraIdList[0], false)
cameraManager.setTorchMode(cameraId, false)
}
}

Expand Down