Skip to content

Commit af565f1

Browse files
committed
Use currentImageSaver to check if ImageCapturer is capturing an image or not
1 parent 7b96ee5 commit af565f1

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

app/src/main/java/app/grapheneos/camera/capturer/ImageCapturer.kt

+5-6
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ private const val imageFileFormat = ".jpg"
2929
class ImageCapturer(val mActivity: MainActivity) {
3030
val camConfig = mActivity.camConfig
3131

32-
var isTakingPicture: Boolean = false
32+
val isTakingPicture: Boolean
33+
get() = currentImageSaver != null
3334

3435
private var currentImageSaver : ImageSaver? = null
3536

@@ -99,8 +100,6 @@ class ImageCapturer(val mActivity: MainActivity) {
99100
targetThumbnailHeight = preview.height,
100101
)
101102

102-
isTakingPicture = true
103-
104103
currentImageSaver = imageSaver
105104

106105
imageCapture.takePicture(ImageSaver.imageCaptureCallbackExecutor, imageSaver)
@@ -112,13 +111,13 @@ class ImageCapturer(val mActivity: MainActivity) {
112111
currentImageSaver?.cancelCaptureRequest()
113112

114113
unfadeCaptureButton()
115-
isTakingPicture = false
114+
currentImageSaver = null
116115
}
117116
}
118117

119118
fun onCaptureSuccess() {
120119
unfadeCaptureButton()
121-
isTakingPicture = false
120+
currentImageSaver = null
122121

123122
camConfig.mPlayer.playShutterSound()
124123
camConfig.snapPreview()
@@ -157,7 +156,7 @@ class ImageCapturer(val mActivity: MainActivity) {
157156
Log.e(TAG, "onCaptureError", exception)
158157

159158
unfadeCaptureButton()
160-
isTakingPicture = false
159+
currentImageSaver = null
161160
mActivity.previewLoader.visibility = View.GONE
162161

163162
if (mActivity.isStarted) {

0 commit comments

Comments
 (0)