Merge branch 'master' into bugfix/CD-4074

# Conflicts: # cli/src/main/java/ch/cyberduck/cli/TerminalHelpPrinter.java # cli/src/main/java/ch/cyberduck/cli/TerminalOptionsBuilder.java # core/src/test/java/ch/cyberduck/core/HostParserTest.java # ftp/src/test/java/ch/cyberduck/core/HostParserTest.java # onedrive/src/test/java/ch/cyberduck/core/HostParserTest.java # openstack/pom.xml # s3/src/test/java/ch/cyberduck/core/HostParserTest.java
sumonst21 · Feb 1, 2019 · 83c996e · 83c996e
2 parents 24480f6 + 08ebd90
commit 83c996e
Show file tree

Hide file tree

Showing 811 changed files with 2,545 additions and 2,702 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,6 +1,10 @@
 Cyberduck
 https://cyberduck.io/
 
+6.9.2
+- [Bugfix] Failure using RSA/ECDSA private in new OpenSSH format (#10552)
+- [Bugfix] Prompt to select parent folder for file dragged to upload (Mac App Store) (#10580)
+
 6.9.1
 - [Bugfix] Fix code signature designated requirement issue (Mac App Store)
 

diff --git a/Credits.rtf b/Credits.rtf
@@ -3,7 +3,7 @@
 }
 {\colortbl;\red255\green255\blue255;\red128\green128\blue128;\red0\green0\blue0;}
 {\*\expandedcolortbl;;\csgenericrgb\c50196\c50196\c50196;\cssrgb\c0\c0\c0\cname textColor;}
-\paperw11900\paperh16840\margl1440\margr1440\vieww20600\viewh18320\viewkind0
+\paperw11900\paperh16840\margl1440\margr1440\vieww22340\viewh18320\viewkind0
 \pard\tx760\tx1235\pardirnatural\partightenfactor0
 
 \f0\fs24 \cf2 \
@@ -13,7 +13,7 @@
 		Yves Langisch\
 		J\'f6ran Malek\
 
-\f0\b0 \cf2 		{\field{\*\fldinst{HYPERLINK "mailto:[email protected]"}}{\fldrslt [email protected]}}\
+\f0\b0 \cf2 		{\field{\*\fldinst{HYPERLINK "mailto:[email protected]"}}{\fldrslt \cf2 [email protected]}}\
 \
 	Third Party Software\
 		{\field{\*\fldinst{HYPERLINK "http://code.google.com/p/rococoa/"}}{\fldrslt 
@@ -165,7 +165,7 @@
 \cf0 	
 \f0\b0 \cf2 Czech
 \f1\b \cf0 \
-\cf3 		Frantisek Erben\
+\cf3 		Franti\'9aek Erben\
 		Miro Hofbauer\
 \cf0 	
 \f0\b0 \cf2 Norwegian
@@ -303,4 +303,4 @@ This program is free software; you can redistribute it and/or modify it under th
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\
 \
 Only our own original work is licensed under the terms of the GNU General Public License. The licenses of some libraries might impose different redistribution or general licensing terms than those stated in the GNU General Public License. Users and redistributors are hereby requested to verify these conditions and agree upon them.\
-}
+}
diff --git a/azure/pom.xml b/azure/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>ch.cyberduck</groupId>
         <artifactId>parent</artifactId>
-        <version>6.9.2-SNAPSHOT</version>
+        <version>6.9.3-SNAPSHOT</version>
     </parent>
     <artifactId>azure</artifactId>
     <properties>

diff --git a/azure/src/main/java/ch/cyberduck/core/azure/AzureSession.java b/azure/src/main/java/ch/cyberduck/core/azure/AzureSession.java
@@ -185,7 +185,7 @@ public void chunk(final Path parent, final AttributedList<Path> list) throws Lis
     }
 
     @Override
