Skip to content

Commit 35b11d9

Browse files
committed
Define protocol dependencies inside profiles to allow for deactivation in builds.
Signed-off-by: David Kocher <dkocher@iterate.ch>
1 parent 9938c5a commit 35b11d9

File tree

4 files changed

+333
-159
lines changed

4 files changed

+333
-159
lines changed

osx/src/main/java/ch/cyberduck/ui/cocoa/MainApplication.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import ch.cyberduck.core.b2.B2Protocol;
2525
import ch.cyberduck.core.box.BoxProtocol;
2626
import ch.cyberduck.core.brick.BrickProtocol;
27-
import ch.cyberduck.core.ctera.CteraProtocol;
2827
import ch.cyberduck.core.dav.DAVProtocol;
2928
import ch.cyberduck.core.dav.DAVSSLProtocol;
3029
import ch.cyberduck.core.dropbox.DropboxProtocol;
@@ -49,7 +48,6 @@
4948
import ch.cyberduck.core.sds.SDSProtocol;
5049
import ch.cyberduck.core.sftp.SFTPProtocol;
5150
import ch.cyberduck.core.spectra.SpectraProtocol;
52-
import ch.cyberduck.core.storegate.StoregateProtocol;
5351
import ch.cyberduck.core.threading.ActionOperationBatcher;
5452
import ch.cyberduck.core.threading.AutoreleaseActionOperationBatcher;
5553
import ch.cyberduck.ui.cocoa.controller.MainController;
@@ -102,11 +100,9 @@ public static void main(String... arguments) {
102100
new LocalProtocol(),
103101
new MantaProtocol(),
104102
new SDSProtocol(),
105-
new StoregateProtocol(),
106103
new BrickProtocol(),
107104
new NextcloudProtocol(),
108105
new OwncloudProtocol(),
109-
new CteraProtocol(),
110106
new BoxProtocol()
111107
);
112108
protocols.load();

osx/src/main/java/ch/cyberduck/ui/cocoa/controller/MainController.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
import ch.cyberduck.core.bonjour.NotificationRendezvousListener;
5353
import ch.cyberduck.core.bonjour.Rendezvous;
5454
import ch.cyberduck.core.bonjour.RendezvousFactory;
55-
import ch.cyberduck.core.ctera.CteraProtocol;
5655
import ch.cyberduck.core.exception.AccessDeniedException;
5756
import ch.cyberduck.core.exception.BackgroundException;
5857
import ch.cyberduck.core.exception.HostParserException;
@@ -1275,18 +1274,6 @@ public void handleGetURLEvent_withReplyEvent(NSAppleEventDescriptor event, NSApp
12751274
final OAuth2TokenListenerRegistry oauth = OAuth2TokenListenerRegistry.get();
12761275
oauth.notify(state, code);
12771276
}
1278-
else if(StringUtils.startsWith(url, CteraProtocol.CTERA_REDIRECT_URI)) {
1279-
final String action = StringUtils.removeStart(url, String.format("%s:", preferences.getProperty("oauth.handler.scheme")));
1280-
final List<NameValuePair> pairs = URLEncodedUtils.parse(URI.create(action), Charset.defaultCharset());
1281-
String code = StringUtils.EMPTY;
1282-
for(NameValuePair pair : pairs) {
1283-
if(StringUtils.equals(pair.getName(), "ActivationCode")) {
1284-
code = StringUtils.equals(pair.getName(), "ActivationCode") ? pair.getValue() : StringUtils.EMPTY;
1285-
}
1286-
}
1287-
final OAuth2TokenListenerRegistry oauth = OAuth2TokenListenerRegistry.get();
1288-
oauth.notify(StringUtils.EMPTY, code);
1289-
}
12901277
else {
12911278
try {
12921279
final Host h = HostParser.parse(url);

0 commit comments

Comments
 (0)