ShockVPN/wireguard-apple
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ConfTextStorage: lowercase only once

Browse Source 
Also fix submodule regression.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld
2019-02-16 17:18:10 +05:30
committed by Roopesh Chander
parent 4c88f477a2
commit 6f7214ff38
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift
+4 -5
View File
@@ -100,14 +100,13 @@ class ConfTextStorage: NSTextStorage {
resetLastPeer() resetLastPeer()
while spans.pointee.type != HighlightEnd { while spans.pointee.type != HighlightEnd {
let span = spans.pointee let span = spans.pointee
var substring = backingStore.attributedSubstring(from: NSRange(location: span.start, length: span.len)).string var substring = backingStore.attributedSubstring(from: NSRange(location: span.start, length: span.len)).string.lowercased()
if span.type == HighlightError { if span.type == HighlightError {
resetLastPeer() resetLastPeer()
return return
} } else if span.type == HighlightSection {
if span.type == HighlightSection { if substring == "[peer]" {
if substring.lowercased() == "[peer]" {
if hasOnePeer { if hasOnePeer {
resetLastPeer() resetLastPeer()
return return
@@ -115,7 +114,7 @@ class ConfTextStorage: NSTextStorage {
hasOnePeer = true hasOnePeer = true
} }
} else if span.type == HighlightField { } else if span.type == HighlightField {
fieldType = FieldType(rawValue: substring.lowercased()) fieldType = FieldType(rawValue: substring)
} else if span.type == HighlightIP && fieldType == .dns { } else if span.type == HighlightIP && fieldType == .dns {
lastOnePeerDNSServers.append(substring) lastOnePeerDNSServers.append(substring)
} else if span.type == HighlightIP && fieldType == .allowedips { } else if span.type == HighlightIP && fieldType == .allowedips {
wireguard-go
+1 -1
Submodule wireguard-go updated: c4b43e35a7...f7170e5de2