From ef78e13c93b385b9625347a04f5037ce1a8384c6 Mon Sep 17 00:00:00 2001 From: Karol Barenicki Date: Fri, 2 Jan 2015 21:03:15 +0100 Subject: [PATCH 1/3] Fix bug with uploading files on KitKat This commit fixes #81. The bug was caused by Proguard messing with the code. This commit adds a simple Proguard rule that prevents it from doing so. --- proguard-project.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/proguard-project.txt b/proguard-project.txt index e4c4f4b..e4ea3e8 100644 --- a/proguard-project.txt +++ b/proguard-project.txt @@ -35,6 +35,13 @@ -keep public class * extends android.preference.Preference -keep public class com.android.vending.licensing.ILicensingService +# Without this rule, openFileChooser does not get called on KitKat +-keep class acr.browser.lightning.LightningView$LightningChromeClient { + void openFileChooser(android.webkit.ValueCallback); + void openFileChooser(android.webkit.ValueCallback,java.lang.String); + void openFileChooser(android.webkit.ValueCallback,java.lang.String,java.lang.String); +} + -keepclasseswithmembernames class * { native ; } From 8b10d373486bf77d45e8a088ab26b66d1051357c Mon Sep 17 00:00:00 2001 From: karolba Date: Fri, 2 Jan 2015 21:47:04 +0100 Subject: [PATCH 2/3] Fix formating --- proguard-project.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proguard-project.txt b/proguard-project.txt index e4ea3e8..27b96f1 100644 --- a/proguard-project.txt +++ b/proguard-project.txt @@ -38,8 +38,8 @@ # Without this rule, openFileChooser does not get called on KitKat -keep class acr.browser.lightning.LightningView$LightningChromeClient { void openFileChooser(android.webkit.ValueCallback); - void openFileChooser(android.webkit.ValueCallback,java.lang.String); - void openFileChooser(android.webkit.ValueCallback,java.lang.String,java.lang.String); + void openFileChooser(android.webkit.ValueCallback, java.lang.String); + void openFileChooser(android.webkit.ValueCallback, java.lang.String, java.lang.String); } -keepclasseswithmembernames class * { From 3510691439aa17e8bed9924d2e794e7e158865cb Mon Sep 17 00:00:00 2001 From: Karol Barenicki Date: Sat, 3 Jan 2015 04:14:38 +0100 Subject: [PATCH 3/3] Delete a comment saying that it doesn't work --- src/acr/browser/lightning/BrowserActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/acr/browser/lightning/BrowserActivity.java b/src/acr/browser/lightning/BrowserActivity.java index 90d7645..bdaf6a9 100644 --- a/src/acr/browser/lightning/BrowserActivity.java +++ b/src/acr/browser/lightning/BrowserActivity.java @@ -1876,7 +1876,7 @@ public class BrowserActivity extends Activity implements BrowserController { @Override /** - * used to allow uploading into the browser, doesn't get called in KitKat :( + * used to allow uploading into the browser */ protected void onActivityResult(int requestCode, int resultCode, Intent intent) { if (requestCode == 1) {