Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: move view resolver out of the executor thread #556

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: move view resolver out of the executor thread #556

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions android/src/main/java/fr/greweb/reactnativeviewshot/ViewShot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,26 +195,26 @@ public void execute(@NonNull UIBlockViewResolver uiBlockViewResolver) {

//region Implementation
private void executeImpl(final NativeViewHierarchyManager nativeViewHierarchyManager, final UIBlockViewResolver uiBlockViewResolver) {
final View view;

if (tag == -1) {
view = currentActivity.getWindow().getDecorView().findViewById(android.R.id.content);
} else if (uiBlockViewResolver != null) {
view = uiBlockViewResolver.resolveView(tag);
} else {
view = nativeViewHierarchyManager.resolveView(tag);
}

if (view == null) {
Log.e(TAG, "No view found with reactTag: " + tag, new AssertionError());
promise.reject(ERROR_UNABLE_TO_SNAPSHOT, "No view found with reactTag: " + tag);
return;
}

executor.execute(new Runnable () {
@Override
public void run() {
try {
final View view;

if (tag == -1) {
view = currentActivity.getWindow().getDecorView().findViewById(android.R.id.content);
} else if (uiBlockViewResolver != null) {
view = uiBlockViewResolver.resolveView(tag);
} else {
view = nativeViewHierarchyManager.resolveView(tag);
}

if (view == null) {
Log.e(TAG, "No view found with reactTag: " + tag, new AssertionError());
promise.reject(ERROR_UNABLE_TO_SNAPSHOT, "No view found with reactTag: " + tag);
return;
}

final ReusableByteArrayOutputStream stream = new ReusableByteArrayOutputStream(outputBuffer);
stream.setSize(proposeSize(view));
outputBuffer = stream.innerBuffer();
Expand Down