Merge pull request #434 from timothyqiu/qr-code

Fixes #433 Implements SIP002 QR code
2017-08-26 00:52:03 +08:00
parent af73e0e3ca f54a108d7e
commit cf82e85392
6 changed files with 121 additions and 27 deletions
--- a/ShadowsocksX-NG/AppDelegate.swift
+++ b/ShadowsocksX-NG/AppDelegate.swift
@ -265,6 +265,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
                }
                qrcodeWinCtrl = SWBQRCodeWindowController(windowNibName: "SWBQRCodeWindowController")
                qrcodeWinCtrl.qrCode = profile.URL()!.absoluteString
+                qrcodeWinCtrl.legacyQRCode = profile.URL(legacy: true)!.absoluteString
                qrcodeWinCtrl.title = profile.title()
                qrcodeWinCtrl.showWindow(self)
                NSApp.activate(ignoringOtherApps: true)