resolved old token handling

Author: ehsan6sha

Cargo.lock

@@ -77,7 +77,7 @@ name = "encrypted_upload_test"
 path = "examples/encrypted_upload_test.rs"
 
 [workspace.package]
-version = "0.3.5"
+version = "0.3.6"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/functionland/fula-api"

Cargo.toml

@@ -6086,13 +6086,27 @@ impl EncryptedClient {
                 .map_err(ClientError::Encryption)?;
 
             let aead = Aead::new_default(&accepted_share.dek);
-            let version = accepted_share.encryption_version.unwrap_or(2);
-            let plaintext = if version >= 4 {
-                let aad = format!("fula:v4:content:{}", storage_key).into_bytes();
-                aead.decrypt_with_aad(&nonce, &data, &aad)
-            } else {
-                aead.decrypt(&nonce, &data)
-            }.map_err(ClientError::Encryption)?;
+            // `encryption_version` is Option<u8>: Some when the share creator
+            // explicitly stamped the token (new fula-flutter builds), None for
+            // tokens created between 1b82b95 (inline-nonce support, Jan 2026)
+            // and the flutter-side fix (which omit the field). For None, we
+            // try v4 AAD first (current upload format) and fall back to the
+            // pre-AAD v2 format so legacy tokens still decrypt.
+            let aad = format!("fula:v4:content:{}", storage_key).into_bytes();
+            let plaintext = match accepted_share.encryption_version {
+                Some(v) if v >= 4 => aead
+                    .decrypt_with_aad(&nonce, &data, &aad)
+                    .map_err(ClientError::Encryption)?,
+                Some(_) => aead
+                    .decrypt(&nonce, &data)
+                    .map_err(ClientError::Encryption)?,
+                None => match aead.decrypt_with_aad(&nonce, &data, &aad) {
+                    Ok(pt) => pt,
+                    Err(_) => aead
+                        .decrypt(&nonce, &data)
+                        .map_err(ClientError::Encryption)?,
+                },
+            };
 
             return Ok(Bytes::from(plaintext));
         }

crates/fula-client/src/encryption.rs

@@ -83,6 +83,13 @@ pub async fn create_share_token(
         builder = builder.nonce(nonce_str);
     }
 
+    // Stamp the content encryption version so the recipient knows whether to
+    // expect AAD binding (v4+) or bare AEAD (v2). Without this, fula-client
+    // has to guess for single-object shares, which can mis-handle edge cases.
+    if let Some(v) = enc_metadata["version"].as_u64() {
+        builder = builder.encryption_version(v as u8);
+    }
+
     // Include chunked metadata for large files (> 768KB)
     if enc_metadata.get("chunked").is_some() {
         let chunked_json = serde_json::to_string(&enc_metadata["chunked"])
@@ -190,6 +197,15 @@ pub async fn create_share_token_with_mode(
         builder
     };
 
+    // Stamp the content encryption version so the recipient knows whether to
+    // expect AAD binding (v4+) or bare AEAD (v2). Without this, fula-client
+    // has to guess for single-object shares, which can mis-handle edge cases.
+    let builder = if let Some(v) = enc_metadata["version"].as_u64() {
+        builder.encryption_version(v as u8)
+    } else {
+        builder
+    };
+
     // Include chunked metadata for large files (> 768KB)
     let builder = if enc_metadata.get("chunked").is_some() {
         let chunked_json = serde_json::to_string(&enc_metadata["chunked"])

crates/fula-flutter/src/api/sharing.rs

@@ -6,7 +6,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'fula_client'
-  s.version          = '0.3.5'
+  s.version          = '0.3.6'
   s.summary          = 'Flutter SDK for Fula decentralized storage'
   s.description      = <<-DESC
     A Flutter plugin providing client-side encryption, metadata privacy,

packages/fula_client/ios/fula_client.podspec

@@ -1,6 +1,6 @@
 name: fula_client
 description: Flutter SDK for Fula decentralized storage with client-side encryption, metadata privacy, and secure sharing.
-version: 0.3.5
+version: 0.3.6
 homepage: https://fx.land
 repository: https://github.com/functionland/fula-api
 issue_tracker: https://github.com/functionland/fula-api/issues