Skip to content

Commit 4961236

Browse files
committed
chore: update version to 0.0.5.2
1 parent 4c07ae2 commit 4961236

File tree

6 files changed

+24
-2
lines changed

6 files changed

+24
-2
lines changed

frontend/Makefile.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true
2222
CARGO_MAKE_CRATE_FS_NAME = "dart_ffi"
2323
CARGO_MAKE_CRATE_NAME = "dart-ffi"
2424
LIB_NAME = "dart_ffi"
25-
CURRENT_APP_VERSION = "0.0.5.1"
25+
CURRENT_APP_VERSION = "0.0.5.2"
2626
FEATURES = "flutter"
2727
PRODUCT_NAME = "AppFlowy"
2828
# CRATE_TYPE: https://doc.rust-lang.org/reference/linkage.html

shared-lib/flowy-folder-data-model/src/revision/app_rev.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@ pub struct AppRevision {
1717

1818
pub belongings: Vec<ViewRevision>,
1919

20+
#[serde(default)]
2021
pub version: i64,
2122

23+
#[serde(default)]
2224
pub modified_time: i64,
2325

26+
#[serde(default)]
2427
pub create_time: i64,
2528
}
2629

shared-lib/flowy-folder-data-model/src/revision/trash_rev.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ pub struct TrashRevision {
88

99
pub name: String,
1010

11+
#[serde(default)]
1112
pub modified_time: i64,
1213

14+
#[serde(default)]
1315
pub create_time: i64,
1416

1517
pub ty: TrashTypeRevision,

shared-lib/flowy-folder-data-model/src/revision/view_rev.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ pub fn gen_view_id() -> String {
99
pub struct ViewRevision {
1010
pub id: String,
1111

12-
// Maybe app_id or vi
1312
#[serde(rename = "belong_to_id")]
1413
pub app_id: String,
1514

@@ -24,8 +23,10 @@ pub struct ViewRevision {
2423

2524
pub belongings: Vec<ViewRevision>,
2625

26+
#[serde(default)]
2727
pub modified_time: i64,
2828

29+
#[serde(default)]
2930
pub create_time: i64,
3031

3132
#[serde(default)]

shared-lib/flowy-folder-data-model/src/revision/workspace_rev.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ pub struct WorkspaceRevision {
1414

1515
pub apps: Vec<AppRevision>,
1616

17+
#[serde(default)]
1718
pub modified_time: i64,
1819

20+
#[serde(default)]
1921
pub create_time: i64,
2022
}

shared-lib/flowy-sync/src/client_folder/folder_pad.rs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,20 @@ mod tests {
482482
assert_eq!(folder, folder_from_delta);
483483
}
484484

485+
#[test]
486+
fn folder_deserialize_invalid_json_test() {
487+
for json in vec![
488+
// No timestamp
489+
r#"{"workspaces":[{"id":"1","name":"first workspace","desc":"","apps":[]}],"trash":[]}"#,
490+
// Trailing characters
491+
r#"{"workspaces":[{"id":"1","name":"first workspace","desc":"","apps":[]}],"trash":[]}123"#,
492+
] {
493+
let mut deserializer = serde_json::Deserializer::from_reader(json.as_bytes());
494+
let folder_rev = FolderRevision::deserialize(&mut deserializer).unwrap();
495+
assert_eq!(folder_rev.workspaces.first().as_ref().unwrap().name, "first workspace");
496+
}
497+
}
498+
485499
#[test]
486500
fn folder_update_workspace() {
487501
let (mut folder, initial_delta, workspace) = test_folder();

0 commit comments

Comments
 (0)