Fix memory leak

nntuyen · Mar 10, 2017 · 3037163 · 3037163
1 parent fe5a375
commit 3037163
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 12 deletions.
diff --git a/app/src/main/java/com/tuyenmonkey/sample/MainActivity.java b/app/src/main/java/com/tuyenmonkey/sample/MainActivity.java
@@ -15,7 +15,6 @@ public class MainActivity extends AppCompatActivity {
     btOpen.setOnClickListener(new View.OnClickListener() {
       @Override public void onClick(View v) {
         startActivity(TestActivity.getCallingIntent(MainActivity.this));
-        finish();
       }
     });
   }

diff --git a/library/src/main/java/com/tuyenmonkey/mkloader/MKLoader.java b/library/src/main/java/com/tuyenmonkey/mkloader/MKLoader.java
@@ -65,4 +65,11 @@ private void initialize(Context context, AttributeSet attrs, int defStyleAttr) {
   @Override public void reDraw() {
     invalidate();
   }
+
+  @Override protected void onDetachedFromWindow() {
+    super.onDetachedFromWindow();
+    if (loaderView != null) {
+      loaderView.onDetach();
+    }
+  }
 }
diff --git a/library/src/main/java/com/tuyenmonkey/mkloader/type/ClassicSpinner.java b/library/src/main/java/com/tuyenmonkey/mkloader/type/ClassicSpinner.java
@@ -41,7 +41,9 @@ public ClassicSpinner() {
       fadeAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
         @Override public void onAnimationUpdate(ValueAnimator animation) {
           circles[index].setAlpha((int)animation.getAnimatedValue());
-          invalidateListener.reDraw();
+          if (invalidateListener != null) {
+            invalidateListener.reDraw();
+          }
         }
       });
 

diff --git a/library/src/main/java/com/tuyenmonkey/mkloader/type/FishSpinner.java b/library/src/main/java/com/tuyenmonkey/mkloader/type/FishSpinner.java
@@ -42,7 +42,9 @@ public FishSpinner() {
       fadeAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
         @Override public void onAnimationUpdate(ValueAnimator animation) {
           rotates[index] = (float)animation.getAnimatedValue();
-          invalidateListener.reDraw();
+          if (invalidateListener != null) {
+            invalidateListener.reDraw();
+          }
         }
       });
 

diff --git a/library/src/main/java/com/tuyenmonkey/mkloader/type/LineSpinner.java b/library/src/main/java/com/tuyenmonkey/mkloader/type/LineSpinner.java
@@ -43,7 +43,9 @@ public LineSpinner() {
       fadeAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
         @Override public void onAnimationUpdate(ValueAnimator animation) {
           lines[index].setAlpha((int)animation.getAnimatedValue());
-          invalidateListener.reDraw();
+          if (invalidateListener != null) {
+            invalidateListener.reDraw();
+          }
         }
       });
 

diff --git a/library/src/main/java/com/tuyenmonkey/mkloader/type/LoaderView.java b/library/src/main/java/com/tuyenmonkey/mkloader/type/LoaderView.java
@@ -47,4 +47,10 @@ public int getDesiredHeight() {
   public abstract void setUpAnimation();
 
   public abstract void draw(Canvas canvas);
+
+  public void onDetach() {
+    if (invalidateListener != null) {
+      invalidateListener = null;
+    }
+  }
 }
diff --git a/library/src/main/java/com/tuyenmonkey/mkloader/type/PhoneWave.java b/library/src/main/java/com/tuyenmonkey/mkloader/type/PhoneWave.java
@@ -46,7 +46,9 @@ public PhoneWave() {
       fadeAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
         @Override public void onAnimationUpdate(ValueAnimator animation) {
           arcs[index].setAlpha((int)animation.getAnimatedValue());
-          invalidateListener.reDraw();
+          if (invalidateListener != null) {
+            invalidateListener.reDraw();
+          }
         }
       });
 

diff --git a/library/src/main/java/com/tuyenmonkey/mkloader/type/Pulse.java b/library/src/main/java/com/tuyenmonkey/mkloader/type/Pulse.java
@@ -50,7 +50,9 @@ public Pulse(int numberOfLines) throws InvalidNumberOfPulseException {
       scaleAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
         @Override public void onAnimationUpdate(ValueAnimator animation) {
           scaleY[index] = (float)animation.getAnimatedValue();
-          invalidateListener.reDraw();
+          if (invalidateListener != null) {
+            invalidateListener.reDraw();
+          }
         }
       });
 

diff --git a/library/src/main/java/com/tuyenmonkey/mkloader/type/Radar.java b/library/src/main/java/com/tuyenmonkey/mkloader/type/Radar.java
@@ -29,7 +29,9 @@ public class Radar extends LoaderView {
     animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
       @Override public void onAnimationUpdate(ValueAnimator animation) {
         degree = (float)animation.getAnimatedValue();
-        invalidateListener.reDraw();
+        if (invalidateListener != null) {
+          invalidateListener.reDraw();
+        }
       }
     });
 

diff --git a/library/src/main/java/com/tuyenmonkey/mkloader/type/Sharingan.java b/library/src/main/java/com/tuyenmonkey/mkloader/type/Sharingan.java
@@ -56,7 +56,9 @@ public Sharingan() {
     rotateAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
       @Override public void onAnimationUpdate(ValueAnimator animation) {
         rotate = (float)animation.getAnimatedValue();
-        invalidateListener.reDraw();
+        if (invalidateListener != null) {
+          invalidateListener.reDraw();
+        }
       }
     });
 
@@ -66,7 +68,9 @@ public Sharingan() {
     scaleAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
       @Override public void onAnimationUpdate(ValueAnimator animation) {
         scale = (float)animation.getAnimatedValue();
-        invalidateListener.reDraw();
+        if (invalidateListener != null) {
+          invalidateListener.reDraw();
+        }
       }
     });
 

diff --git a/library/src/main/java/com/tuyenmonkey/mkloader/type/TwinFishesSpinner.java b/library/src/main/java/com/tuyenmonkey/mkloader/type/TwinFishesSpinner.java
@@ -49,7 +49,9 @@ public TwinFishesSpinner() {
       fadeAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
         @Override public void onAnimationUpdate(ValueAnimator animation) {
           rotates[index] = (float)animation.getAnimatedValue();
-          invalidateListener.reDraw();
+          if (invalidateListener != null) {
+            invalidateListener.reDraw();
+          }
         }
       });
 

diff --git a/library/src/main/java/com/tuyenmonkey/mkloader/type/Whirlpool.java b/library/src/main/java/com/tuyenmonkey/mkloader/type/Whirlpool.java
@@ -47,7 +47,9 @@ public Whirlpool() {
       fadeAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
         @Override public void onAnimationUpdate(ValueAnimator animation) {
           rotates[index] = (float)animation.getAnimatedValue();
-          invalidateListener.reDraw();
+          if (invalidateListener != null) {
+            invalidateListener.reDraw();
+          }
         }
       });
 

diff --git a/library/src/main/java/com/tuyenmonkey/mkloader/type/Worm.java b/library/src/main/java/com/tuyenmonkey/mkloader/type/Worm.java
@@ -41,7 +41,9 @@ public Worm() {
       translateAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
         @Override public void onAnimationUpdate(ValueAnimator animation) {
           circles[index].setCenter(center.x, (float)animation.getAnimatedValue());
-          invalidateListener.reDraw();
+          if (invalidateListener != null) {
+            invalidateListener.reDraw();
+          }
         }
       });