Merge pull request #159 from karolba/fix-kitkat-upload-bug

Fix bug with uploading files on KitKat

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 <methods>;
 }

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) {