Return Flash mode off manually. Because Google #14
Conversation
| @@ -29,7 +29,8 @@ public void putValue(Type type, Object value) { | |||
|
|
|||
| private void ensureType(Type type, Object value) { | |||
| if (value == null) { | |||
| return; | |||
| throw new IllegalArgumentException("Provided " + type.clazz.getSimpleName() | |||
There was a problem hiding this comment.
The idea behind Parameters is that it essentially behaves as a map and map does allow null values to be written. Moreover, we should always expect null values to be returned from getValue anyway, so this check does not really protects us from anything.
| @@ -71,7 +71,7 @@ public Capabilities fromParameters(Camera.Parameters parameters) { | |||
| List<String> supportedFlashModes = parameters.getSupportedFlashModes(); | |||
| return supportedFlashModes != null | |||
| ? supportedFlashModes | |||
| : Collections.<String>emptyList(); | |||
| : Collections.singletonList(Camera.Parameters.FLASH_MODE_OFF); | |||
There was a problem hiding this comment.
I believe that this is the only change which is needed to fix the issue. I suggest we revert everything else.
|
fixes #9 |
| * | ||
| * @param parameters The parameters to validate. | ||
| */ | ||
| static void validate(Parameters parameters) { |
There was a problem hiding this comment.
Lets make it not-static to make it properly object oriented.
| validateParameter(parameters, FLASH); | ||
| } | ||
|
|
||
| private static void validateParameter(Parameters parameters, Parameters.Type focusMode) { |
There was a problem hiding this comment.
Update variable name. It is not necesserily a focus mode
| @@ -129,4 +129,16 @@ public void selectPreviewSize_WithValidAspectRatio() throws Exception { | |||
| ); | |||
| } | |||
|
|
|||
| @Test(expected = IllegalArgumentException.class) | |||
| public void initialParameterMissing() throws Exception { | |||
There was a problem hiding this comment.
This test tests validator and not provider. I suggest we make validator non-static and then just verify that it was called
Return Flash mode off manually when no flash instead of adding nullability in the parameters