From b7719485c4de345a98ccaf7fe7da0ae0016bc2e4 Mon Sep 17 00:00:00 2001 From: Chris Brind Date: Wed, 4 Jul 2018 13:06:55 +0100 Subject: [PATCH 1/4] Add DuckDuckGo as an Open In... option --- LegacyDatabase/TGShareContextSignal.m | 2 +- Telegraph/TGOpenInBrowserItems.m | 37 ++++++++++++++++++++++++++- Telegraph/Telegraph-Info.plist | 3 ++- 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/LegacyDatabase/TGShareContextSignal.m b/LegacyDatabase/TGShareContextSignal.m index 6157beda5..76b7e1c9b 100644 --- a/LegacyDatabase/TGShareContextSignal.m +++ b/LegacyDatabase/TGShareContextSignal.m @@ -7,7 +7,7 @@ #import #import -#import "../../config.h" +#import "../config.h" #import "TGLocalization.h" diff --git a/Telegraph/TGOpenInBrowserItems.m b/Telegraph/TGOpenInBrowserItems.m index 0132da44c..7de6fb6f5 100644 --- a/Telegraph/TGOpenInBrowserItems.m +++ b/Telegraph/TGOpenInBrowserItems.m @@ -22,6 +22,9 @@ @interface TGOpenInYandexItem : TGOpenInBrowserItem @end +@interface TGOpenInDuckDuckGoItem : TGOpenInBrowserItem + +@end @interface TGOpenInBrowserItem () @@ -41,7 +44,8 @@ + (NSArray *)appItemsClasses [TGOpenInChromeItem class], [TGOpenInFirefoxItem class], [TGOpenInOperaItem class], - [TGOpenInYandexItem class] + [TGOpenInYandexItem class], + [TGOpenInDuckDuckGoItem class] ]; }); return appItems; @@ -258,3 +262,34 @@ + (NSString *)defaultURLScheme } @end + +@implementation TGOpenInDuckDuckGoItem + +- (NSString *)title +{ + return @"DuckDuckGo"; +} + +- (NSInteger)storeIdentifier +{ + return 663592361; +} + +- (void)performOpenIn +{ + NSURL *url = (NSURL *)self.object; + NSString *scheme = [url.scheme lowercaseString]; + + if (![scheme isEqualToString:@"http"] && ![scheme isEqualToString:@"https"]) + return; + + NSURL *openInURL = [NSURL URLWithString:[NSString stringWithFormat:@"ddgQuickLink://%@", url.absoluteString]]; + [TGOpenInBrowserItem openURL:openInURL]; +} + ++ (NSString *)defaultURLScheme +{ + return @"ddgQuickLink"; +} + +@end diff --git a/Telegraph/Telegraph-Info.plist b/Telegraph/Telegraph-Info.plist index 0546a88f1..74b1100b0 100644 --- a/Telegraph/Telegraph-Info.plist +++ b/Telegraph/Telegraph-Info.plist @@ -112,7 +112,7 @@ CFBundleVersion - 67581 + 67587 ITSAppUsesNonExemptEncryption ITSAppUsesNonExemptEncryption @@ -121,6 +121,7 @@ LSApplicationQueriesSchemes + ddgquicklink dbapi-3 instagram googledrive From 9f7036017d8392b0c1f8fdb900f25e130ed8d63a Mon Sep 17 00:00:00 2001 From: Chris Brind Date: Wed, 4 Jul 2018 13:50:38 +0100 Subject: [PATCH 2/4] restore original config path --- LegacyDatabase/TGShareContextSignal.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LegacyDatabase/TGShareContextSignal.m b/LegacyDatabase/TGShareContextSignal.m index 76b7e1c9b..6157beda5 100644 --- a/LegacyDatabase/TGShareContextSignal.m +++ b/LegacyDatabase/TGShareContextSignal.m @@ -7,7 +7,7 @@ #import #import -#import "../config.h" +#import "../../config.h" #import "TGLocalization.h" From e61460f9aa350aa7f64a0b870513cc41ce3cdf04 Mon Sep 17 00:00:00 2001 From: Chris Brind Date: Wed, 4 Jul 2018 13:54:45 +0100 Subject: [PATCH 3/4] revert build number to avoid conflicts --- Telegraph/Telegraph-Info.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Telegraph/Telegraph-Info.plist b/Telegraph/Telegraph-Info.plist index 74b1100b0..1c82bebb6 100644 --- a/Telegraph/Telegraph-Info.plist +++ b/Telegraph/Telegraph-Info.plist @@ -112,7 +112,7 @@ CFBundleVersion - 67587 + 67581 ITSAppUsesNonExemptEncryption ITSAppUsesNonExemptEncryption From 0eb0c3c92349420edc94a45660be29a3c547b5a5 Mon Sep 17 00:00:00 2001 From: Chris Brind Date: Wed, 4 Jul 2018 14:19:45 +0100 Subject: [PATCH 4/4] use lowercase convention for scheme --- Telegraph/TGOpenInBrowserItems.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Telegraph/TGOpenInBrowserItems.m b/Telegraph/TGOpenInBrowserItems.m index 7de6fb6f5..bd10e3090 100644 --- a/Telegraph/TGOpenInBrowserItems.m +++ b/Telegraph/TGOpenInBrowserItems.m @@ -283,13 +283,13 @@ - (void)performOpenIn if (![scheme isEqualToString:@"http"] && ![scheme isEqualToString:@"https"]) return; - NSURL *openInURL = [NSURL URLWithString:[NSString stringWithFormat:@"ddgQuickLink://%@", url.absoluteString]]; + NSURL *openInURL = [NSURL URLWithString:[NSString stringWithFormat:@"ddgquicklink://%@", url.absoluteString]]; [TGOpenInBrowserItem openURL:openInURL]; } + (NSString *)defaultURLScheme { - return @"ddgQuickLink"; + return @"ddgquicklink"; } @end