Skip to content

[camera_android] Mark description in sendCameraErrorEvent as @NonNull #7877

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

Merged
merged 2 commits into from
Oct 17, 2024
Merged

[camera_android] Mark description in sendCameraErrorEvent as @NonNull #7877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29a8842
Mark description @NonNull
yaakovschectman Oct 15, 2024
29046c8
Extend error messages
yaakovschectman Oct 17, 2024
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
20 changes: 16 additions & 4 deletions packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/Camera.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,10 +396,14 @@ public void onOpened(@NonNull CameraDevice device) {
cameraFeatures.getFocusPoint().checkIsSupported());
}
} catch (Exception e) {
String message =
(e.getMessage() == null)
? (e.getClass().getName() + " occurred while opening camera.")
: e.getMessage();
if (BuildConfig.DEBUG) {
Log.i(TAG, "open | onOpened error: " + e.getMessage());
Log.i(TAG, "open | onOpened error: " + message);
}
dartMessenger.sendCameraErrorEvent(e.getMessage());
dartMessenger.sendCameraErrorEvent(message);
close();
}
}
Expand Down Expand Up @@ -792,7 +796,11 @@ private void lockAutoFocus() {
try {
captureSession.capture(previewRequestBuilder.build(), null, backgroundHandler);
} catch (CameraAccessException e) {
dartMessenger.sendCameraErrorEvent(e.getMessage());
String message =
(e.getMessage() == null)
? "CameraAccessException occurred while locking autofocus."
: e.getMessage();
dartMessenger.sendCameraErrorEvent(message);
}
}

Expand All @@ -815,7 +823,11 @@ void unlockAutoFocus() {

captureSession.capture(previewRequestBuilder.build(), null, backgroundHandler);
} catch (CameraAccessException e) {
dartMessenger.sendCameraErrorEvent(e.getMessage());
String message =
(e.getMessage() == null)
? "CameraAccessException occurred while unlocking autofocus."
: e.getMessage();
dartMessenger.sendCameraErrorEvent(message);
return;
}

Expand Down
7 changes: 2 additions & 5 deletions .../camera/camera_android/android/src/main/java/io/flutter/plugins/camera/DartMessenger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,17 +95,14 @@ void sendCameraClosingEvent() {
handler.post(() -> eventApi.closed(new NoOpVoidResult()));
}

// TODO(schectman): Make `description` non-null, see
// https://github.com/flutter/flutter/issues/156729
/**
* Sends a message to the Flutter client informing that an error occurred while interacting with
* the camera.
*
* @param description contains details regarding the error that occurred.
*/
void sendCameraErrorEvent(@Nullable String description) {
String errorMessage = (description == null) ? "" : description;
handler.post(() -> eventApi.error(errorMessage, new NoOpVoidResult()));
void sendCameraErrorEvent(@NonNull String description) {
handler.post(() -> eventApi.error(description, new NoOpVoidResult()));
}

/**
Expand Down