Drop Dropbox.

Former-commit-id: 42d65098b70f8519e76a901bea19fe7e05caa6db
iterate-ch · Aug 22, 2012 · 6a1053a · 6a1053a
1 parent 8ae975d
commit 6a1053a
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 1,534 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -2053,7 +2053,6 @@ pl.lproj/Status.strings -text svneol=unset#text/utf-16
 pl.lproj/Transfer.strings -text svneol=unset#text/utf-16
 profiles/Azure.cyberduckprofile -text
 profiles/Cloud.ca[!!-~]Object[!!-~]Store[!!-~]East-1[!!-~]Region.cyberduckprofile -text
-profiles/Dropbox.cyberduckprofile -text
 profiles/Dunkel[!!-~]Cloud[!!-~]Storage.cyberduckprofile -text
 profiles/GreenQloud.cyberduckprofile -text
 profiles/HP[!!-~]Cloud[!!-~]Object[!!-~]Storage.cyberduckprofile -text

diff --git a/profiles/Dropbox.cyberduckprofile b/profiles/Dropbox.cyberduckprofile
diff --git a/source/ch/cyberduck/core/Preferences.java b/source/ch/cyberduck/core/Preferences.java
@@ -216,7 +216,6 @@ protected void setDefaults() {
         defaults.put("protocol." + Protocol.CLOUDFILES + ".enable", String.valueOf(true));
         defaults.put("protocol." + Protocol.SWIFT + ".enable", String.valueOf(true));
         defaults.put("protocol." + Protocol.GDOCS_SSL + ".enable", String.valueOf(true));
-        defaults.put("protocol." + Protocol.DROPBOX_SSL + ".enable", String.valueOf(false));
 
         defaults.put("path.symboliclink.resolve", String.valueOf(false));
         /**
@@ -644,12 +643,6 @@ protected void setDefaults() {
          */
         defaults.put("google.docs.delete.trash", String.valueOf(false));
 
-        /**
-         * Dropbox OAuth Application Secrets
-         */
-        defaults.put("dropbox.key", StringUtils.EMPTY);
-        defaults.put("dropbox.secret", StringUtils.EMPTY);
-
         /**
          * NTLM Windows Domain
          */
@@ -663,9 +656,9 @@ protected void setDefaults() {
 
         defaults.put("analytics.provider.qloudstat.setup", "https://qloudstat.com/configuration/add");
         defaults.put("analytics.provider.qloudstat.iam.policy.s3",
-                "{\"Statement\": [{\"Action\": [\"s3:Get*\",\"s3:List*\",\"s3:ListAllMyBuckets\"],\"Effect\": \"Allow\",\"Resource\": \"arn:aws:s3:::*\"}]}");
+                "{\"Statement\": [{\"Action\": [\"s3:Get*\",\"s3:List*\"],\"Effect\": \"Allow\",\"Resource\": \"arn:aws:s3:::%s/*\"}]}");
         defaults.put("analytics.provider.qloudstat.iam.policy.cloudfront",
-                "{\"Statement\": [{\"Action\": [\"s3:Get*\",\"s3:List*\"],\"Effect\": \"Allow\",\"Resource\": \"arn:aws:s3:::*\"},{\"Action\": [\"cloudfront:Get*\",\"cloudfront:List*\"],\"Effect\": \"Allow\",\"Resource\": \"*\"}]}");
+                "{\"Statement\": [{\"Action\": [\"s3:Get*\",\"s3:List*\"],\"Effect\": \"Allow\",\"Resource\": \"arn:aws:s3:::%s/*\"},{\"Action\": [\"cloudfront:Get*\",\"cloudfront:List*\"],\"Effect\": \"Allow\",\"Resource\": \"*\"}]}");
 
         /**
          * Maximum concurrent connections to the same host

diff --git a/source/ch/cyberduck/core/Protocol.java b/source/ch/cyberduck/core/Protocol.java
@@ -22,8 +22,6 @@
 import ch.cyberduck.core.cf.CFSession;
 import ch.cyberduck.core.dav.DAVPath;
 import ch.cyberduck.core.dav.DAVSession;
-import ch.cyberduck.core.dropbox.DropboxPath;
-import ch.cyberduck.core.dropbox.DropboxSession;
 import ch.cyberduck.core.eucalyptus.ECPath;
 import ch.cyberduck.core.eucalyptus.ECSession;
 import ch.cyberduck.core.ftp.FTPPath;
@@ -1046,71 +1044,4 @@ public PathFactory getPathFactory() {
             return GSPath.factory();
         }
     };
-
-    public static final Protocol DROPBOX_SSL = new Protocol() {
-        @Override
-        public String getName() {
-            return "Dropbox";
-        }
-
-        @Override
-        public String getDescription() {
-            return "Dropbox";
-        }
-
-        @Override
-        public String getIdentifier() {
-            return "dropbox";
-        }
-
-        @Override
-        public boolean isHostnameConfigurable() {
-            return false;
-        }
-
-        @Override
-        public String getDefaultHostname() {
-            return "api.getdropbox.com";
-        }
-
-        @Override
-        public Scheme getScheme() {
-            return Scheme.https;
-        }
-
-        @Override
-        public boolean isPortConfigurable() {
-            return false;
-        }
-
-        @Override
-        public boolean isWebUrlConfigurable() {
-            return false;
-        }
-
-        @Override
-        public boolean isAnonymousConfigurable() {
-            return false;
-        }
-
-        @Override
-        public String getUsernamePlaceholder() {
-            return Locale.localizedString("Email Address", "S3");
-        }
-
-        @Override
-        public String favicon() {
-            return this.icon();
-        }
-
-        @Override
-        public SessionFactory getSessionFactory() {
-            return DropboxSession.factory();
-        }
-
-        @Override
-        public PathFactory getPathFactory() {
-            return DropboxPath.factory();
-        }
-    };
 }