Skip to content

Commit e0f8411

Browse files
MHShettythestinger
authored andcommitted
Use currentImageSaver to check if ImageCapturer is capturing an image or not
1 parent ab68afe commit e0f8411

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
@@ -30,7 +30,8 @@ private const val imageFileFormat = ".jpg"
3030
class ImageCapturer(val mActivity: MainActivity) {
3131
val camConfig = mActivity.camConfig
3232

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

3536
private var currentImageSaver : ImageSaver? = null
3637

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

103-
isTakingPicture = true
104-
105104
currentImageSaver = imageSaver
106105

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

115114
unfadeCaptureButton()
116-
isTakingPicture = false
115+
currentImageSaver = null
117116
}
118117
}
119118

120119
fun onCaptureSuccess() {
121120
unfadeCaptureButton()
122-
isTakingPicture = false
121+
currentImageSaver = null
123122

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

160159
unfadeCaptureButton()
161-
isTakingPicture = false
160+
currentImageSaver = null
162161
mActivity.previewLoader.visibility = View.GONE
163162

164163
if (mActivity.isStarted) {

0 commit comments

Comments
 (0)