Merge branch 'fix_animation_crash' into 'master'

fix crash when trying to animate a drawable after Fragment is not in resumed state anymore

See merge request leap/bitmask_android!237

1 files changed, 9 insertions, 0 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java
index 409efcf0..a2fb2683 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java
@@ -227,6 +227,12 @@ public class EipFragment extends Fragment implements Observer {
     public void onPause() {
         super.onPause();
         Log.d(TAG, "onPause");
+        if (stateView.getDrawable() instanceof Animatable) {
+            Animatable animatedDrawable = (Animatable) stateView.getDrawable();
+            if (animatedDrawable.isRunning()) {
+                animatedDrawable.stop();
+            }
+        }
     }
 
     @Override
@@ -575,6 +581,9 @@ public class EipFragment extends Fragment implements Observer {
                 @Override
                 public void onAnimationEnd(Drawable drawable) {
                     super.onAnimationEnd(drawable);
+                    if (!isResumed()) {
+                        return;
+                    }
                     if (pendingAnimationState != 0) {
                         int newAnimationRes = pendingAnimationState;
                         pendingAnimationState = 0;