diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2021-02-12 11:47:49 +0100 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2021-02-12 11:47:49 +0100 |
| commit | 1aa3055826fe670bad20fa069e70dfb1e1fcdd18 (patch) | |
| tree | f4bc44d6a3274accbaf0e50560a2e2ff3efd359b | |
| parent | 39c10be54751f6afa6a57751c4cd91fa3cf7669f (diff) | |
| parent | 9e8e57c861367a7bc149ac6ccca09cf0d40aa86e (diff) | |
| download | mullvadvpn-1aa3055826fe670bad20fa069e70dfb1e1fcdd18.tar.xz mullvadvpn-1aa3055826fe670bad20fa069e70dfb1e1fcdd18.zip | |
Merge branch 'ios-fix-account-input-paste-crash'
| -rw-r--r-- | ios/CHANGELOG.md | 1 | ||||
| -rw-r--r-- | ios/MullvadVPN/AccountTokenInput.swift | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ios/CHANGELOG.md b/ios/CHANGELOG.md index 08a49bb671..1525217344 100644 --- a/ios/CHANGELOG.md +++ b/ios/CHANGELOG.md @@ -25,6 +25,7 @@ Line wrap the file at 100 chars. Th ## [Unreleased] ### Changed - Migrate to WireGuardKit framework. +- Fix crash when pasting empty string into account input field. ## [2020.5] - 2020-11-04 ### Fixed diff --git a/ios/MullvadVPN/AccountTokenInput.swift b/ios/MullvadVPN/AccountTokenInput.swift index 17f5bde55a..317f7717a9 100644 --- a/ios/MullvadVPN/AccountTokenInput.swift +++ b/ios/MullvadVPN/AccountTokenInput.swift @@ -60,7 +60,7 @@ class AccountTokenInput: NSObject // Since removing separator alone makes no sense, this computation extends the string range // to include the digit preceding a separator. - if replacementString.isEmpty && emptySelection { + if replacementString.isEmpty && emptySelection && !formattedString.isEmpty { let precedingDigitIndex = formattedString .prefix(through: stringRange.lowerBound) .lastIndex { Self.isDigit($0) } ?? formattedString.startIndex |