[android] Fixed crash with dead ViewTreeObserver.

1 files changed, 5 insertions, 5 deletions

diff --git a/android/src/com/mapswithme/util/UiUtils.java b/android/src/com/mapswithme/util/UiUtils.java
index 8c86f91cc5..a5ed0adb8f 100644
--- a/android/src/com/mapswithme/util/UiUtils.java
+++ b/android/src/com/mapswithme/util/UiUtils.java
@@ -71,19 +71,19 @@ public final class UiUtils
   }
 
 
-  public static void waitLayout(View view, @NonNull final ViewTreeObserver.OnGlobalLayoutListener callback)
+  public static void waitLayout(final View view, @NonNull final ViewTreeObserver.OnGlobalLayoutListener callback)
   {
-    final ViewTreeObserver observer = view.getViewTreeObserver();
-    observer.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener()
+    view.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener()
     {
       @SuppressWarnings("deprecation")
       @Override
       public void onGlobalLayout()
       {
+        // viewTreeObserver can be dead(isAlive() == false), we should get a new one here.
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN)
-          observer.removeGlobalOnLayoutListener(this);
+          view.getViewTreeObserver().removeGlobalOnLayoutListener(this);
         else
-          observer.removeOnGlobalLayoutListener(this);
+          view.getViewTreeObserver().removeOnGlobalLayoutListener(this);
 
         callback.onGlobalLayout();
       }