Skip to content
Permalink
Browse files

Only warn and offer switch for old SKS keyservers.

[#491 state:fixed assigned:mento milestone:1.4.7]
  • Loading branch information...
Mento committed Jul 31, 2019
1 parent ee3e4fa commit 28f8b95a3d403b945a4e5ff6cf49e6f862180d73
Showing with 5 additions and 4 deletions.
  1. +2 −2 Source/ActionController.m
  2. +3 −2 Source/PreferencesController.m
@@ -1546,8 +1546,8 @@ - (void)checkKeyserverAndAskForUpload {
if (![options boolForKey:doNotShowSwitchToVKSAgainKey]) {
// We never offered the user to switch to keys.openpgp.org

if (!options.isVerifyingKeyserver) {
// The current keyserver is not keys.openpgp.org
if (options.isSKSKeyserver) {
// The current keyserver is an old SKS keyserver.
// Ask the user to select keys.openpgp.org as the new keyserver.

NSInteger result = [self.sheetController
@@ -298,8 +298,9 @@ - (IBAction)checkKeyserver:(id)sender {
}];


if ([GPGOptions sharedOptions].isVerifyingKeyserver && ![GPGOptions isVerifyingKeyserver:self.keyserverToCheck]) {
// The user is switching from keys.openpgp.org to an old keyserver. Better warn them.
GPGOptions *options = [GPGOptions sharedOptions];
if (options.isVerifyingKeyserver && [options isSKSKeyserver:self.keyserverToCheck]) {
// The user is switching from keys.openpgp.org to an old SKS keyserver. Better warn them.
NSInteger result = [[SheetController sharedInstance] alertSheetForWindow:window
messageText:localizedLibmacgpgString(@"SwitchToOldKeyserver_Title")
infoText:localizedLibmacgpgString(@"SwitchToOldKeyserver_Msg")

0 comments on commit 28f8b95

Please sign in to comment.
You can’t perform that action at this time.