Merge pull request #18 from ajyong/master

Restore compatibility with Cordova Android 4.0+
This commit is contained in:
Michael Jordan
2015-06-26 09:23:37 -04:00
3 changed files with 22 additions and 5 deletions
@@ -38,7 +38,12 @@ public class DonutMobileAccessibilityHelper extends
@Override
public void initialize(MobileAccessibility mobileAccessibility) {
mMobileAccessibility = mobileAccessibility;
mWebView = (WebView) mobileAccessibility.webView;
try {
mWebView = (WebView) mobileAccessibility.webView;
} catch (ClassCastException ce) { // cordova-android 4.0+
mWebView = (WebView) mobileAccessibility.webView.getView();
}
mAccessibilityManager = (AccessibilityManager) mMobileAccessibility.cordova.getActivity().getSystemService(Context.ACCESSIBILITY_SERVICE);
}
@@ -34,8 +34,14 @@ public class JellyBeanMobileAccessibilityHelper extends
@Override
public void initialize(MobileAccessibility mobileAccessibility) {
WebView view;
super.initialize(mobileAccessibility);
mParent = ((WebView) mobileAccessibility.webView).getParentForAccessibility();
try {
view = (WebView) mobileAccessibility.webView;
} catch (ClassCastException ce) { // cordova android 4.0+
view = (WebView) mobileAccessibility.webView.getView();
}
mParent = view.getParentForAccessibility();
}
@Override
@@ -133,9 +133,15 @@ public class MobileAccessibility extends CordovaPlugin {
stop();
cordova.getActivity().runOnUiThread(new Runnable() {
public void run() {
((WebView) webView).reload();
}
});
WebView view;
try {
view = (WebView) webView;
} catch(ClassCastException ce) { // cordova-android 4.0+
view = (WebView) webView.getView();
}
view.reload();
}
});
}
}