From e8826090bbf7bc3d6e4e3f945495e266ea93d9c7 Mon Sep 17 00:00:00 2001 From: Bryce Curtis Date: Thu, 8 Sep 2011 16:02:08 -0500 Subject: [PATCH] Remove lingering code for old 1.x support. --- framework/src/com/phonegap/DroidGap.java | 32 +++--------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/framework/src/com/phonegap/DroidGap.java b/framework/src/com/phonegap/DroidGap.java index d7210c47..add7f9df 100755 --- a/framework/src/com/phonegap/DroidGap.java +++ b/framework/src/com/phonegap/DroidGap.java @@ -224,13 +224,7 @@ public class DroidGap extends PhonegapActivity { WebViewReflect.checkCompatibility(); - if (android.os.Build.VERSION.RELEASE.startsWith("1.")) { - this.appView.setWebChromeClient(new GapClient(DroidGap.this)); - } - else { - this.appView.setWebChromeClient(new EclairClient(DroidGap.this)); - } - + this.appView.setWebChromeClient(new GapClient(DroidGap.this)); this.setWebViewClient(this.appView, new GapViewClient(this)); this.appView.setInitialScale(100); @@ -798,11 +792,12 @@ public class DroidGap extends PhonegapActivity { } /** - * Provides a hook for calling "alert" from javascript. Useful for - * debugging your javascript. + * Set the chrome handler. */ public class GapClient extends WebChromeClient { + private String TAG = "PhoneGapLog"; + private long MAX_QUOTA = 100 * 1024 * 1024; private DroidGap ctx; /** @@ -970,25 +965,6 @@ public class DroidGap extends PhonegapActivity { return true; } - } - - /** - * WebChromeClient that extends GapClient with additional support for Android 2.X - */ - public class EclairClient extends GapClient { - - private String TAG = "PhoneGapLog"; - private long MAX_QUOTA = 100 * 1024 * 1024; - - /** - * Constructor. - * - * @param ctx - */ - public EclairClient(Context ctx) { - super(ctx); - } - /** * Handle database quota exceeded notification. *