public/cordova-android
public/cordova-android
9
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

Urls with same path and file but different # or ? should compare to same url.

Browse Source
This commit is contained in:
Bryce Curtis 2011-06-21 22:50:53 -05:00 committed by Joe Bowser
parent 44aa0aeb0f
commit 54fdcbfd46
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
framework/src/com/phonegap/DroidGap.java
View File

@ -128,8 +128,13 @@ public class DroidGap extends PhonegapActivity {
protected boolean clearHistory = false; protected boolean clearHistory = false;
// The initial URL for our app // The initial URL for our app
// ie http://server/path/index.html#abc?query
private String url; private String url;
// The initial URL for our app up to and including the file name
// ie http://server/path/index.html
private String urlFile;
// The base of the initial URL for our app // The base of the initial URL for our app
private String baseUrl; private String baseUrl;
@ -343,6 +348,7 @@ public class DroidGap extends PhonegapActivity {
*/ */
public void loadUrl(final String url) { public void loadUrl(final String url) {
System.out.println("loadUrl("+url+")"); System.out.println("loadUrl("+url+")");
this.urlFile = this.getUrlFile(url);
this.url = url; this.url = url;
int i = url.lastIndexOf('/'); int i = url.lastIndexOf('/');
if (i > 0) { if (i > 0) {
@ -717,13 +723,29 @@ public class DroidGap extends PhonegapActivity {
this.callbackServer.sendJavascript(statement); this.callbackServer.sendJavascript(statement);
} }
/**
* Return up to file part of url.
* If url = http://server/page.html#abc, then return http://server/page.html
*
* @param url
* @return
*/
private String getUrlFile(String url) {
int p1 = url.indexOf("#");
int p2 = url.indexOf("?");
if (p1 < 0) p1 = url.length();
if (p2 < 0) p2 = url.length();
int p3 = (p1 < p2) ? p1 : p2;
return url.substring(0, p3);
}
/** /**
* Provides a hook for calling "alert" from javascript. Useful for * Provides a hook for calling "alert" from javascript. Useful for
* debugging your javascript. * debugging your javascript.
*/ */
public class GapClient extends WebChromeClient { public class GapClient extends WebChromeClient {
private Context ctx; private DroidGap ctx;
/** /**
* Constructor. * Constructor.
@ -731,7 +753,7 @@ public class DroidGap extends PhonegapActivity {
* @param ctx * @param ctx
*/ */
public GapClient(Context ctx) { public GapClient(Context ctx) {
this.ctx = ctx; this.ctx = (DroidGap)ctx;
} }
/** /**
@ -804,7 +826,7 @@ public class DroidGap extends PhonegapActivity {
@Override @Override
public boolean onJsPrompt(WebView view, String url, String message, String defaultValue, JsPromptResult result) { public boolean onJsPrompt(WebView view, String url, String message, String defaultValue, JsPromptResult result) {
boolean reqOk = false; boolean reqOk = false;
if (((DroidGap)(this.ctx)).url.equals(url)) { if (this.ctx.urlFile.equals(this.ctx.getUrlFile(url))) {
reqOk = true; reqOk = true;
} }