Merge pull request #15 from wordpress-mobile/fix-android-layout-reani…

…mation-crash Fix crash related to Android layout reanimation due to `NullPointerException`
wordpress-mobile · May 4, 2022 · e83e1f2 · e83e1f2
2 parents f575b73 + 9e63336
commit e83e1f2
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/android-npm/react-native-reanimated-66-hermes.aar b/android-npm/react-native-reanimated-66-hermes.aar
diff --git a/android/src/main/java/com/swmansion/reanimated/layoutReanimation/AnimationsManager.java b/android/src/main/java/com/swmansion/reanimated/layoutReanimation/AnimationsManager.java
@@ -1,5 +1,6 @@
 package com.swmansion.reanimated.layoutReanimation;
 
+import android.app.Activity;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.View;
@@ -364,12 +365,18 @@ public HashMap<String, Float> prepareDataForAnimationWorklet(
       preparedValues.put(key, PixelUtil.toDIPFromPixel((int) values.get(key)));
     }
 
-    DisplayMetrics displaymetrics = new DisplayMetrics();
-    mContext.getCurrentActivity().getWindowManager().getDefaultDisplay().getMetrics(displaymetrics);
-    int height = displaymetrics.heightPixels;
-    int width = displaymetrics.widthPixels;
-    preparedValues.put("windowWidth", PixelUtil.toDIPFromPixel(width));
-    preparedValues.put("windowHeight", PixelUtil.toDIPFromPixel(height));
+    DisplayMetrics displayMetrics = new DisplayMetrics();
+    Activity currentActivity = mContext.getCurrentActivity();
+    if (currentActivity != null) {
+      currentActivity.getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
+      int height = displayMetrics.heightPixels;
+      int width = displayMetrics.widthPixels;
+      preparedValues.put("windowWidth", PixelUtil.toDIPFromPixel(width));
+      preparedValues.put("windowHeight", PixelUtil.toDIPFromPixel(height));
+    } else {
+      preparedValues.put("windowWidth", PixelUtil.toDIPFromPixel(0));
+      preparedValues.put("windowHeight", PixelUtil.toDIPFromPixel(0));
+    }
     return preparedValues;
   }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-reanimated",
-  "version": "2.4.1-wp-1",
+  "version": "2.4.1-wp-2",
   "description": "More powerful alternative to Animated library for React Native.",
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",

diff --git a/react-native-reanimated-2.4.1-wp-1.tgz b/react-native-reanimated-2.4.1-wp-1.tgz
diff --git a/react-native-reanimated-2.4.1-wp-2.tgz b/react-native-reanimated-2.4.1-wp-2.tgz