Skip to content
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.

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

Unplug whitelist #606

Open
wants to merge 4 commits into
base: android-service-take-2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@
[submodule "cordova/cordova-crosswalk-engine"]
path = cordova/cordova-crosswalk-engine
url = https://github.com/MobileChromeApps/cordova-crosswalk-engine/
[submodule "cordova/cordova-plugin-inappbrowser"]
path = cordova/cordova-plugin-inappbrowser
url = https://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser.git
1 change: 0 additions & 1 deletion cca-manifest-logic/src/plugin-maps.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

var DEFAULT_PLUGINS = [
'org.apache.cordova.file',
'org.apache.cordova.inappbrowser',
'org.apache.cordova.network-information',
'org.apache.cordova.statusbar',
'org.apache.cordova.labs.keyboard',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,57 @@
package org.chromium;

import org.apache.cordova.CordovaPlugin;
import org.apache.cordova.CordovaInterface;
import org.apache.cordova.CordovaWebView;
import org.apache.cordova.ConfigXmlParser;
import android.content.res.XmlResourceParser;


import android.content.Intent;
import android.net.Uri;
import java.net.URL;
import java.net.MalformedURLException;
import android.util.Log;

public class ChromeNavigation extends CordovaPlugin {
private static final String LOG_TAG = "ChromeNavigation";
private String startUrl = null;
private String prevUrl = null;

public void initialize(CordovaInterface cordova, CordovaWebView webView) {
final URL baseURL;
try {
baseURL = new URL("file:///android_asset/www/");
new ConfigXmlParser(){
public void handleStartTag(XmlResourceParser xml) {
String strNode = xml.getName();
if (strNode.equals("content")) {
String src = xml.getAttributeValue(null, "src");
if (src != null) {
try {
startUrl = new URL(baseURL, src).toString();
} catch (MalformedURLException err) {}
}
}
}
public void handleEndTag(XmlResourceParser xml) {
}
}.parse(cordova.getActivity());
} catch (MalformedURLException err) {}
}

@Override
public Boolean shouldAllowRequest(String url) {
return true;
}

@Override
public Boolean shouldAllowNavigation(String url) {
return url.equals(startUrl);
}

@Override
public boolean onOverrideUrlLoading(String url) {
public Boolean shouldOpenExternalUrl(String url) {
if (url.startsWith("http:") || url.startsWith("https:")) {
Log.i(LOG_TAG, "Opening URL in external browser: " + url);
Intent systemBrowserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
cordova.getActivity().startActivity(systemBrowserIntent);
return true;
}
return false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,5 +113,20 @@ - (BOOL)shouldOverrideLoadWithRequest:(NSURLRequest*)request navigationType:(UIW
return NO;
}

- (BOOL)shouldAllowRequestForURL:(NSURL *)url
{
return YES;
}

- (BOOL)shouldAllowNavigationToURL:(NSURL *)url
{
return [[[url path] stringByDeletingLastPathComponent] hasSuffix:@"/www/plugins/org.chromium.bootstrap"];
}

- (BOOL)shouldOpenExternalURL:(NSURL *)url
{
return ([url.scheme isEqualToString:@"http"] || [url.scheme isEqualToString:@"https:"]);
}

@end

2 changes: 1 addition & 1 deletion cordova/cordova-android
Submodule cordova-android updated from fdef0d to 198364
2 changes: 1 addition & 1 deletion cordova/cordova-crosswalk-engine
2 changes: 1 addition & 1 deletion cordova/cordova-ios
Submodule cordova-ios updated from 2d8167 to 960c80
1 change: 1 addition & 0 deletions cordova/cordova-plugin-inappbrowser
Submodule cordova-plugin-inappbrowser added at 80e483