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

Fix bug with uploading files on KitKat
This commit is contained in:
Anthony Restaino 2015-01-05 20:16:30 -05:00
commit 4c76f945f6
2 changed files with 8 additions and 1 deletions

View File

@ -35,6 +35,13 @@
-keep public class * extends android.preference.Preference -keep public class * extends android.preference.Preference
-keep public class com.android.vending.licensing.ILicensingService -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 * { -keepclasseswithmembernames class * {
native <methods>; native <methods>;
} }

View File

@ -1876,7 +1876,7 @@ public class BrowserActivity extends Activity implements BrowserController {
@Override @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) { protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
if (requestCode == 1) { if (requestCode == 1) {