Merge pull request #23 from legalimpurity/master

BaseViewModel holds hard reference to Navigators which can lead to le…
janishar · May 22, 2018 · 432ffbc · 432ffbc
2 parents ff6c0d5 + 65fbe8f
commit 432ffbc
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/app/src/main/java/com/mindorks/framework/mvvm/ui/base/BaseViewModel.java b/app/src/main/java/com/mindorks/framework/mvvm/ui/base/BaseViewModel.java
@@ -22,6 +22,8 @@
 import com.mindorks.framework.mvvm.data.DataManager;
 import com.mindorks.framework.mvvm.utils.rx.SchedulerProvider;
 
+import java.lang.ref.WeakReference;
+
 import io.reactivex.disposables.CompositeDisposable;
 
 /**
@@ -38,7 +40,7 @@ public abstract class BaseViewModel<N> extends ViewModel {
 
     private CompositeDisposable mCompositeDisposable;
 
-    private N mNavigator;
+    private WeakReference<N> mNavigator;
 
     public BaseViewModel(DataManager dataManager,
                          SchedulerProvider schedulerProvider) {
@@ -70,11 +72,11 @@ public void setIsLoading(boolean isLoading) {
     }
 
     public N getNavigator() {
-        return mNavigator;
+        return mNavigator.get();
     }
 
     public void setNavigator(N navigator) {
-        this.mNavigator = navigator;
+        this.mNavigator = new WeakReference<>(navigator);
     }
 
     public SchedulerProvider getSchedulerProvider() {