Change the signature of onDropViewInstance. issue facebook#5053

dobbit · Jan 5, 2016 · b824e08 · b824e08
1 parent 27ac047
commit b824e08
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
@@ -425,7 +425,7 @@ protected final void dropView(View view) {
     if (!mRootTags.get(view.getId())) {
       // For non-root views we notify viewmanager with {@link ViewManager#onDropInstance}
       resolveViewManager(view.getId()).onDropViewInstance(
-          (ThemedReactContext) view.getContext(),
+          view.getContext(),
           view);
     }
     ViewManager viewManager = mTagsToViewManagers.get(view.getId());

diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java
@@ -13,6 +13,7 @@
 
 import java.util.Map;
 
+import android.content.Context;
 import android.view.View;
 
 import com.facebook.react.bridge.ReadableArray;
@@ -92,7 +93,7 @@ public final T createView(
    * Called when view is detached from view hierarchy and allows for some additional cleanup by
    * the {@link ViewManager} subclass.
    */
-  public void onDropViewInstance(ThemedReactContext reactContext, T view) {
+  public void onDropViewInstance(Context reactContext, T view) {
   }
 
   /**

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java
@@ -13,6 +13,7 @@
 
 import java.util.Map;
 
+import android.content.Context;
 import android.graphics.Bitmap;
 import android.os.Build;
 import android.os.SystemClock;
@@ -325,9 +326,9 @@ public void receiveCommand(WebView root, int commandId, @Nullable ReadableArray
   }
 
   @Override
-  public void onDropViewInstance(ThemedReactContext reactContext, WebView webView) {
+  public void onDropViewInstance(Context reactContext, WebView webView) {
     super.onDropViewInstance(reactContext, webView);
-    reactContext.removeLifecycleEventListener((ReactWebView) webView);
+    ((ThemedReactContext) reactContext).removeLifecycleEventListener((ReactWebView) webView);
     ((ReactWebView) webView).cleanupCallbacksAndDestroy();
   }
 }