641d70b76e
Settings crashed with a TypeError: the profile card passed a SepotFingerprint object where the localized string formatter expects a String (hidden behind a `dynamic` parameter). Also fixes RangeError in avatar initials (empty names, double spaces) and switches initials to grapheme clusters so emoji don't get split. New photo preview screen: a captured or picked photo no longer sends immediately — it opens in a preview with freehand drawing (7 colours, undo), draggable text overlay, 90° rotation and a caption field. Nothing leaves the device until Send is tapped. Incoming-content hardening: decryption and content processing are now separated in the delivery path. Once an envelope is decrypted the ratchet has advanced, so redelivery can never help — permanently malformed content (FormatException/TypeError) is acked and dropped instead of poisoning the queue on every reconnect. Attachment metadata now validates base64 of the crypto fields up front, and a corrupt inline thumbnail no longer breaks bubble rendering. PNG without real transparency (screenshots, edited photos) is now re-encoded as JPEG — several times smaller on the wire. Tests: 116 (new widget tests for Settings and the photo preview, AttachmentMeta wire validation).
146 lines
4.6 KiB
Dart
146 lines
4.6 KiB
Dart
import 'dart:convert';
|
|
import 'dart:typed_data';
|
|
|
|
/// Stav přenosu přílohy — čistě lokální (na drát nikdy nejde).
|
|
enum AttachmentTransferState {
|
|
/// Přijatá zpráva, blob se ještě nezačal stahovat.
|
|
pending,
|
|
downloading,
|
|
|
|
/// Blob leží (šifrovaný) v lokálním AttachmentStore.
|
|
ready,
|
|
|
|
/// Download/ověření selhalo — UI nabídne opakování.
|
|
failed,
|
|
}
|
|
|
|
/// Metadata přílohy. Klíč/nonce/digest dorazily E2E kanálem (relay je
|
|
/// nevidí); v lokální DB žijí uvnitř SQLCipher, takže at-rest jsou
|
|
/// chráněné stejně jako zbytek zpráv.
|
|
///
|
|
/// Wire tvar (pole `att` v content JSON, krátké klíče kvůli obálce):
|
|
/// { bid, k, n, d, s, mime, name?, w?, h?, th? }
|
|
class AttachmentMeta {
|
|
const AttachmentMeta({
|
|
required this.blobId,
|
|
required this.keyB64,
|
|
required this.nonceB64,
|
|
required this.digestB64,
|
|
required this.size,
|
|
required this.mime,
|
|
this.name,
|
|
this.width,
|
|
this.height,
|
|
this.thumbB64,
|
|
this.durationMs,
|
|
this.state = AttachmentTransferState.pending,
|
|
});
|
|
|
|
final String blobId; // 32 hex znaků (id na relayi i lokálně)
|
|
final String keyB64; // 32 B per-file AES klíč
|
|
final String nonceB64; // 12 B GCM nonce
|
|
final String digestB64; // SHA-256 šifrovaného blobu
|
|
final int size; // velikost PLAINTEXTU v bajtech
|
|
final String mime;
|
|
final String? name; // původní název souboru (dokumenty)
|
|
final int? width; // rozměry obrázku
|
|
final int? height;
|
|
final String? thumbB64; // JPEG náhled — jede UVNITŘ E2E plaintextu
|
|
final int? durationMs; // délka hlasové zprávy / audia
|
|
final AttachmentTransferState state;
|
|
|
|
bool get isImage => mime.startsWith('image/');
|
|
bool get isAudio => mime.startsWith('audio/');
|
|
|
|
Uint8List get key => base64Decode(keyB64);
|
|
Uint8List get nonce => base64Decode(nonceB64);
|
|
Uint8List get digest => base64Decode(digestB64);
|
|
Uint8List? get thumbnail =>
|
|
thumbB64 == null ? null : base64Decode(thumbB64!);
|
|
|
|
AttachmentMeta copyWith({AttachmentTransferState? state}) {
|
|
return AttachmentMeta(
|
|
blobId: blobId,
|
|
keyB64: keyB64,
|
|
nonceB64: nonceB64,
|
|
digestB64: digestB64,
|
|
size: size,
|
|
mime: mime,
|
|
name: name,
|
|
width: width,
|
|
height: height,
|
|
thumbB64: thumbB64,
|
|
durationMs: durationMs,
|
|
state: state ?? this.state,
|
|
);
|
|
}
|
|
|
|
/// Do content JSON zprávy (bez lokálního stavu).
|
|
Map<String, dynamic> toWire() => {
|
|
'bid': blobId,
|
|
'k': keyB64,
|
|
'n': nonceB64,
|
|
'd': digestB64,
|
|
's': size,
|
|
'mime': mime,
|
|
if (name != null) 'name': name,
|
|
if (width != null) 'w': width,
|
|
if (height != null) 'h': height,
|
|
if (thumbB64 != null) 'th': thumbB64,
|
|
if (durationMs != null) 'dur': durationMs,
|
|
};
|
|
|
|
/// Z content JSON příchozí zprávy. Remote input — tvary se validují
|
|
/// (blob_id formát hlídá AttachmentStore, tady rozsahy a typy).
|
|
factory AttachmentMeta.fromWire(Map<String, dynamic> wire) {
|
|
final size = wire['s'] as int;
|
|
if (size <= 0 || size > 512 * 1024 * 1024) {
|
|
throw const FormatException('implausible attachment size');
|
|
}
|
|
// Krypto pole MUSÍ být validní base64 (jinak je meta k ničemu);
|
|
// vyhodí FormatException → zpráva se zahodí jako vadná.
|
|
base64Decode(wire['k'] as String);
|
|
base64Decode(wire['n'] as String);
|
|
base64Decode(wire['d'] as String);
|
|
// Vadný náhled zprávu nezabíjí — UI ukáže placeholder a ostrá fotka
|
|
// se stáhne z blobu. base64Decode v build() by shodil celou bublinu.
|
|
var thumb = wire['th'] as String?;
|
|
if (thumb != null) {
|
|
try {
|
|
base64Decode(thumb);
|
|
} on FormatException {
|
|
thumb = null;
|
|
}
|
|
}
|
|
return AttachmentMeta(
|
|
blobId: wire['bid'] as String,
|
|
keyB64: wire['k'] as String,
|
|
nonceB64: wire['n'] as String,
|
|
digestB64: wire['d'] as String,
|
|
size: size,
|
|
mime: wire['mime'] as String,
|
|
name: wire['name'] as String?,
|
|
width: wire['w'] as int?,
|
|
height: wire['h'] as int?,
|
|
thumbB64: thumb,
|
|
durationMs: wire['dur'] as int?,
|
|
state: AttachmentTransferState.pending,
|
|
);
|
|
}
|
|
|
|
/// Lokální perzistence (SQLCipher) — wire tvar + stav.
|
|
Map<String, dynamic> toJson() => {
|
|
...toWire(),
|
|
'state': state.name,
|
|
};
|
|
|
|
factory AttachmentMeta.fromJson(Map<String, dynamic> json) {
|
|
final base = AttachmentMeta.fromWire(json);
|
|
final stateName = json['state'] as String?;
|
|
return base.copyWith(
|
|
state: AttachmentTransferState.values.asNameMap()[stateName] ??
|
|
AttachmentTransferState.pending,
|
|
);
|
|
}
|
|
}
|