From 9b52827744f8df0c76e157c7744e83dd59f65d57 Mon Sep 17 00:00:00 2001
From: Bryce Curtis <curtis.bryce@gmail.com>
Date: Tue, 21 Jun 2011 22:50:53 -0500
Subject: [PATCH] Urls with same path and file but different # or ? should
 compare to same url.

---
 framework/src/com/phonegap/DroidGap.java | 28 +++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/framework/src/com/phonegap/DroidGap.java b/framework/src/com/phonegap/DroidGap.java
index 7dc2aed0..914d74bb 100755
--- a/framework/src/com/phonegap/DroidGap.java
+++ b/framework/src/com/phonegap/DroidGap.java
@@ -119,8 +119,13 @@ public class DroidGap extends PhonegapActivity {
 	protected boolean clearHistory = false;
 
 	// The initial URL for our app
+	// ie http://server/path/index.html#abc?query
 	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
 	private String baseUrl;
 
@@ -330,6 +335,7 @@ public class DroidGap extends PhonegapActivity {
      */
 	public void loadUrl(final String url) {
 		System.out.println("loadUrl("+url+")");
+		this.urlFile = this.getUrlFile(url);
 		this.url = url;
 		int i = url.lastIndexOf('/');
 		if (i > 0) {
@@ -693,13 +699,29 @@ public class DroidGap extends PhonegapActivity {
     	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
      * debugging your javascript.
      */
     public class GapClient extends WebChromeClient {
 
-        private Context ctx;
+        private DroidGap ctx;
         
         /**
          * Constructor.
@@ -707,7 +729,7 @@ public class DroidGap extends PhonegapActivity {
          * @param ctx
          */
         public GapClient(Context ctx) {
-            this.ctx = ctx;
+            this.ctx = (DroidGap)ctx;
         }
 
         /**
@@ -780,7 +802,7 @@ public class DroidGap extends PhonegapActivity {
         @Override
         public boolean onJsPrompt(WebView view, String url, String message, String defaultValue, JsPromptResult result) {
         	boolean reqOk = false;
-        	if (((DroidGap)(this.ctx)).url.equals(url)) {
+			if (this.ctx.urlFile.equals(this.ctx.getUrlFile(url))) {
         		reqOk = true;
         	}