From 090ad56d0b367995f17607a5f1179fa1ca206251 Mon Sep 17 00:00:00 2001
From: Bryce Curtis <curtis.bryce@gmail.com>
Date: Sun, 21 Nov 2010 16:47:35 -0600
Subject: [PATCH] Don't need special method to load a splash screen.  Instead,
 the regular loadUrl() and clearHistory() can be used.

---
 framework/src/com/phonegap/DroidGap.java | 42 +++---------------------
 1 file changed, 5 insertions(+), 37 deletions(-)

diff --git a/framework/src/com/phonegap/DroidGap.java b/framework/src/com/phonegap/DroidGap.java
index 57cc9e38..3dc8df89 100755
--- a/framework/src/com/phonegap/DroidGap.java
+++ b/framework/src/com/phonegap/DroidGap.java
@@ -23,9 +23,7 @@ import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 import android.webkit.JsResult;
-import android.webkit.WebBackForwardList;
 import android.webkit.WebChromeClient;
-import android.webkit.WebHistoryItem;
 import android.webkit.WebSettings;
 import android.webkit.WebStorage;
 import android.webkit.WebView;
@@ -112,9 +110,6 @@ public class DroidGap extends PhonegapActivity {
 	// Plugin to call when activity result is received
 	private Plugin activityResultCallback = null;
 
-	// URL of the splash screen that is currently showing
-	private String splashScreenShowing = null;
-	
 	// Flag indicates that a loadUrl timeout occurred
 	private int loadUrlTimeout = 0;
 	
@@ -455,29 +450,6 @@ public class DroidGap extends PhonegapActivity {
     	}
     }
 
-     * Load the url into the webview.
-     *  
-     * @param url
-     */
-	public void loadSplashScreen(final String url) {
-		System.out.println("loadSplashScreen("+url+")");
-		this.splashScreenShowing = url;
-
-		// Load URL on UI thread
-		final DroidGap me = this;
-		Runnable runnable = new Runnable() {
-			public void run() {
-				me.runOnUiThread(new Runnable() {
-					public void run() {
-						me.appView.loadUrl(url);
-					}
-				});
-			}
-		};
-		Thread thread = new Thread(runnable);
-		thread.start();
-	}
-
     @Override
     /**
      * Called by the system when the device configuration changes while your activity is running. 
@@ -968,15 +940,11 @@ public class DroidGap extends PhonegapActivity {
         		this.ctx.pluginManager.exec("Notification", "activityStop", null, "[]", false);
         	}
 
-    		// Clear history, so that splash screen isn't there when Back button is pressed
-    		WebBackForwardList history = this.ctx.appView.copyBackForwardList();
-    		int i = history.getCurrentIndex();
-    		if (i > 0) {
-    			WebHistoryItem item = history.getItemAtIndex(i-1);
-    			if (item.getUrl().equals(this.ctx.splashScreenShowing)) {
-    				this.ctx.appView.clearHistory();
-    			}
-    		}	 
+    		// Clear history, so that previous screen isn't there when Back button is pressed
+    		if (this.ctx.clearHistory) {
+    			this.ctx.clearHistory = false;
+    			this.ctx.appView.clearHistory();
+    		}
         }
         
         /**