-    protected void logout() throws BackgroundException {
+    protected void logout() {
         context.getSendingRequestEventHandler().removeListener(listener);
     }
 

diff --git a/azure/src/test/java/ch/cyberduck/core/azure/AzureMoveFeatureTest.java b/azure/src/test/java/ch/cyberduck/core/azure/AzureMoveFeatureTest.java
@@ -48,7 +48,7 @@ public void testMove() throws Exception {
     }
 
     @Test
-    public void testSupport() throws Exception {
+    public void testSupport() {
         final Path c = new Path("/c", EnumSet.of(Path.Type.directory));
         assertFalse(new AzureMoveFeature(null, null).isSupported(c, c));
         final Path cf = new Path("/c/f", EnumSet.of(Path.Type.directory));

diff --git a/azure/src/test/java/ch/cyberduck/core/azure/AzureSessionTest.java b/azure/src/test/java/ch/cyberduck/core/azure/AzureSessionTest.java
@@ -29,7 +29,7 @@
 public class AzureSessionTest {
 
     @Test
-    public void testFeatures() throws Exception {
+    public void testFeatures() {
         final Host host = new Host(new AzureProtocol(), "test.cyberduck.ch");
         final Session session = new AzureSession(host);
         assertNotNull(session.getFeature(AclPermission.class));

diff --git a/azure/src/test/java/ch/cyberduck/core/azure/AzureUrlProviderTest.java b/azure/src/test/java/ch/cyberduck/core/azure/AzureUrlProviderTest.java
@@ -47,7 +47,7 @@ public void testGet() throws Exception {
     }
 
     @Test
-    public void testDisconnected() throws Exception {
+    public void testDisconnected() {
         final Host host = new Host(new AzureProtocol(), "kahy9boj3eib.blob.core.windows.net", new Credentials(
                 System.getProperties().getProperty("azure.account"), System.getProperties().getProperty("azure.key")
         ));

diff --git a/azure/src/test/java/ch/cyberduck/core/azure/AzureWriteFeatureTest.java b/azure/src/test/java/ch/cyberduck/core/azure/AzureWriteFeatureTest.java
@@ -26,6 +26,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.Map;
@@ -72,13 +73,13 @@ public void testWriteOverride() throws Exception {
         in.close();
         assertArrayEquals(content, buffer);
         final OutputStream overwrite = new AzureWriteFeature(session, context).write(test, new TransferStatus()
-                .length("overwrite".getBytes("UTF-8").length).withMetadata(Collections.singletonMap("Content-Type", "text/plain")), new DisabledConnectionCallback());
+            .length("overwrite".getBytes(StandardCharsets.UTF_8).length).withMetadata(Collections.singletonMap("Content-Type", "text/plain")), new DisabledConnectionCallback());
         new StreamCopier(new TransferStatus(), new TransferStatus())
-                .transfer(new ByteArrayInputStream("overwrite".getBytes("UTF-8")), overwrite);
+            .transfer(new ByteArrayInputStream("overwrite".getBytes(StandardCharsets.UTF_8)), overwrite);
         overwrite.close();
         // Test double close
         overwrite.close();
-        assertEquals("overwrite".getBytes("UTF-8").length, new AzureAttributesFinderFeature(session, context).find(test).getSize());
+        assertEquals("overwrite".getBytes(StandardCharsets.UTF_8).length, new AzureAttributesFinderFeature(session, context).find(test).getSize());
         new AzureDeleteFeature(session, context).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback());
         session.close();
     }

diff --git a/backblaze/pom.xml b/backblaze/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>ch.cyberduck</groupId>
-        <version>6.9.2-SNAPSHOT</version>
+        <version>6.9.3-SNAPSHOT</version>
     </parent>
     <artifactId>backblaze</artifactId>
     <packaging>jar</packaging>

diff --git a/backblaze/src/main/java/ch/cyberduck/core/b2/B2BucketTypeFeature.java b/backblaze/src/main/java/ch/cyberduck/core/b2/B2BucketTypeFeature.java
@@ -52,7 +52,7 @@ public B2BucketTypeFeature(final B2Session session, final B2FileidProvider filei
     }
 
     @Override
-    public Acl getPermission(final Path file) throws BackgroundException {
+    public Acl getPermission(final Path file) {
         if(containerService.isContainer(file)) {
             return containerService.getContainer(file).attributes().getAcl();
         }
@@ -111,7 +111,7 @@ public Set<Name> getLocations() {
     }
 
     @Override
-    public Name getLocation(final Path file) throws BackgroundException {
+    public Name getLocation(final Path file) {
         final Path container = containerService.getContainer(file);
         if(container.isRoot()) {
             return unknown;

diff --git a/backblaze/src/main/java/ch/cyberduck/core/b2/B2ErrorResponseInterceptor.java b/backblaze/src/main/java/ch/cyberduck/core/b2/B2ErrorResponseInterceptor.java
@@ -19,7 +19,6 @@
 import ch.cyberduck.core.http.DisabledServiceUnavailableRetryStrategy;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpException;
 import org.apache.http.HttpHeaders;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpRequestInterceptor;
@@ -88,7 +87,7 @@ public void setTokens(final String accountId, final String applicationKey, final
     }
 
     @Override
-    public void process(final HttpRequest request, final HttpContext context) throws HttpException, IOException {
+    public void process(final HttpRequest request, final HttpContext context) {
         if(StringUtils.contains(request.getRequestLine().getUri(), "b2_authorize_account")) {
             // Skip setting token for
             if(log.isDebugEnabled()) {

diff --git a/backblaze/src/main/java/ch/cyberduck/core/b2/B2LargeUploadWriteFeature.java b/backblaze/src/main/java/ch/cyberduck/core/b2/B2LargeUploadWriteFeature.java
@@ -88,12 +88,12 @@ public B2LargeUploadWriteFeature(final B2Session session, final B2FileidProvider
     }
 
     @Override
-    public StatusOutputStream<VersionId> write(final Path file, final TransferStatus status, final ConnectionCallback callback) throws BackgroundException {
+    public StatusOutputStream<VersionId> write(final Path file, final TransferStatus status, final ConnectionCallback callback) {
         final LargeUploadOutputStream proxy = new LargeUploadOutputStream(file, status);
         return new HttpResponseOutputStream<VersionId>(new MemorySegementingOutputStream(proxy,
             PreferencesFactory.get().getInteger("b2.upload.largeobject.size.minimum"))) {
             @Override
-            public VersionId getStatus() throws BackgroundException {
+            public VersionId getStatus() {
                 return proxy.getFileId();
             }
         };

diff --git a/backblaze/src/main/java/ch/cyberduck/core/b2/B2MetadataFeature.java b/backblaze/src/main/java/ch/cyberduck/core/b2/B2MetadataFeature.java
@@ -49,7 +49,7 @@ public Map<String, String> getMetadata(final Path file) throws BackgroundExcepti
     }
 
     @Override
-    public void setMetadata(final Path file, final Map<String, String> metadata) throws BackgroundException {
+    public void setMetadata(final Path file, final Map<String, String> metadata) {
         // Only in file upload
     }
 }

diff --git a/backblaze/src/main/java/ch/cyberduck/core/b2/B2Session.java b/backblaze/src/main/java/ch/cyberduck/core/b2/B2Session.java
@@ -54,7 +54,7 @@ public B2Session(final Host host, final X509TrustManager trust, final X509KeyMan
     }
 
     @Override
-    public B2ApiClient connect(final Proxy proxy, final HostKeyCallback key, final LoginCallback prompt) throws BackgroundException {
+    public B2ApiClient connect(final Proxy proxy, final HostKeyCallback key, final LoginCallback prompt) {
         final HttpClientBuilder configuration = builder.build(proxy, this, prompt);
         configuration.setServiceUnavailableRetryStrategy(retryHandler = new B2ErrorResponseInterceptor(
             this));

diff --git a/backblaze/src/main/java/ch/cyberduck/core/b2/B2TimestampFeature.java b/backblaze/src/main/java/ch/cyberduck/core/b2/B2TimestampFeature.java
@@ -16,7 +16,6 @@
  */
 
 import ch.cyberduck.core.Path;
-import ch.cyberduck.core.exception.BackgroundException;
 import ch.cyberduck.core.features.Timestamp;
 import ch.cyberduck.core.preferences.PreferencesFactory;
 import ch.cyberduck.core.shared.DefaultTimestampFeature;
@@ -36,7 +35,7 @@ public B2TimestampFeature(final B2Session session, final B2FileidProvider fileid
     }
 
     @Override
-    public void setTimestamp(final Path file, final Long modified) throws BackgroundException {
+    public void setTimestamp(final Path file, final Long modified) {
         final Map<String, String> metadata = PreferencesFactory.get().getMap("b2.metadata.default");
         metadata.put(X_BZ_INFO_SRC_LAST_MODIFIED_MILLIS, String.valueOf(modified));
         new B2MetadataFeature(session, fileid).setMetadata(file, metadata);

diff --git a/backblaze/src/test/java/ch/cyberduck/core/b2/AbstractB2Test.java b/backblaze/src/test/java/ch/cyberduck/core/b2/AbstractB2Test.java
@@ -27,7 +27,6 @@
 import ch.cyberduck.core.PathCache;
 import ch.cyberduck.core.Profile;
 import ch.cyberduck.core.ProtocolFactory;
-import ch.cyberduck.core.exception.LoginCanceledException;
 import ch.cyberduck.core.serializer.impl.dd.ProfilePlistReader;
 
 import org.junit.After;
@@ -61,7 +60,7 @@ public void setup() throws Exception {
                 )));
         final LoginConnectionService login = new LoginConnectionService(new DisabledLoginCallback() {
             @Override
-            public Credentials prompt(final Host bookmark, final String title, final String reason, final LoginOptions options) throws LoginCanceledException {
+            public Credentials prompt(final Host bookmark, final String title, final String reason, final LoginOptions options) {
                 fail(reason);
                 return null;
             }

diff --git a/backblaze/src/test/java/ch/cyberduck/core/b2/B2LargeUploadWriteFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/b2/B2LargeUploadWriteFeatureTest.java
@@ -35,6 +35,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.UUID;
@@ -54,7 +55,7 @@ public void testWrite() throws Exception {
         status.setTimestamp(1503654614004L);
         final Path file = new Path(container, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file));
         final OutputStream out = feature.write(file, status, new DisabledConnectionCallback());
-        final byte[] content = new RandomStringGenerator.Builder().build().generate(6 * 1024 * 1024).getBytes("UTF-8");
+        final byte[] content = new RandomStringGenerator.Builder().build().generate(6 * 1024 * 1024).getBytes(StandardCharsets.UTF_8);
         final ByteArrayInputStream in = new ByteArrayInputStream(content);
         assertEquals(content.length, IOUtils.copy(in, out));
         in.close();
@@ -78,7 +79,7 @@ public void testWriteLowerMinimumSize() throws Exception {
         status.setLength(-1L);
         final Path file = new Path(container, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file));
         final OutputStream out = feature.write(file, status, new DisabledConnectionCallback());
-        final byte[] content = new RandomStringGenerator.Builder().build().generate(2 * 1024 * 1024).getBytes("UTF-8");
+        final byte[] content = new RandomStringGenerator.Builder().build().generate(2 * 1024 * 1024).getBytes(StandardCharsets.UTF_8);
         final ByteArrayInputStream in = new ByteArrayInputStream(content);
         assertEquals(content.length, IOUtils.copy(in, out));
         in.close();

diff --git a/backblaze/src/test/java/ch/cyberduck/core/b2/B2SessionTest.java b/backblaze/src/test/java/ch/cyberduck/core/b2/B2SessionTest.java
@@ -38,7 +38,7 @@
 public class B2SessionTest {
 
     @Test
-    public void testFeatures() throws Exception {
+    public void testFeatures() {
         final Host host = new Host(new B2Protocol(), "test.cyberduck.ch");
         final Session session = new B2Session(host);
         assertNotNull(session.getFeature(AclPermission.class));

diff --git a/backblaze/src/test/java/ch/cyberduck/core/b2/B2WriteFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/b2/B2WriteFeatureTest.java
@@ -40,6 +40,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.UUID;
@@ -75,7 +76,7 @@ public void testWrite() throws Exception {
         final Path bucket = new Path("test-cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume));
         final Path test = new Path(bucket, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file));
         final TransferStatus status = new TransferStatus();
-        final byte[] content = "test".getBytes("UTF-8");
+        final byte[] content = "test".getBytes(StandardCharsets.UTF_8);
         status.setLength(content.length);
         status.setChecksum(new SHA1ChecksumCompute().compute(new ByteArrayInputStream(content), status));
         status.setTimestamp(1503654614004L);

diff --git a/backblaze/src/test/java/ch/cyberduck/core/worker/SingleTransferWorkerTest.java b/backblaze/src/test/java/ch/cyberduck/core/worker/SingleTransferWorkerTest.java
@@ -90,7 +90,7 @@ public void testTransferredSizeRepeat() throws Exception {
                 PreferencesFactory.get().getLong("b2.upload.largeobject.size"),
                 PreferencesFactory.get().getInteger("b2.upload.largeobject.concurrency")) {
                 @Override
-                protected InputStream decorate(final InputStream in, final MessageDigest digest) throws IOException {
+                protected InputStream decorate(final InputStream in, final MessageDigest digest) {
                     if(failed.get()) {
                         // Second attempt successful
                         return in;

diff --git a/binding/pom.xml b/binding/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>ch.cyberduck</groupId>
         <artifactId>parent</artifactId>
-        <version>6.9.2-SNAPSHOT</version>
+        <version>6.9.3-SNAPSHOT</version>
     </parent>
     <artifactId>binding</artifactId>
     <packaging>jar</packaging>