AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

fix(S3): remove S3ClientOptions

Browse Source
This commit is contained in:
Manuel Jenny 2021-04-22 11:42:18 +02:00
parent 56c60703a6
commit 4acc7f737e
No known key found for this signature in database
GPG Key ID: 1C80FE62B2BEAA18
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/src/main/java/org/cryptomator/data/cloud/s3/S3ClientFactory.java
View File

@ -7,7 +7,6 @@ import com.amazonaws.regions.Region;
import com.amazonaws.regions.Regions; import com.amazonaws.regions.Regions;
import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.AmazonS3Client; import com.amazonaws.services.s3.AmazonS3Client;
import com.amazonaws.services.s3.S3ClientOptions;
import org.cryptomator.domain.S3Cloud; import org.cryptomator.domain.S3Cloud;
import org.cryptomator.util.crypto.CredentialCryptor; import org.cryptomator.util.crypto.CredentialCryptor;
@ -26,15 +25,12 @@ class S3ClientFactory {
private AmazonS3 createApiClient(S3Cloud cloud, Context context) { private AmazonS3 createApiClient(S3Cloud cloud, Context context) {
Region region = Region.getRegion(cloud.s3Region()); Region region = Region.getRegion(cloud.s3Region());
S3ClientOptions.Builder s3ClientOptionsBuilder = S3ClientOptions.builder();
if (region == null) { if (region == null) {
region = Region.getRegion(Regions.DEFAULT_REGION); region = Region.getRegion(Regions.DEFAULT_REGION);
s3ClientOptionsBuilder.setPayloadSigningEnabled(false);
} }
AmazonS3Client client = new AmazonS3Client(new BasicAWSCredentials(decrypt(cloud.accessKey(), context), decrypt(cloud.secretKey(), context)), region); AmazonS3Client client = new AmazonS3Client(new BasicAWSCredentials(decrypt(cloud.accessKey(), context), decrypt(cloud.secretKey(), context)), region);
client.setEndpoint(cloud.s3Endpoint()); client.setEndpoint(cloud.s3Endpoint());
client.setS3ClientOptions(s3ClientOptionsBuilder.build());
return client; return client;
} }