| OLD | NEW |
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #import "ios/chrome/browser/web/mailto_url_rewriter.h" | 5 #import "ios/chrome/browser/web/mailto_url_rewriter.h" |
| 6 | 6 |
| 7 #import "base/logging.h" | 7 #import "base/logging.h" |
| 8 #import "ios/chrome/browser/web/mailto_handler.h" | 8 #import "ios/chrome/browser/web/mailto_handler.h" |
| 9 #import "ios/chrome/browser/web/mailto_handler_gmail.h" | 9 #import "ios/chrome/browser/web/mailto_handler_gmail.h" |
| 10 #import "ios/chrome/browser/web/mailto_handler_system_mail.h" | 10 #import "ios/chrome/browser/web/mailto_handler_system_mail.h" |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 self = [self init]; | 73 self = [self init]; |
| 74 if (self) { | 74 if (self) { |
| 75 [self addMailtoApps:@[ | 75 [self addMailtoApps:@[ |
| 76 [[MailtoHandlerSystemMail alloc] init], [[MailtoHandlerGmail alloc] init] | 76 [[MailtoHandlerSystemMail alloc] init], [[MailtoHandlerGmail alloc] init] |
| 77 ]]; | 77 ]]; |
| 78 } | 78 } |
| 79 return self; | 79 return self; |
| 80 } | 80 } |
| 81 | 81 |
| 82 - (NSArray<MailtoHandler*>*)defaultHandlers { | 82 - (NSArray<MailtoHandler*>*)defaultHandlers { |
| 83 return [_handlers allValues]; | 83 return [[_handlers allValues] |
| 84 sortedArrayUsingComparator:^NSComparisonResult( |
| 85 MailtoHandler* _Nonnull obj1, MailtoHandler* _Nonnull obj2) { |
| 86 return [[obj1 appName] compare:[obj2 appName]]; |
| 87 }]; |
| 84 } | 88 } |
| 85 | 89 |
| 86 - (NSString*)defaultHandlerID { | 90 - (NSString*)defaultHandlerID { |
| 87 NSString* value = [[NSUserDefaults standardUserDefaults] | 91 NSString* value = [[NSUserDefaults standardUserDefaults] |
| 88 stringForKey:kMailtoDefaultHandlerKey]; | 92 stringForKey:kMailtoDefaultHandlerKey]; |
| 89 return value ? value : [[self class] systemMailApp]; | 93 return value ? value : [[self class] systemMailApp]; |
| 90 } | 94 } |
| 91 | 95 |
| 92 - (void)setDefaultHandlerID:(NSString*)appStoreID { | 96 - (void)setDefaultHandlerID:(NSString*)appStoreID { |
| 93 DCHECK([appStoreID length]); | 97 DCHECK([appStoreID length]); |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 208 if ([defaults objectForKey:kMailtoDefaultHandlerKey]) | 212 if ([defaults objectForKey:kMailtoDefaultHandlerKey]) |
| 209 return; | 213 return; |
| 210 | 214 |
| 211 NSString* const kGmailAppStoreID = @"422689480"; | 215 NSString* const kGmailAppStoreID = @"422689480"; |
| 212 MailtoHandler* gmailHandler = _handlers[kGmailAppStoreID]; | 216 MailtoHandler* gmailHandler = _handlers[kGmailAppStoreID]; |
| 213 if ([gmailHandler isAvailable]) | 217 if ([gmailHandler isAvailable]) |
| 214 [defaults setObject:kGmailAppStoreID forKey:kMailtoDefaultHandlerKey]; | 218 [defaults setObject:kGmailAppStoreID forKey:kMailtoDefaultHandlerKey]; |
| 215 } | 219 } |
| 216 | 220 |
| 217 @end | 221 @end |
| OLD | NEW |