jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More cleanup on @Inject members

This commit is contained in:
Benoit Marty 2022-09-23 16:25:48 +02:00 committed by Benoit Marty
parent b3068c017d
commit aa806ed2c6
4 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vector-app/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
View File

@ -58,8 +58,7 @@ class DebugMenuActivity : VectorBaseActivity<ActivityDebugMenuBinding>() {
override fun getBinding() = ActivityDebugMenuBinding.inflate(layoutInflater) override fun getBinding() = ActivityDebugMenuBinding.inflate(layoutInflater)
@Inject @Inject lateinit var clock: Clock
lateinit var clock: Clock
private lateinit var buffer: ByteArray private lateinit var buffer: ByteArray

3
vector/src/main/java/im/vector/app/features/home/room/threads/ThreadsActivity.kt
View File

@ -40,8 +40,7 @@ import javax.inject.Inject
@AndroidEntryPoint @AndroidEntryPoint
class ThreadsActivity : VectorBaseActivity<ActivityThreadsBinding>() { class ThreadsActivity : VectorBaseActivity<ActivityThreadsBinding>() {
@Inject @Inject lateinit var avatarRenderer: AvatarRenderer
lateinit var avatarRenderer: AvatarRenderer
// private val roomThreadDetailFragment: RoomThreadDetailFragment? // private val roomThreadDetailFragment: RoomThreadDetailFragment?
// get() { // get() {

13
vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
View File

@ -69,14 +69,9 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), AttachmentInt
val sharedTransitionName: String? val sharedTransitionName: String?
) : Parcelable ) : Parcelable
@Inject @Inject lateinit var activeSessionHolder: ActiveSessionHolder
lateinit var sessionHolder: ActiveSessionHolder @Inject lateinit var dataSourceFactory: AttachmentProviderFactory
@Inject lateinit var imageContentRenderer: ImageContentRenderer
@Inject
lateinit var dataSourceFactory: AttachmentProviderFactory
@Inject
lateinit var imageContentRenderer: ImageContentRenderer
private val viewModel: VectorAttachmentViewerViewModel by viewModel() private val viewModel: VectorAttachmentViewerViewModel by viewModel()
private val errorFormatter by lazy(LazyThreadSafetyMode.NONE) { singletonEntryPoint().errorFormatter() } private val errorFormatter by lazy(LazyThreadSafetyMode.NONE) { singletonEntryPoint().errorFormatter() }
@ -128,7 +123,7 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), AttachmentInt
} }
} }
val session = sessionHolder.getSafeActiveSession() ?: return Unit.also { finish() } val session = activeSessionHolder.getSafeActiveSession() ?: return Unit.also { finish() }
val room = args.roomId?.let { session.getRoom(it) } val room = args.roomId?.let { session.getRoom(it) }

3
vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
View File

@ -69,8 +69,7 @@ class RoomProfileActivity :
private val requireActiveMembershipViewModel: RequireActiveMembershipViewModel by viewModel() private val requireActiveMembershipViewModel: RequireActiveMembershipViewModel by viewModel()
@Inject @Inject lateinit var roomDetailPendingActionStore: RoomDetailPendingActionStore
lateinit var roomDetailPendingActionStore: RoomDetailPendingActionStore
override fun getBinding(): ActivitySimpleBinding { override fun getBinding(): ActivitySimpleBinding {
return ActivitySimpleBinding.inflate(layoutInflater) return ActivitySimpleBinding.inflate(layoutInflater)