From 3a36b266861b5a5cc41ac157ee9b5b70fa7a193f Mon Sep 17 00:00:00 2001 From: Jean-Luc Makiola Date: Fri, 13 Nov 2026 17:35:11 +0100 Subject: [PATCH] refactor: in-call check from floret-kit's ring module (calendula#171) --- .../clockula/ring/ForegroundRingScreen.kt | 11 ++--------- floret-kit | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/de/jeanlucmakiola/clockula/ring/ForegroundRingScreen.kt b/app/src/main/java/de/jeanlucmakiola/clockula/ring/ForegroundRingScreen.kt index 6ea5202..73e2f1a 100644 --- a/app/src/main/java/de/jeanlucmakiola/clockula/ring/ForegroundRingScreen.kt +++ b/app/src/main/java/de/jeanlucmakiola/clockula/ring/ForegroundRingScreen.kt @@ -5,12 +5,12 @@ import android.app.Application import android.app.KeyguardManager import android.content.Context import android.content.Intent -import android.media.AudioManager import android.os.Bundle import android.os.PowerManager import android.provider.Settings import de.jeanlucmakiola.clockula.domain.alarm.DirectLaunchFacts import de.jeanlucmakiola.clockula.domain.alarm.DirectLaunchPolicy +import de.jeanlucmakiola.floret.ring.isInCall /** * Opens a ring screen directly where a full-screen intent would only show a @@ -66,7 +66,7 @@ object ForegroundRingScreen { screenShowing = screenShowing, overOtherApps = overOtherApps, canDrawOverlays = Settings.canDrawOverlays(context), - inCall = inCall(context), + inCall = context.isInCall(), ) if (!DirectLaunchPolicy.opensDirectly(facts)) return // A refused start costs nothing: the notification is up either way. @@ -80,11 +80,4 @@ object ForegroundRingScreen { private fun phoneInUse(context: Context): Boolean = context.getSystemService(PowerManager::class.java).isInteractive && !context.getSystemService(KeyguardManager::class.java).isKeyguardLocked - - /** The audio mode, which needs no phone permission, unlike the telecom APIs. */ - private fun inCall(context: Context): Boolean = - when (context.getSystemService(AudioManager::class.java).mode) { - AudioManager.MODE_IN_CALL, AudioManager.MODE_IN_COMMUNICATION, AudioManager.MODE_RINGTONE -> true - else -> false - } } diff --git a/floret-kit b/floret-kit index b1401bc..7a5b81e 160000 --- a/floret-kit +++ b/floret-kit @@ -1 +1 @@ -Subproject commit b1401bcf6a76f675bf1b53bb4da5b1be8971757e +Subproject commit 7a5b81e88a24910b80dc21c4ef16cc2c94282a5f