Merge pull request #112 from recruit-lifestyle/develop

Ver 2.4.3
recruit-lifestyle · Mar 5, 2019 · bef16b9 · bef16b9
2 parents 353e19f + 060c79c
commit bef16b9
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/library/src/main/java/jp/co/recruit_lifestyle/android/floatingview/FloatingViewManager.java b/library/src/main/java/jp/co/recruit_lifestyle/android/floatingview/FloatingViewManager.java
@@ -32,6 +32,7 @@
 import android.view.HapticFeedbackConstants;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.WindowInsets;
 import android.view.WindowManager;
 import android.widget.FrameLayout;
 
@@ -616,8 +617,14 @@ public static Rect findCutoutSafeArea(@NonNull Activity activity) {
             return safeInsetRect;
         }
 
+        // Fix: getDisplayCutout() on a null object reference (issue #110)
+        final WindowInsets windowInsets = activity.getWindow().getDecorView().getRootWindowInsets();
+        if (windowInsets == null) {
+            return safeInsetRect;
+        }
+
         // set safeInsetRect
-        final DisplayCutout displayCutout = activity.getWindow().getDecorView().getRootWindowInsets().getDisplayCutout();
+        final DisplayCutout displayCutout = windowInsets.getDisplayCutout();
         if (displayCutout != null) {
             safeInsetRect.set(displayCutout.getSafeInsetLeft(), displayCutout.getSafeInsetTop(), displayCutout.getSafeInsetRight(), displayCutout.getSafeInsetBottom());
         }