Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7073a64 authored by Shuang Hao's avatar Shuang Hao Committed by Android (Google) Code Review
Browse files

Merge "Introduce Hilt to replace manual dependency injection." into main

parents 092aeff1 50fdb1a0

packages/CredentialManager/shared/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -16,5 +16,6 @@ android_library { 
        "androidx.core_core-ktx",

        "androidx.credentials_credentials",

        "guava",

        "hilt_android",

    ],

}

packages/CredentialManager/shared/src/com/android/credentialmanager/repository/PasswordRepository.kt

+4 −1
Original line number Diff line number Diff line
@@ -25,8 +25,11 @@ import android.util.Log 
import com.android.credentialmanager.TAG

import com.android.credentialmanager.model.Password

import com.android.credentialmanager.model.Request

import javax.inject.Inject

import javax.inject.Singleton



class PasswordRepository {

@Singleton

class PasswordRepository @Inject constructor() {



    suspend fun selectPassword(

        password: Password,

packages/CredentialManager/shared/src/com/android/credentialmanager/repository/RequestRepository.kt

+7 −4
Original line number Diff line number Diff line
@@ -16,17 +16,20 @@ 


package com.android.credentialmanager.repository



import android.app.Application

import android.content.Intent

import android.content.pm.PackageManager

import android.util.Log

import com.android.credentialmanager.TAG

import com.android.credentialmanager.model.Request

import com.android.credentialmanager.parse

import kotlinx.coroutines.flow.MutableStateFlow

import kotlinx.coroutines.flow.StateFlow

import javax.inject.Inject

import javax.inject.Singleton



class RequestRepository(

    private val application: Application,

@Singleton

class RequestRepository @Inject constructor(

        private val packageManager: PackageManager,

) {



    private val _requests = MutableStateFlow<Request?>(null)
@@ -34,7 +37,7 @@ class RequestRepository( 


    suspend fun processRequest(intent: Intent, previousIntent: Intent? = null) {

        val request = intent.parse(

            packageManager = application.packageManager,

            packageManager = packageManager,

            previousIntent = previousIntent

        )

packages/CredentialManager/wear/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ android_app { 


    static_libs: [

        "CredentialManagerShared",

        "hilt_android",

        "Horologist",

        "PlatformComposeCore",

        "androidx.activity_activity-compose",

packages/CredentialManager/wear/src/com/android/credentialmanager/CredentialSelectorActivity.kt

+4 −4
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ import com.android.credentialmanager.ui.WearApp 
import com.android.credentialmanager.ui.screens.single.password.SinglePasswordScreen

import com.google.android.horologist.annotations.ExperimentalHorologistApi

import com.google.android.horologist.compose.layout.belowTimeTextPreview

import dagger.hilt.android.AndroidEntryPoint

import kotlinx.coroutines.launch



class CredentialSelectorActivity : ComponentActivity() {

@AndroidEntryPoint(ComponentActivity::class)

class CredentialSelectorActivity : Hilt_CredentialSelectorActivity() {



    private val viewModel: CredentialSelectorViewModel by viewModels {

        CredentialSelectorViewModel.Factory

    }

    private val viewModel: CredentialSelectorViewModel by viewModels()



    @OptIn(ExperimentalHorologistApi::class)

    override fun onCreate(savedInstanceState: Bundle?) {