Skip to content

Mixed content mode issue fix #8696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
prabakarviji wants to merge 7 commits into from
Closed

Mixed content mode issue fix #8696

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f259dc9
Mixed content issue fixed
prabakarviji Jul 11, 2016
c2a625b
Added 'enableMixedContentMode' as props
prabakarviji Jul 14, 2016
1a302f9
removed '==true'
prabakarviji Jul 14, 2016
94bc137
renamed enableMixedContentMode props as mixedContentModeEnabled
prabakarviji Jul 14, 2016
c08ab5a
renamed method name as setMixedContentModeEnabled
prabakarviji Jul 14, 2016
927b8dc
Merge branch 'master' into master
prabakarviji Jul 15, 2016
3c0f638
Merge branch 'master' into master
prabakarviji Jul 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Libraries/Components/WebView/WebView.android.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,12 @@ var WebView = React.createClass({
* start playing. The default value is `false`.
*/
mediaPlaybackRequiresUserAction: PropTypes.bool,

Copy link

@eslint-bot eslint-bot Jul 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no-trailing-spaces: Trailing spaces not allowed.

/**
* Used on Android(5.0+), controls whether Mixed content mode is enabled or not
* @platform android
*/
enableMixedContentMode: PropTypes.bool,
Copy link
Contributor

@ide ide Jul 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you rename this to mixedContentModeEnabled actually? other props in this component are named xxxEnabled

},

getInitialState: function() {
Expand All @@ -167,6 +173,7 @@ var WebView = React.createClass({
return {
javaScriptEnabled : true,
scalesPageToFit: true,
enableMixedContentMode: false,
};
},

Expand Down Expand Up @@ -229,6 +236,7 @@ var WebView = React.createClass({
onLoadingError={this.onLoadingError}
testID={this.props.testID}
mediaPlaybackRequiresUserAction={this.props.mediaPlaybackRequiresUserAction}
enableMixedContentMode={this.props.enableMixedContentMode}
/>;

return (
Expand Down
8 changes: 8 additions & 0 deletions ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.webkit.WebChromeClient;
import android.webkit.WebSettings;

import com.facebook.react.views.webview.events.TopLoadingErrorEvent;
import com.facebook.react.views.webview.events.TopLoadingFinishEvent;
Expand Down Expand Up @@ -292,6 +293,13 @@ public void setInjectedJavaScript(WebView view, @Nullable String injectedJavaScr
((ReactWebView) view).setInjectedJavaScript(injectedJavaScript);
}

@ReactProp(name = "enableMixedContentMode")
public void setMixedContentMode(WebView view, boolean enabled) {
Copy link
Contributor

@ide ide Jul 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and name this setMixedContentModeEnabled

if (enabled && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
view.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE);
Copy link
Contributor

@ide ide Jul 19, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry looking at the Android API more closely, I think we want to expose the underlying API: always, never, compatibility as enums.

}
}

@ReactProp(name = "source")
public void setSource(WebView view, @Nullable ReadableMap source) {
if (source != null) {
Expand Down