Skip to content

Upgrade aws sdk 2.19.1 #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MasahiroMorita wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Upgrade aws sdk 2.19.1 #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6013e42
[#174723979] ファイルが無効の際、Exceptionをキャッチするように修正
ryoosk Sep 23, 2020
9caa110
Merge pull request #1 from getgamba/fix-crash-when-get-invalid-file-uri
ryoosk Sep 24, 2020
390ab0a
Update package.json
Sep 24, 2020
92407fb
Fix package.json
Sep 24, 2020
88fe198
package.jsonにscript.downloadを追加
Sep 24, 2020
fc1c41c
AWS iOS SDK 2.19.1へアップデート
Apr 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 24 additions & 18 deletions android/src/main/java/com/mybigday/rns3/RNS3TransferUtility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,26 +232,32 @@ public void enableProgressSent(boolean enabled, Promise promise) {

@ReactMethod
public void upload(ReadableMap options, Promise promise) {
String bucket = options.getString("bucket");
String key = options.getString("key");
File file = new File(options.getString("file"));
ReadableMap meta = options.getMap("meta");
ObjectMetadata metaData = new ObjectMetadata();

TransferObserver task;
if (meta != null) {
ReadableMapKeySetIterator iter = meta.keySetIterator();
while (iter.hasNextKey()) {
String propKey = iter.nextKey();
String value = meta.getString(propKey);
metaData.addUserMetadata(propKey, value);
try {
String bucket = options.getString("bucket");
String key = options.getString("key");
File file = new File(options.getString("file"));
ReadableMap meta = options.getMap("meta");
ObjectMetadata metaData = new ObjectMetadata();

TransferObserver task;
if (meta != null) {
ReadableMapKeySetIterator iter = meta.keySetIterator();
while (iter.hasNextKey()) {
String propKey = iter.nextKey();
String value = meta.getString(propKey);
metaData.addUserMetadata(propKey, value);
}
task = transferUtility.upload(bucket, key, file, metaData);
} else {
task = transferUtility.upload(bucket, key, file);
}
task = transferUtility.upload(bucket, key, file, metaData);
} else {
task = transferUtility.upload(bucket, key, file);
subscribe(task);
promise.resolve(convertTransferObserver(task));
} catch (IllegalArgumentException e){
promise.reject(e);
} catch(Exception e){
promise.reject(e);
}
subscribe(task);
promise.resolve(convertTransferObserver(task));
}

@ReactMethod
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"name": "react-native-s3",
"version": "0.0.29",
"version": "0.0.29-1",
"description": "A React Native wrapper for AWS S3 SDK",
"main": "./src/index.js",
"files": ["android/", "ios/", "src/"],
"scripts": {
"lint": "eslint src test example/*.js",
"test": "npm run lint && mocha",
"download": "SKIP_DOWNLOAD_SDK_IF_EXISTS=1 ./scripts/download-ios.sh 2.19.1 && rm -rf ./ios/RNS3.xcodeproj/xcuserdata ./ios/RNS3.xcodeproj/project.xcworkspace",
"prepublish": "npm test && ./scripts/download-ios.sh 2.5.2 && rm -rf ./ios/RNS3.xcodeproj/xcuserdata ./ios/RNS3.xcodeproj/project.xcworkspace"
},
"repository": {
Expand Down
6 changes: 3 additions & 3 deletions scripts/download-ios.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ if [ -d ./AWSCognito.framework ]; then rm -rf ./AWSCognito.framework; fi;

curl -sS http://sdk-for-ios.amazonwebservices.com/aws-ios-sdk-$VERSION.zip > temp.zip
unzip -o temp.zip -d temp
mv temp/frameworks/AWSCore.framework ./AWSCore.framework
mv temp/frameworks/AWSS3.framework ./AWSS3.framework
mv temp/frameworks/AWSCognito.framework ./AWSCognito.framework
mv temp/aws-ios-sdk-$VERSION/frameworks/AWSCore.framework ./AWSCore.framework
mv temp/aws-ios-sdk-$VERSION/frameworks/AWSS3.framework ./AWSS3.framework
mv temp/aws-ios-sdk-$VERSION/frameworks/AWSCognito.framework ./AWSCognito.framework
rm -r temp
rm temp.zip