Skip to content
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.

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

PE-5666: Release ArDrive v2.34.2 #1624

Merged
merged 5 commits into from
Feb 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions android/fastlane/metadata/android/en-US/changelogs/107.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Sets the limit for free uploads to 100KB
2 changes: 1 addition & 1 deletion assets/config/dev.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"useTurboPayment": true,
"defaultTurboUploadUrl": "https://upload.ardrive.dev",
"defaultTurboPaymentUrl": "https://payment.ardrive.dev",
"allowedDataItemSizeForTurbo": 500000,
"allowedDataItemSizeForTurbo": 100000,
"enableQuickSyncAuthoring": true,
"enableMultipleFileDownload": true,
"enableVideoPreview": true,
Expand Down
2 changes: 1 addition & 1 deletion assets/config/prod.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"useTurboPayment": true,
"defaultTurboUploadUrl": "https://upload.ardrive.io",
"defaultTurboPaymentUrl": "https://payment.ardrive.io",
"allowedDataItemSizeForTurbo": 500000,
"allowedDataItemSizeForTurbo": 100000,
"enableQuickSyncAuthoring": true,
"enableMultipleFileDownload": true,
"enableVideoPreview": true,
Expand Down
2 changes: 1 addition & 1 deletion assets/config/staging.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"useTurboPayment": true,
"defaultTurboUploadUrl": "https://upload.ardrive.io",
"defaultTurboPaymentUrl": "https://payment.ardrive.io",
"allowedDataItemSizeForTurbo": 500000,
"allowedDataItemSizeForTurbo": 100000,
"enableQuickSyncAuthoring": true,
"enableMultipleFileDownload": true,
"enableVideoPreview": true,
Expand Down
19 changes: 13 additions & 6 deletions lib/core/upload/uploader.dart
Original file line number Diff line number Diff line change
Expand Up @@ -451,12 +451,19 @@ class UploadPaymentEvaluator {
);
}

uploadMethod = await _determineUploadMethod(
turboBalance,
turboBundleSizes,
_appConfig.allowedDataItemSizeForTurbo,
_isTurboAvailableToUploadAllFiles,
);
// Checking isFreeUploadPossibleUsingTurbo uses the 100KB file size check
// against the date, but using _determineUploadMethod() additionally uses the
// Turbo bundle headers as part of the size check. A 100KB file might be
// larger than _appConfig.allowedDataItemSizeForTurbo due to the headers,
// so we need to catch that here.
uploadMethod = isFreeUploadPossibleUsingTurbo
? UploadMethod.turbo
: await _determineUploadMethod(
turboBalance,
turboBundleSizes,
_appConfig.allowedDataItemSizeForTurbo,
_isTurboAvailableToUploadAllFiles,
);

return UploadPaymentInfo(
isTurboAvailable: _isTurboAvailableToUploadAllFiles,
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Secure, permanent storage

publish_to: 'none'

version: 2.34.1
version: 2.34.2

environment:
sdk: '>=3.0.2 <4.0.0'
Expand Down
Loading