Prevent crash

3 years ago · 8519d98328
parent 49610173e7
commit 8519d98328
1 changed files with 8 additions and 3 deletions
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@ -1286,11 +1286,16 @@ public class Helper {

                    field.setAccessible(true);

-                    if (Animator.class.isAssignableFrom(type))
-                        ((Animator) field.get(instance)).setTarget(null);
+                    if (Animator.class.isAssignableFrom(type)) {
+                        Animator animator = (Animator) field.get(instance);
+                        if (animator != null)
+                            animator.setTarget(null);
+                    }

                    if (Snackbar.class.isAssignableFrom(type)) {
-                        ((Snackbar) field.get(instance)).setAction(null, null);
+                        Snackbar snackbar = (Snackbar) field.get(instance);
+                        if (snackbar != null)
+                            snackbar.setAction(null, null);
                    }

                    field.set(instance, null);