From acccccc968a695b8a2785b9ea387089526b8c795 Mon Sep 17 00:00:00 2001
From: fkloft <felix.kloft+github@gmail.com>
Date: Fri, 10 Apr 2015 01:06:30 +0200
Subject: [PATCH] Clean up previous commit

---
 .../iitc_mobile/IITC_WebChromeClient.java     | 24 ++++++++++++++
 .../iitc_mobile/IITC_WebChromeLollipop.java   | 31 -------------------
 .../com/cradle/iitc_mobile/IITC_WebView.java  |  6 +---
 3 files changed, 25 insertions(+), 36 deletions(-)
 delete mode 100644 mobile/src/com/cradle/iitc_mobile/IITC_WebChromeLollipop.java

diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_WebChromeClient.java b/mobile/src/com/cradle/iitc_mobile/IITC_WebChromeClient.java
index 4cf7e581..2ec6cd37 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_WebChromeClient.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_WebChromeClient.java
@@ -2,6 +2,8 @@ package com.cradle.iitc_mobile;
 
 import android.webkit.ConsoleMessage;
 import android.webkit.GeolocationPermissions;
+import android.webkit.JsPromptResult;
+import android.webkit.JsResult;
 import android.webkit.WebChromeClient;
 import android.webkit.WebView;
 
@@ -52,4 +54,26 @@ public class IITC_WebChromeClient extends WebChromeClient {
 
         return super.onConsoleMessage(message);
     }
+
+    @Override
+    public boolean onJsAlert(final WebView view, final String url, final String message, final JsResult result) {
+        return new IITC_JsDialogHelper(IITC_JsDialogHelper.ALERT, view, url, message, null, result).shouldInterrupt();
+    }
+
+    @Override
+    public boolean onJsBeforeUnload(final WebView view, final String url, final String message, final JsResult result) {
+        return new IITC_JsDialogHelper(IITC_JsDialogHelper.UNLOAD, view, url, message, null, result).shouldInterrupt();
+    }
+
+    @Override
+    public boolean onJsConfirm(final WebView view, final String url, final String message, final JsResult result) {
+        return new IITC_JsDialogHelper(IITC_JsDialogHelper.CONFIRM, view, url, message, null, result).shouldInterrupt();
+    }
+
+    @Override
+    public boolean onJsPrompt(final WebView view, final String url, final String message, final String defaultValue,
+            final JsPromptResult result) {
+        return new IITC_JsDialogHelper(IITC_JsDialogHelper.PROMPT, view, url, message, defaultValue, result)
+                .shouldInterrupt();
+    }
 }
diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_WebChromeLollipop.java b/mobile/src/com/cradle/iitc_mobile/IITC_WebChromeLollipop.java
deleted file mode 100644
index 1a615ddb..00000000
--- a/mobile/src/com/cradle/iitc_mobile/IITC_WebChromeLollipop.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.cradle.iitc_mobile;
-
-import android.webkit.JsPromptResult;
-import android.webkit.JsResult;
-import android.webkit.WebView;
-
-public class IITC_WebChromeLollipop extends IITC_WebChromeClient {
-    public IITC_WebChromeLollipop(final IITC_Mobile iitc) {
-        super(iitc);
-    }
-
-    @Override
-    public boolean onJsAlert(final WebView view, final String url, final String message, final JsResult result) {
-        return new IITC_JsDialogHelper(IITC_JsDialogHelper.ALERT, view, url, message, null, result).shouldInterrupt();
-    }
-
-    @Override
-    public boolean onJsBeforeUnload(final WebView view, final String url, final String message, final JsResult result) {
-        return new IITC_JsDialogHelper(IITC_JsDialogHelper.UNLOAD, view, url, message, null, result).shouldInterrupt();
-    }
-
-    @Override
-    public boolean onJsConfirm(final WebView view, final String url, final String message, final JsResult result) {
-        return new IITC_JsDialogHelper(IITC_JsDialogHelper.CONFIRM, view, url, message, null, result).shouldInterrupt();
-    }
-
-    @Override
-    public boolean onJsPrompt(final WebView view, final String url, final String message, final String defaultValue, final JsPromptResult result) {
-        return new IITC_JsDialogHelper(IITC_JsDialogHelper.PROMPT, view, url, message, defaultValue, result).shouldInterrupt();
-    }
-}
diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java b/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java
index 08cd4c2d..76deb275 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java
@@ -86,11 +86,7 @@ public class IITC_WebView extends WebView {
             }
         };
 
-        // if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT) {
-        mIitcWebChromeClient = new IITC_WebChromeLollipop(mIitc);
-        // } else {
-        // mIitcWebChromeClient = new IITC_WebChromeClient(mIitc);
-        // }
+        mIitcWebChromeClient = new IITC_WebChromeClient(mIitc);
         setWebChromeClient(mIitcWebChromeClient);
         mIitcWebViewClient = new IITC_WebViewClient(mIitc);
         setWebViewClient(mIitcWebViewClient);