Skip to content

Configure how often upload progress event emitted, as well as UI revamp #18

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
joelwass wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Configure how often upload progress event emitted, as well as UI revamp #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bb1b657
UI revamp as well as update to code to allow unsubscribing from progr…
joelwass Jul 27, 2016
2cd2a6f
Update
joelwass Jul 27, 2016
54070a2
Removed console.log
joelwass Jul 27, 2016
8b001f7
Updated transfer utility for iOS progress disable
joelwass Jul 27, 2016
450bc37
Went back to sendEvents and designated 3 different event labels
joelwass Jul 28, 2016
128985a
First pass at iOS sendEvents update with diff event labels
joelwass Jul 28, 2016
7822f85
Fixed syntax for Travis CI
joelwass Jul 28, 2016
64f367b
Fixed semicolon error
joelwass Jul 28, 2016
b8a4e58
Trying to please Travis
joelwass Jul 28, 2016
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
33 changes: 18 additions & 15 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 @@ -39,14 +39,15 @@ public static enum CredentialType {

static {
// default options
nativeCredentialsOptions.put("region", "eu-west-1");
nativeCredentialsOptions.put("region", "us-east-1");
nativeCredentialsOptions.put("cognito_region", "eu-west-1");
}

private static boolean alreadyInitialize = false;
private Context context;
private AmazonS3 s3;
private TransferUtility transferUtility;
private Boolean subscribeProgress = true;

public RNS3TransferUtility(ReactApplicationContext reactContext) {
super(reactContext);
Expand Down Expand Up @@ -94,19 +95,21 @@ public void onStateChanged(int id, TransferState state) {
TransferObserver task = transferUtility.getTransferById(id);
WritableMap result = Arguments.createMap();
result.putMap("task", convertTransferObserver(task));
sendEvent("@_RNS3_Events", result);
sendEvent("@_RNS3_State_Changed", result);
}

@Override
public void onProgressChanged(int id, long bytesCurrent, long bytesTotal) {
TransferObserver task = transferUtility.getTransferById(id);
WritableMap result = Arguments.createMap();
WritableMap taskMap = convertTransferObserver(task);
if (taskMap.getDouble("bytes") <= bytesTotal) {
taskMap.putDouble("bytes", bytesCurrent);
}
result.putMap("task", taskMap);
sendEvent("@_RNS3_Events", result);
if (subscribeProgress == true) {
TransferObserver task = transferUtility.getTransferById(id);
WritableMap result = Arguments.createMap();
WritableMap taskMap = convertTransferObserver(task);
if (taskMap.getDouble("bytes") <= bytesTotal) {
taskMap.putDouble("bytes", bytesCurrent);
}
result.putMap("task", taskMap);
sendEvent("@_RNS3_Progress_Changed", result);
}
}

@Override
Expand All @@ -115,7 +118,7 @@ public void onError(int id, Exception ex) {
WritableMap result = Arguments.createMap();
result.putMap("task", convertTransferObserver(task));
result.putString("error", ex.getMessage());
sendEvent("@_RNS3_Events", result);
sendEvent("@_RNS3_Error", result);
}
});
}
Expand Down Expand Up @@ -151,14 +154,14 @@ private boolean setup(Map<String, Object> credentialsOptions) {
}
break;
// TODO: support accountId, unauthRoleArn, authRoleArn
case COGNITO:
case COGNITO:
String cognitoRegion = (String) credentialsOptions.get("cognito_region");
if (!(Boolean) credentialsOptions.get("caching")) {
credentialsProvider = new CognitoCredentialsProvider(
(String) credentialsOptions.get("identity_pool_id"),
Regions.fromName(cognitoRegion)
);
} else {
} else {
credentialsProvider = new CognitoCachingCredentialsProvider(
context,
(String) credentialsOptions.get("identity_pool_id"),
Expand All @@ -182,9 +185,10 @@ private boolean setup(Map<String, Object> credentialsOptions) {
}

@ReactMethod
public void initializeRNS3() {
public void initializeRNS3(Boolean subscribeProgress) {
if (alreadyInitialize) return;
alreadyInitialize = true;
this.subscribeProgress = subscribeProgress;
subscribeList(transferUtility.getTransfersWithType(TransferType.UPLOAD));
subscribeList(transferUtility.getTransfersWithType(TransferType.DOWNLOAD));
}
Expand Down Expand Up @@ -252,7 +256,6 @@ public void download(ReadableMap options, Promise promise) {
String bucket = options.getString("bucket");
String key = options.getString("key");
File file = new File(options.getString("file"));

TransferObserver task = transferUtility.download(bucket, key, file);
subscribe(task);
promise.resolve(convertTransferObserver(task));
Expand Down
Loading