From 6013e4200f384fe459dddafea066ae68ea697dc4 Mon Sep 17 00:00:00 2001 From: Ryosuke Ikeda Date: Wed, 23 Sep 2020 18:06:31 +0900 Subject: [PATCH 1/5] =?UTF-8?q?[#174723979]=20=E3=83=95=E3=82=A1=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=81=8C=E7=84=A1=E5=8A=B9=E3=81=AE=E9=9A=9B=E3=80=81?= =?UTF-8?q?Exception=E3=82=92=E3=82=AD=E3=83=A3=E3=83=83=E3=83=81=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybigday/rns3/RNS3TransferUtility.java | 42 +++++++++++-------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/android/src/main/java/com/mybigday/rns3/RNS3TransferUtility.java b/android/src/main/java/com/mybigday/rns3/RNS3TransferUtility.java index 447d2b2..f470320 100644 --- a/android/src/main/java/com/mybigday/rns3/RNS3TransferUtility.java +++ b/android/src/main/java/com/mybigday/rns3/RNS3TransferUtility.java @@ -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 From 390ab0aed498a7cf99bdf5f99fdaa84dedefc564 Mon Sep 17 00:00:00 2001 From: MasahiroMorita Date: Thu, 24 Sep 2020 14:26:33 +0900 Subject: [PATCH 2/5] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f86b84a..187ea00 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "scripts": { "lint": "eslint src test example/*.js", "test": "npm run lint && mocha", - "prepublish": "npm test && ./scripts/download-ios.sh 2.5.2 && rm -rf ./ios/RNS3.xcodeproj/xcuserdata ./ios/RNS3.xcodeproj/project.xcworkspace" + "prepare": "npm test && ./scripts/download-ios.sh 2.5.2 && rm -rf ./ios/RNS3.xcodeproj/xcuserdata ./ios/RNS3.xcodeproj/project.xcworkspace" }, "repository": { "type": "git", From 92407fbd6cb46157771a42c91f178de4ef263e55 Mon Sep 17 00:00:00 2001 From: MasahiroMorita Date: Thu, 24 Sep 2020 14:40:14 +0900 Subject: [PATCH 3/5] Fix package.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `prepare`スクリプトで`npm test`を廃止し、すぐにダウンロードを行うように修正 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 187ea00..728d798 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "scripts": { "lint": "eslint src test example/*.js", "test": "npm run lint && mocha", - "prepare": "npm test && ./scripts/download-ios.sh 2.5.2 && rm -rf ./ios/RNS3.xcodeproj/xcuserdata ./ios/RNS3.xcodeproj/project.xcworkspace" + "prepare": "./scripts/download-ios.sh 2.5.2 && rm -rf ./ios/RNS3.xcodeproj/xcuserdata ./ios/RNS3.xcodeproj/project.xcworkspace" }, "repository": { "type": "git", From 88fe1985d7e8840cdb80a4eb7a1e30782596a109 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A3=AE=E7=94=B0=20=E6=98=8C=E5=AE=8F?= Date: Thu, 24 Sep 2020 15:33:10 +0900 Subject: [PATCH 4/5] =?UTF-8?q?package.json=E3=81=ABscript.download?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 728d798..85d80be 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ "scripts": { "lint": "eslint src test example/*.js", "test": "npm run lint && mocha", - "prepare": "./scripts/download-ios.sh 2.5.2 && rm -rf ./ios/RNS3.xcodeproj/xcuserdata ./ios/RNS3.xcodeproj/project.xcworkspace" + "download": "./scripts/download-ios.sh 2.5.2 && 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": { "type": "git", From fc1c41ce0d69cc533d8dd362e6f9f2951a2dfc0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A3=AE=E7=94=B0=20=E6=98=8C=E5=AE=8F?= Date: Mon, 19 Apr 2021 15:48:13 +0900 Subject: [PATCH 5/5] =?UTF-8?q?AWS=20iOS=20SDK=202.19.1=E3=81=B8=E3=82=A2?= =?UTF-8?q?=E3=83=83=E3=83=97=E3=83=87=E3=83=BC=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- scripts/download-ios.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 85d80be..fbbe5c6 100644 --- a/package.json +++ b/package.json @@ -1,13 +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": "./scripts/download-ios.sh 2.5.2 && rm -rf ./ios/RNS3.xcodeproj/xcuserdata ./ios/RNS3.xcodeproj/project.xcworkspace", + "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": { diff --git a/scripts/download-ios.sh b/scripts/download-ios.sh index c9e20d6..4e12282 100755 --- a/scripts/download-ios.sh +++ b/scripts/download-ios.sh @@ -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