Browse Source

Merge pull request #357 from beast/RN33-onActivityResult-fix

[Android] Fix for RN33 onActivityResult interface change
DanielZlotin 8 years ago
parent
commit
3992557d10

+ 2
- 1
android/app/src/main/java/com/reactnativenavigation/react/NavigationReactGateway.java View File

74
     }
74
     }
75
 
75
 
76
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
76
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
77
-        getReactInstanceManager().onActivityResult(requestCode, resultCode, data);
77
+        Activity currentActivity = getReactInstanceManager().getCurrentReactContext().getCurrentActivity();
78
+        getReactInstanceManager().onActivityResult(currentActivity, requestCode, resultCode, data);
78
     }
79
     }
79
 
80
 
80
     public ReactNativeHost getReactNativeHost() {
81
     public ReactNativeHost getReactNativeHost() {