Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: WeTransfer/WeScan
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3.0.0
Choose a base ref
...
head repository: WeTransfer/WeScan
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 10 commits
  • 4 files changed
  • 5 contributors

Commits on Sep 14, 2023

  1. Copy the full SHA
    46fa9b3 View commit details

Commits on Oct 3, 2023

  1. Copy the full SHA
    49071d2 View commit details
  2. Update CODEOWNERS file

    raphkoebraam committed Oct 3, 2023
    Copy the full SHA
    b5c0604 View commit details
  3. Merge pull request #372 from WeTransfer/feature/update/codeowners

    Update `CODEWONERS` file
    raphkoebraam authored Oct 3, 2023
    Copy the full SHA
    cbf24f3 View commit details

Commits on Feb 14, 2024

  1. Copy the full SHA
    699b747 View commit details
  2. self is not nil before proceeding in a block of code, which can help …

    …prevent runtime errors related to unwrapping a nil optional value.
    hajunho committed Feb 14, 2024
    Copy the full SHA
    921741b View commit details
  3. Copy the full SHA
    94ed306 View commit details

Commits on Feb 26, 2024

  1. Merge pull request #378 from hajunho/master

    modified to run captureSession.startRunning() on a background thread
    AvdLee authored Feb 26, 2024
    Copy the full SHA
    cf918f7 View commit details

Commits on Sep 10, 2024

  1. Copy the full SHA
    5d5a21a View commit details

Commits on Dec 11, 2024

  1. Copy the full SHA
    861003a View commit details
Showing with 26 additions and 10 deletions.
  1. +1 −1 { → .github}/CODEOWNERS
  2. +4 −0 Changelog.md
  3. +20 −8 Sources/WeScan/Scan/CaptureSessionManager.swift
  4. +1 −1 Submodules/WeTransfer-iOS-CI
2 changes: 1 addition & 1 deletion CODEOWNERS → .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -2,4 +2,4 @@
# These owners will be the default owners for everything in
# the repo. Unless a later match takes precedence, they
# will be requested for review when someone opens a PR.
* @kairadiagne @AvdLee @BasThomas @peagasilva @neodym
* @wetransfer/ios-collect
4 changes: 4 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### 3.0.0
- Remove Carthage and manual installation instructions ([#367](https://github.com/WeTransfer/WeScan/pull/367)) via [@BasThomas](https://github.com/BasThomas)
- Merge release 3.0.0-beta.1 into master ([#366](https://github.com/WeTransfer/WeScan/pull/366)) via [@wetransferplatform](https://github.com/wetransferplatform)

### 3.0.0-beta.1
- Copy snapshots to test bundle to solve SPM warning ([#363](https://github.com/WeTransfer/WeScan/pull/363)) via [@valeriyvan](https://github.com/valeriyvan)
- Fix typo ([#362](https://github.com/WeTransfer/WeScan/pull/362)) via [@valeriyvan](https://github.com/valeriyvan)
28 changes: 20 additions & 8 deletions Sources/WeScan/Scan/CaptureSessionManager.swift
Original file line number Diff line number Diff line change
@@ -141,19 +141,31 @@ final class CaptureSessionManager: NSObject, AVCaptureVideoDataOutputSampleBuffe

switch authorizationStatus {
case .authorized:
DispatchQueue.main.async {
self.captureSession.startRunning()
DispatchQueue.global(qos: .userInitiated).async { [weak self] in
self?.captureSession.startRunning()
DispatchQueue.main.async {
guard let self = self else { return }
self.isDetecting = true
}
}
isDetecting = true
case .notDetermined:
AVCaptureDevice.requestAccess(for: AVMediaType.video, completionHandler: { _ in
DispatchQueue.main.async { [weak self] in
self?.start()
AVCaptureDevice.requestAccess(for: AVMediaType.video, completionHandler: { [weak self] granted in
DispatchQueue.main.async {
guard let self = self else { return }
if granted {
self.start()
} else {
let error = ImageScannerControllerError.authorization
self.delegate?.captureSessionManager(self, didFailWithError: error)
}
}
})
default:
let error = ImageScannerControllerError.authorization
delegate?.captureSessionManager(self, didFailWithError: error)
DispatchQueue.main.async { [weak self] in
guard let self = self else { return }
let error = ImageScannerControllerError.authorization
self.delegate?.captureSessionManager(self, didFailWithError: error)
}
}
}

2 changes: 1 addition & 1 deletion Submodules/WeTransfer-iOS-CI