status-im/react-native-camera
2
0
Fork 0
mirror of https://github.com/status-im/react-native-camera.git synced 2025-02-24 01:38:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1690 from CptFabulouso/patch-1

Browse Source 
fix #1373 Promise does not return
This commit is contained in:
João Guilherme Fidelis 2018-07-18 10:26:30 -03:00 committed by GitHub
commit 63c62b0fb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
android/src/main/java/org/reactnative/camera/RNCameraView.java
View File

@ -10,6 +10,7 @@ import android.os.Build;
import android.support.v4.content.ContextCompat;
import android.util.SparseArray;
import android.view.View;
import android.os.AsyncTask;
import com.facebook.react.bridge.*;
import com.facebook.react.uimanager.ThemedReactContext;
import com.google.android.cameraview.CameraView;
@ -90,7 +91,13 @@ public class RNCameraView extends CameraView implements LifecycleEventListener,
promise.resolve(null);
}
final File cacheDirectory = mPictureTakenDirectories.remove(promise);
new ResolveTakenPictureAsyncTask(data, promise, options, cacheDirectory, RNCameraView.this).execute();
if(Build.VERSION.SDK_INT >= 11/*HONEYCOMB*/) {
new ResolveTakenPictureAsyncTask(data, promise, options, cacheDirectory, RNCameraView.this)
.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
} else {
new ResolveTakenPictureAsyncTask(data, promise, options, cacheDirectory, RNCameraView.this)
.execute();
}
}
@Override