Skip to content

Fix memory leak in ViewComponentManager #5189

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

Open
copybara-service wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix memory leak in ViewComponentManager #5189

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 20 additions & 1 deletion hilt-android/main/java/dagger/hilt/android/internal/managers/ViewComponentManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package dagger.hilt.android.internal.managers;

import dagger.hilt.android.components.ActivityComponent;
import android.content.Context;
import android.content.ContextWrapper;
import androidx.fragment.app.Fragment;
Expand All @@ -34,6 +33,7 @@
import dagger.hilt.android.internal.builders.ViewWithFragmentComponentBuilder;
import dagger.hilt.internal.GeneratedComponentManager;
import dagger.hilt.internal.Preconditions;
import java.lang.ref.WeakReference;

/**
* Do not use except in Hilt generated code!
Expand Down Expand Up @@ -86,6 +86,24 @@ public Object generatedComponent() {
private Object createComponent() {
Object componentManager = getParentComponentManager(/* allowMissing= */ false);
if (hasFragmentBindings) {
if (componentManager instanceof Fragment) {
final WeakReference<ViewComponentManager> managerRef = new WeakReference<>(this);
((Fragment) componentManager)
.getLifecycle()
.addObserver(
new LifecycleEventObserver() {
@Override
public void onStateChanged(LifecycleOwner source, Lifecycle.Event event) {
if (event == Lifecycle.Event.ON_DESTROY) {
ViewComponentManager manager = managerRef.get();
if (manager != null) {
manager.component = null;
}
source.getLifecycle().removeObserver(this);
}
}
});
}
return EntryPoints.get(componentManager, ViewWithFragmentComponentBuilderEntryPoint.class)
.viewWithFragmentComponentBuilder()
.view(view)
Expand Down Expand Up @@ -183,6 +201,7 @@ public void onStateChanged(LifecycleOwner source, Lifecycle.Event event) {
FragmentContextWrapper.this.fragment = null;
FragmentContextWrapper.this.baseInflater = null;
FragmentContextWrapper.this.inflater = null;
source.getLifecycle().removeObserver(this);
}
}
};
Expand Down
Loading