fix(🤖): Fix regression with PictureView on Android (#2813)

A user could inject the deprecated mode property directly which would cause a crash
Shopify · Dec 16, 2024 · 84a3b3a · 84a3b3a
1 parent b72c441
commit 84a3b3a
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 15 deletions.
diff --git a/packages/skia/android/src/main/java/com/shopify/reactnative/skia/SkiaBaseView.java b/packages/skia/android/src/main/java/com/shopify/reactnative/skia/SkiaBaseView.java
@@ -75,8 +75,6 @@ public void onSurfaceDestroyed() {
 
     protected abstract void surfaceDestroyed();
 
-    protected abstract void setMode(String mode);
-
     protected abstract void setDebugMode(boolean show);
 
     protected abstract void registerView(int nativeId);

diff --git a/packages/skia/android/src/main/java/com/shopify/reactnative/skia/SkiaBaseViewManager.java b/packages/skia/android/src/main/java/com/shopify/reactnative/skia/SkiaBaseViewManager.java
@@ -16,11 +16,6 @@ public void setNativeId(@NonNull ReactViewGroup view, @Nullable String nativeId)
         ((SkiaBaseView)view).registerView(nativeIdResolved);
     }
 
-    @ReactProp(name = "mode")
-    public void setMode(T view, String mode) {
-        ((SkiaBaseView)view).setMode(mode);
-    }
-
     @ReactProp(name = "debug")
     public void setDebug(T view, boolean show) {
         ((SkiaBaseView)view).setDebugMode(show);

diff --git a/packages/skia/android/src/main/java/com/shopify/reactnative/skia/SkiaDomView.java b/packages/skia/android/src/main/java/com/shopify/reactnative/skia/SkiaDomView.java
@@ -33,8 +33,6 @@ protected void finalize() throws Throwable {
 
     protected native void setBgColor(int color);
 
-    protected native void setMode(String mode);
-
     protected native void setDebugMode(boolean show);
 
     protected native void registerView(int nativeId);

diff --git a/packages/skia/android/src/main/java/com/shopify/reactnative/skia/SkiaPictureView.java b/packages/skia/android/src/main/java/com/shopify/reactnative/skia/SkiaPictureView.java
@@ -32,8 +32,6 @@ protected void finalize() throws Throwable {
 
     protected native void setBgColor(int color);
 
-    protected native void setMode(String mode);
-
     protected native void setDebugMode(boolean show);
 
     protected native void registerView(int nativeId);

diff --git a/...ndroid/src/paper/java/com/facebook/react/viewmanagers/SkiaPictureViewManagerDelegate.java b/...ndroid/src/paper/java/com/facebook/react/viewmanagers/SkiaPictureViewManagerDelegate.java
@@ -21,9 +21,6 @@ public SkiaPictureViewManagerDelegate(U viewManager) {
   @Override
   public void setProperty(T view, String propName, @Nullable Object value) {
     switch (propName) {
-      case "mode":
-        mViewManager.setMode(view, value == null ? null : (String) value);
-        break;
       case "opaque":
         mViewManager.setOpaque(view, value != null && (boolean) value);
       case "debug":

diff --git a/...droid/src/paper/java/com/facebook/react/viewmanagers/SkiaPictureViewManagerInterface.java b/...droid/src/paper/java/com/facebook/react/viewmanagers/SkiaPictureViewManagerInterface.java
@@ -13,7 +13,6 @@
 import androidx.annotation.Nullable;
 
 public interface SkiaPictureViewManagerInterface<T extends View> {
-  void setMode(T view, @Nullable String value);
   void setDebug(T view, boolean value);
   void setOpaque(T view, boolean value);
 }