mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Android Accessibility: Don't send accessibility events when inside populateNodeInfo() callback

Browse source 
Calling AccessibilityHandler::getChildren() or getParent() may cause an AccessibilityHandler object to be created and an InternalAccessibilityEvent::elementCreated notification to be sent. Calling AndroidAccessibilityEvent.setSource may then cause a recursive populateNodeInfo() call.
This commit is contained in:
ed 2021-09-15 08:56:15 +01:00
parent d8214732ed
commit b65dc65bc2
1 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

46
modules/juce_gui_basics/native/accessibility/juce_android_Accessibility.cpp
View file

@ -190,23 +190,6 @@ static constexpr auto getClassName (AccessibilityRole role)
return "android.view.View";
}
static auto getRootView()
{
LocalRef<jobject> activity (getMainActivity());
if (activity != nullptr)
{
auto* env = getEnv();
LocalRef<jobject> mainWindow (env->CallObjectMethod (activity.get(), AndroidActivity.getWindow));
LocalRef<jobject> decorView (env->CallObjectMethod (mainWindow.get(), AndroidWindow.getDecorView));
return LocalRef<jobject> (env->CallObjectMethod (decorView.get(), AndroidView.getRootView));
}
return LocalRef<jobject>();
}
static jobject getSourceView (const AccessibilityHandler& handler)
{
if (auto* peer = handler.getComponent().getPeer())
@ -251,6 +234,8 @@ public:
void populateNodeInfo (jobject info)
{
const ScopedValueSetter<bool> svs (inPopulateNodeInfo, true);
const auto sourceView = getSourceView (accessibilityHandler);
if (sourceView == nullptr)
@ -647,6 +632,8 @@ public:
return false;
}
bool isInPopulateNodeInfo() const noexcept { return inPopulateNodeInfo; }
private:
static std::unordered_map<int, AccessibilityHandler*> virtualViewIdMap;
@ -749,6 +736,7 @@ private:
AccessibilityHandler& accessibilityHandler;
const int virtualViewId;
bool inPopulateNodeInfo = false;
//==============================================================================
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AccessibilityNativeHandle)
@ -792,6 +780,11 @@ void sendAccessibilityEventImpl (const AccessibilityHandler& handler, int eventT
if (const auto sourceView = getSourceView (handler))
{
const auto* nativeImpl = handler.getNativeImplementation();
if (nativeImpl == nullptr || nativeImpl->isInPopulateNodeInfo())
return;
auto* env = getEnv();
auto appContext = getAppContext();
@ -810,7 +803,7 @@ void sendAccessibilityEventImpl (const AccessibilityHandler& handler, int eventT
env->CallVoidMethod (event,
AndroidAccessibilityEvent.setSource,
sourceView,
handler.getNativeImplementation()->getVirtualViewId());
nativeImpl->getVirtualViewId());
if (contentChangeTypes != 0 && accessibilityEventSetContentChangeTypes != nullptr)
env->CallVoidMethod (event,
@ -899,7 +892,22 @@ void AccessibilityHandler::postAnnouncement (const String& announcementString,
if (! areAnyAccessibilityClientsActive())
return;
const auto rootView = getRootView();
const auto rootView = []
{
LocalRef<jobject> activity (getMainActivity());
if (activity != nullptr)
{
auto* env = getEnv();
LocalRef<jobject> mainWindow (env->CallObjectMethod (activity.get(), AndroidActivity.getWindow));
LocalRef<jobject> decorView (env->CallObjectMethod (mainWindow.get(), AndroidWindow.getDecorView));
return LocalRef<jobject> (env->CallObjectMethod (decorView.get(), AndroidView.getRootView));
}
return LocalRef<jobject>();
}();
if (rootView != nullptr)
getEnv()->CallVoidMethod (rootView.get(),