mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-11-24 18:36:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

PM-13425: Auto-navigate to Login Approval screen when app is foregrounded

Browse source
This commit is contained in:
David Perez 2024-11-20 17:16:23 -06:00
parent 96bd25eae5
commit e41c0b6f53
No known key found for this signature in database
GPG key ID: 3E29BD8B1BF090AC
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestNotificationManagerImpl.kt
View file

@ -3,6 +3,7 @@ package com.x8bit.bitwarden.data.auth.manager
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.app.PendingIntent import android.app.PendingIntent
import android.content.Context import android.content.Context
import android.content.Intent
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.core.app.NotificationChannelCompat import androidx.core.app.NotificationChannelCompat
import androidx.core.app.NotificationCompat import androidx.core.app.NotificationCompat
@ -12,8 +13,10 @@ import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource
import com.x8bit.bitwarden.data.auth.util.createPasswordlessRequestDataIntent import com.x8bit.bitwarden.data.auth.util.createPasswordlessRequestDataIntent
import com.x8bit.bitwarden.data.autofill.util.toPendingIntentMutabilityFlag import com.x8bit.bitwarden.data.autofill.util.toPendingIntentMutabilityFlag
import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage
import com.x8bit.bitwarden.data.platform.manager.AppStateManager
import com.x8bit.bitwarden.data.platform.manager.PushManager import com.x8bit.bitwarden.data.platform.manager.PushManager
import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager
import com.x8bit.bitwarden.data.platform.manager.model.AppForegroundState
import com.x8bit.bitwarden.data.platform.manager.model.PasswordlessRequestData import com.x8bit.bitwarden.data.platform.manager.model.PasswordlessRequestData
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.launchIn
@ -26,6 +29,7 @@ import kotlinx.coroutines.flow.onEach
class AuthRequestNotificationManagerImpl( class AuthRequestNotificationManagerImpl(
private val context: Context, private val context: Context,
private val authDiskSource: AuthDiskSource, private val authDiskSource: AuthDiskSource,
private val appStateManager: AppStateManager,
pushManager: PushManager, pushManager: PushManager,
dispatcherManager: DispatcherManager, dispatcherManager: DispatcherManager,
) : AuthRequestNotificationManager { ) : AuthRequestNotificationManager {
@ -40,6 +44,14 @@ class AuthRequestNotificationManagerImpl(
@SuppressLint("MissingPermission") @SuppressLint("MissingPermission")
private fun handlePasswordlessRequestData(data: PasswordlessRequestData) { private fun handlePasswordlessRequestData(data: PasswordlessRequestData) {
if (appStateManager.appForegroundStateFlow.value == AppForegroundState.FOREGROUNDED &&
data.userId == authDiskSource.userState?.activeUserId
) {
context.startActivity(
createPasswordlessRequestDataIntent(context, data)
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK),
)
}
val notificationManager = NotificationManagerCompat.from(context) val notificationManager = NotificationManagerCompat.from(context)
// Construct the channel, calling this more than once is safe // Construct the channel, calling this more than once is safe
notificationManager.createNotificationChannel( notificationManager.createNotificationChannel(

3
app/src/main/java/com/x8bit/bitwarden/data/auth/manager/di/AuthManagerModule.kt
View file

@ -21,6 +21,7 @@ import com.x8bit.bitwarden.data.auth.manager.UserLogoutManager
import com.x8bit.bitwarden.data.auth.manager.UserLogoutManagerImpl import com.x8bit.bitwarden.data.auth.manager.UserLogoutManagerImpl
import com.x8bit.bitwarden.data.platform.datasource.disk.PushDiskSource import com.x8bit.bitwarden.data.platform.datasource.disk.PushDiskSource
import com.x8bit.bitwarden.data.platform.datasource.disk.SettingsDiskSource import com.x8bit.bitwarden.data.platform.datasource.disk.SettingsDiskSource
import com.x8bit.bitwarden.data.platform.manager.AppStateManager
import com.x8bit.bitwarden.data.platform.manager.PushManager import com.x8bit.bitwarden.data.platform.manager.PushManager
import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager
import com.x8bit.bitwarden.data.tools.generator.datasource.disk.GeneratorDiskSource import com.x8bit.bitwarden.data.tools.generator.datasource.disk.GeneratorDiskSource
@ -47,12 +48,14 @@ object AuthManagerModule {
fun provideAuthRequestNotificationManager( fun provideAuthRequestNotificationManager(
@ApplicationContext context: Context, @ApplicationContext context: Context,
authDiskSource: AuthDiskSource, authDiskSource: AuthDiskSource,
appStateManager: AppStateManager,
pushManager: PushManager, pushManager: PushManager,
dispatcherManager: DispatcherManager, dispatcherManager: DispatcherManager,
): AuthRequestNotificationManager = ): AuthRequestNotificationManager =
AuthRequestNotificationManagerImpl( AuthRequestNotificationManagerImpl(
context = context, context = context,
authDiskSource = authDiskSource, authDiskSource = authDiskSource,
appStateManager = appStateManager,
pushManager = pushManager, pushManager = pushManager,
dispatcherManager = dispatcherManager, dispatcherManager = dispatcherManager,
) )