Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.
Merged
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
e397649
Make initial changes
camsim99 May 4, 2022
120ef5d
Remove ongoing, add tests
camsim99 May 4, 2022
ba1b893
Merge remote-tracking branch 'upstream/master' into issue_101384
camsim99 May 5, 2022
236d86d
Fix tests
camsim99 May 5, 2022
17d37f3
Update CHANGELOG
camsim99 May 5, 2022
300a674
Update pubspec
camsim99 May 5, 2022
0bdb42d
Add back ongoing error
camsim99 May 9, 2022
34bb410
Add ongoing test
camsim99 May 9, 2022
3759e72
Merge branch 'main' into issue_101384
camsim99 May 9, 2022
e995edb
Change error msg
camsim99 May 9, 2022
901d115
Remove error and related test
camsim99 May 10, 2022
a04b050
Add missing import
camsim99 May 10, 2022
985e653
Bump version
camsim99 May 10, 2022
255f295
Merge remote-tracking branch 'upstream/master' into issue_101384
camsim99 May 17, 2022
2d74e07
Make fixes
camsim99 May 17, 2022
32079c9
Merge remote-tracking branch 'upstream/master' into issue_101384
camsim99 May 31, 2022
7b40254
Make breaking changes
camsim99 May 31, 2022
33561f2
Make analyzer fixes
camsim99 May 31, 2022
a154e1a
Remove error
camsim99 May 31, 2022
bfb8737
Bump platform interface version
camsim99 May 31, 2022
7bf7a14
Bump platform interface version in other pubspec
camsim99 May 31, 2022
22ad172
Revert "Bump platform interface version in other pubspec"
camsim99 May 31, 2022
11c69bb
Revert "Bump platform interface version"
camsim99 May 31, 2022
f06cae4
Revert changes to platform interface
camsim99 May 31, 2022
5578901
Undo git error
camsim99 May 31, 2022
63a4e65
Update breaking change method in CHANGELOG
camsim99 Jun 3, 2022
f078260
Update README
camsim99 Jun 8, 2022
52e922f
Merge remote-tracking branch 'upstream/master' into issue_101384
camsim99 Jun 8, 2022
8d366ea
Merge remote-tracking branch 'upstream/main' into issue_101384
camsim99 Jun 8, 2022
f9c373e
Merge remote-tracking branch 'upstream/main' into issue_101384
camsim99 Jun 22, 2022
b432ee4
Bump versions
camsim99 Jun 22, 2022
5be9f81
Fix versioning
camsim99 Jun 22, 2022
961ffdb
Merge remote-tracking branch 'upstream/main' into issue_101384
camsim99 Jul 7, 2022
1e34820
Undo changes to camera
camsim99 Jul 7, 2022
d8ba867
Merge remote-tracking branch 'upstream/main' into issue_101384
camsim99 Jul 8, 2022
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
Next Next commit
Make initial changes
  • Loading branch information
camsim99 committed May 4, 2022
commit e397649e61a9d02a838518786ab09c9b37ffd915
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ void requestPermissions(
PermissionsRegistry permissionsRegistry,
boolean enableAudio,
ResultCallback callback) {
if (ongoing) {
callback.onResult("cameraPermission", "Camera permission request ongoing");
}
if (!hasCameraPermission(activity) || (enableAudio && !hasAudioPermission(activity))) {
permissionsRegistry.addListener(
new CameraRequestPermissionsListener(
Expand Down Expand Up @@ -90,9 +87,9 @@ public boolean onRequestPermissionsResult(int id, String[] permissions, int[] gr

alreadyCalled = true;
if (grantResults[0] != PackageManager.PERMISSION_GRANTED) {
callback.onResult("cameraPermission", "MediaRecorderCamera permission not granted");
callback.onResult("CameraAccessDenied", "Camera access permission was denied.");
} else if (grantResults.length > 1 && grantResults[1] != PackageManager.PERMISSION_GRANTED) {
callback.onResult("cameraPermission", "MediaRecorderAudio permission not granted");
callback.onResult("AudioAccessDenied", "Audio access permission was denied.");
} else {
callback.onResult(null, null);
}
Expand Down