High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
chore: pump flutter to 3.41.6 (#27834)
shenlong2a47c35eb7dd
diff --git a/mobile/.isar b/mobile/.isardeleted file mode 160000index 6643d064ab..0000000000--- a/mobile/.isar+++ /dev/null@@ -1 +0,0 @@-Subproject commit 6643d064abf22606b6c6a741ea873e4781115ef4diff --git a/mobile/.isar-cargo.lock b/mobile/.isar-cargo.lockdeleted file mode 100644index a7b1dd37b9..0000000000--- a/mobile/.isar-cargo.lock+++ /dev/null@@ -1,859 +0,0 @@-# This file is automatically @generated by Cargo.-# It is not intended for manual editing.-version = 3--[[package]]-name = "aho-corasick"-version = "1.1.3"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"-dependencies = [- "memchr",-]--[[package]]-name = "autocfg"-version = "1.3.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"--[[package]]-name = "bindgen"-version = "0.63.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885"-dependencies = [- "bitflags 1.3.2",- "cexpr",- "clang-sys",- "lazy_static",- "lazycell",- "peeking_take_while",- "proc-macro2",- "quote",- "regex",- "rustc-hash",- "shlex",- "syn 1.0.109",-]--[[package]]-name = "bitflags"-version = "1.3.2"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"--[[package]]-name = "bitflags"-version = "2.6.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"--[[package]]-name = "block"-version = "0.1.6"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"--[[package]]-name = "byteorder"-version = "1.5.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"--[[package]]-name = "bytes"-version = "1.7.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"--[[package]]-name = "cc"-version = "1.1.19"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "2d74707dde2ba56f86ae90effb3b43ddd369504387e718014de010cec7959800"-dependencies = [- "shlex",-]--[[package]]-name = "cesu8"-version = "1.1.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"--[[package]]-name = "cexpr"-version = "0.6.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"-dependencies = [- "nom",-]--[[package]]-name = "cfg-if"-version = "1.0.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"--[[package]]-name = "clang-sys"-version = "1.8.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"-dependencies = [- "glob",- "libc",- "libloading",-]--[[package]]-name = "cmake"-version = "0.1.51"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a"-dependencies = [- "cc",-]--[[package]]-name = "combine"-version = "4.6.7"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"-dependencies = [- "bytes",- "memchr",-]--[[package]]-name = "crossbeam-channel"-version = "0.5.13"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"-dependencies = [- "crossbeam-utils",-]--[[package]]-name = "crossbeam-utils"-version = "0.8.20"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"--[[package]]-name = "dirs"-version = "4.0.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"-dependencies = [- "dirs-sys",-]--[[package]]-name = "dirs-sys"-version = "0.3.7"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"-dependencies = [- "libc",- "redox_users",- "winapi",-]--[[package]]-name = "doc-comment"-version = "0.3.3"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"--[[package]]-name = "either"-version = "1.13.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"--[[package]]-name = "enum_dispatch"-version = "0.3.13"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd"-dependencies = [- "once_cell",- "proc-macro2",- "quote",- "syn 2.0.77",-]--[[package]]-name = "float_next_after"-version = "0.1.5"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4fc612c5837986b7104a87a0df74a5460931f1c5274be12f8d0f40aa2f30d632"-dependencies = [- "num-traits",-]--[[package]]-name = "getrandom"-version = "0.2.15"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"-dependencies = [- "cfg-if",- "libc",- "wasi",-]--[[package]]-name = "glob"-version = "0.3.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"--[[package]]-name = "heck"-version = "0.4.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"--[[package]]-name = "hermit-abi"-version = "0.3.9"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"--[[package]]-name = "intmap"-version = "2.0.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ee87fd093563344074bacf24faa0bb0227fb6969fb223e922db798516de924d6"--[[package]]-name = "isar"-version = "0.0.0"-dependencies = [- "dirs",- "intmap",- "isar-core",- "itertools",- "jni",- "ndk-context",- "objc",- "objc-foundation",- "once_cell",- "paste",- "serde_json",- "threadpool",- "unicode-segmentation",-]--[[package]]-name = "isar-core"-version = "0.0.0"-dependencies = [- "byteorder",- "cfg-if",- "crossbeam-channel",- "enum_dispatch",- "float_next_after",- "intmap",- "itertools",- "libc",- "mdbx-sys",- "once_cell",- "paste",- "rand",- "serde",- "serde_json",- "snafu",- "widestring",- "xxhash-rust",-]--[[package]]-name = "itertools"-version = "0.10.5"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"-dependencies = [- "either",-]--[[package]]-name = "itoa"-version = "1.0.11"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"--[[package]]-name = "jni"-version = "0.20.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c"-dependencies = [- "cesu8",- "combine",- "jni-sys",- "log",- "thiserror",- "walkdir",-]--[[package]]-name = "jni-sys"-version = "0.3.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"--[[package]]-name = "lazy_static"-version = "1.5.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"--[[package]]-name = "lazycell"-version = "1.3.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"--[[package]]-name = "libc"-version = "0.2.158"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"--[[package]]-name = "libloading"-version = "0.8.5"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"-dependencies = [- "cfg-if",- "windows-targets",-]--[[package]]-name = "libredox"-version = "0.1.3"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"-dependencies = [- "bitflags 2.6.0",- "libc",-]--[[package]]-name = "log"-version = "0.4.22"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"--[[package]]-name = "malloc_buf"-version = "0.0.6"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"-dependencies = [- "libc",-]--[[package]]-name = "mdbx-sys"-version = "0.0.0"-dependencies = [- "bindgen",- "cc",- "cmake",- "libc",-]--[[package]]-name = "memchr"-version = "2.7.4"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"--[[package]]-name = "minimal-lexical"-version = "0.2.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"--[[package]]-name = "ndk-context"-version = "0.1.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"--[[package]]-name = "nom"-version = "7.1.3"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"-dependencies = [- "memchr",- "minimal-lexical",-]--[[package]]-name = "num-traits"-version = "0.2.19"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"-dependencies = [- "autocfg",-]--[[package]]-name = "num_cpus"-version = "1.16.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"-dependencies = [- "hermit-abi",- "libc",-]--[[package]]-name = "objc"-version = "0.2.7"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"-dependencies = [- "malloc_buf",-]--[[package]]-name = "objc-foundation"-version = "0.1.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"-dependencies = [- "block",- "objc",- "objc_id",-]--[[package]]-name = "objc_id"-version = "0.1.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"-dependencies = [- "objc",-]--[[package]]-name = "once_cell"-version = "1.20.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "33ea5043e58958ee56f3e15a90aee535795cd7dfd319846288d93c5b57d85cbe"--[[package]]-name = "paste"-version = "1.0.15"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"--[[package]]-name = "peeking_take_while"-version = "0.1.2"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"--[[package]]-name = "ppv-lite86"-version = "0.2.20"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"-dependencies = [- "zerocopy",-]--[[package]]-name = "proc-macro2"-version = "1.0.86"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"-dependencies = [- "unicode-ident",-]--[[package]]-name = "quote"-version = "1.0.37"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"-dependencies = [- "proc-macro2",-]--[[package]]-name = "rand"-version = "0.8.5"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"-dependencies = [- "libc",- "rand_chacha",- "rand_core",-]--[[package]]-name = "rand_chacha"-version = "0.3.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"-dependencies = [- "ppv-lite86",- "rand_core",-]--[[package]]-name = "rand_core"-version = "0.6.4"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"-dependencies = [- "getrandom",-]--[[package]]-name = "redox_users"-version = "0.4.6"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"-dependencies = [- "getrandom",- "libredox",- "thiserror",-]--[[package]]-name = "regex"-version = "1.10.6"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"-dependencies = [- "aho-corasick",- "memchr",- "regex-automata",- "regex-syntax",-]--[[package]]-name = "regex-automata"-version = "0.4.7"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"-dependencies = [- "aho-corasick",- "memchr",- "regex-syntax",-]--[[package]]-name = "regex-syntax"-version = "0.8.4"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"--[[package]]-name = "rustc-hash"-version = "1.1.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"--[[package]]-name = "ryu"-version = "1.0.18"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"--[[package]]-name = "same-file"-version = "1.0.6"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"-dependencies = [- "winapi-util",-]--[[package]]-name = "serde"-version = "1.0.210"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"-dependencies = [- "serde_derive",-]--[[package]]-name = "serde_derive"-version = "1.0.210"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"-dependencies = [- "proc-macro2",- "quote",- "syn 2.0.77",-]--[[package]]-name = "serde_json"-version = "1.0.128"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"-dependencies = [- "itoa",- "memchr",- "ryu",- "serde",-]--[[package]]-name = "shlex"-version = "1.3.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"--[[package]]-name = "snafu"-version = "0.7.5"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6"-dependencies = [- "doc-comment",- "snafu-derive",-]--[[package]]-name = "snafu-derive"-version = "0.7.5"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf"-dependencies = [- "heck",- "proc-macro2",- "quote",- "syn 1.0.109",-]--[[package]]-name = "syn"-version = "1.0.109"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"-dependencies = [- "proc-macro2",- "quote",- "unicode-ident",-]--[[package]]-name = "syn"-version = "2.0.77"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"-dependencies = [- "proc-macro2",- "quote",- "unicode-ident",-]--[[package]]-name = "thiserror"-version = "1.0.63"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"-dependencies = [- "thiserror-impl",-]--[[package]]-name = "thiserror-impl"-version = "1.0.63"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"-dependencies = [- "proc-macro2",- "quote",- "syn 2.0.77",-]--[[package]]-name = "threadpool"-version = "1.8.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"-dependencies = [- "num_cpus",-]--[[package]]-name = "unicode-ident"-version = "1.0.13"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"--[[package]]-name = "unicode-segmentation"-version = "1.12.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"--[[package]]-name = "walkdir"-version = "2.5.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"-dependencies = [- "same-file",- "winapi-util",-]--[[package]]-name = "wasi"-version = "0.11.0+wasi-snapshot-preview1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"--[[package]]-name = "widestring"-version = "1.1.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"--[[package]]-name = "winapi"-version = "0.3.9"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"-dependencies = [- "winapi-i686-pc-windows-gnu",- "winapi-x86_64-pc-windows-gnu",-]--[[package]]-name = "winapi-i686-pc-windows-gnu"-version = "0.4.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"--[[package]]-name = "winapi-util"-version = "0.1.9"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"-dependencies = [- "windows-sys",-]--[[package]]-name = "winapi-x86_64-pc-windows-gnu"-version = "0.4.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"--[[package]]-name = "windows-sys"-version = "0.59.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"-dependencies = [- "windows-targets",-]--[[package]]-name = "windows-targets"-version = "0.52.6"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"-dependencies = [- "windows_aarch64_gnullvm",- "windows_aarch64_msvc",- "windows_i686_gnu",- "windows_i686_gnullvm",- "windows_i686_msvc",- "windows_x86_64_gnu",- "windows_x86_64_gnullvm",- "windows_x86_64_msvc",-]--[[package]]-name = "windows_aarch64_gnullvm"-version = "0.52.6"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"--[[package]]-name = "windows_aarch64_msvc"-version = "0.52.6"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"--[[package]]-name = "windows_i686_gnu"-version = "0.52.6"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"--[[package]]-name = "windows_i686_gnullvm"-version = "0.52.6"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"--[[package]]-name = "windows_i686_msvc"-version = "0.52.6"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"--[[package]]-name = "windows_x86_64_gnu"-version = "0.52.6"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"--[[package]]-name = "windows_x86_64_gnullvm"-version = "0.52.6"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"--[[package]]-name = "windows_x86_64_msvc"-version = "0.52.6"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"--[[package]]-name = "xxhash-rust"-version = "0.8.12"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984"--[[package]]-name = "zerocopy"-version = "0.7.35"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"-dependencies = [- "byteorder",- "zerocopy-derive",-]--[[package]]-name = "zerocopy-derive"-version = "0.7.35"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"-dependencies = [- "proc-macro2",- "quote",- "syn 2.0.77",-]diff --git a/mobile/.vscode/settings.json b/mobile/.vscode/settings.jsonindex eafbef8102..1bb94819e5 100644--- a/mobile/.vscode/settings.json+++ b/mobile/.vscode/settings.json@@ -1,5 +1,5 @@{- "dart.flutterSdkPath": ".fvm/versions/3.35.7",+ "dart.flutterSdkPath": ".fvm/versions/3.41.6","dart.lineLength": 120,"[dart]": {"editor.rulers": [diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradleindex ecc0f8420f..e879b54ae5 100644--- a/mobile/android/app/build.gradle+++ b/mobile/android/app/build.gradle@@ -1,27 +1,10 @@plugins {- id "com.android.application"- id "kotlin-android"+ alias(libs.plugins.android.application)+ alias(libs.plugins.kotlin.android)id "dev.flutter.flutter-gradle-plugin"- id 'com.google.devtools.ksp'- id 'org.jetbrains.kotlin.plugin.serialization'- id 'org.jetbrains.kotlin.plugin.compose' version '2.0.20' // this version matches your Kotlin version--}--def localProperties = new Properties()-def localPropertiesFile = rootProject.file('local.properties')-if (localPropertiesFile.exists()) {- localPropertiesFile.withInputStream { localProperties.load(it) }-}--def flutterVersionCode = localProperties.getProperty('flutter.versionCode')-if (flutterVersionCode == null) {- flutterVersionCode = '1'-}--def flutterVersionName = localProperties.getProperty('flutter.versionName')-if (flutterVersionName == null) {- flutterVersionName = '1.0'+ alias(libs.plugins.ksp)+ alias(libs.plugins.kotlin.serialization)+ alias(libs.plugins.kotlin.compose)}def keystoreProperties = new Properties()@@ -31,8 +14,8 @@ if (keystorePropertiesFile.exists()) {}android {- compileSdkVersion 35- ndkVersion = "28.2.13676358"+ compileSdk = flutter.compileSdkVersion+ ndkVersion = flutter.ndkVersioncompileOptions {sourceCompatibility JavaVersion.VERSION_17@@ -55,10 +38,10 @@ android {defaultConfig {applicationId "app.alextran.immich"- minSdkVersion 26- targetSdkVersion 35- versionCode flutterVersionCode.toInteger()- versionName flutterVersionName+ minSdk = 26+ targetSdk = flutter.targetSdkVersion+ versionCode flutter.versionCode+ versionName flutter.versionName}signingConfigs {@@ -67,10 +50,10 @@ android {def keyPasswordVal = System.getenv("ANDROID_KEY_PASSWORD")def storePasswordVal = System.getenv("ANDROID_STORE_PASSWORD")- keyAlias keyAliasVal ? keyAliasVal : keystoreProperties['keyAlias']- keyPassword keyPasswordVal ? keyPasswordVal : keystoreProperties['keyPassword']- storeFile file("../key.jks") ? file("../key.jks") : file(keystoreProperties['storeFile'])- storePassword storePasswordVal ? storePasswordVal : keystoreProperties['storePassword']+ keyAlias keyAliasVal ?: keystoreProperties['keyAlias']+ keyPassword keyPasswordVal ?: keystoreProperties['keyPassword']+ storeFile file("../key.jks").exists() ? file("../key.jks") : file(keystoreProperties['storeFile'] ?: '../key.jks')+ storePassword storePasswordVal ?: keystoreProperties['storePassword']}}@@ -99,43 +82,31 @@ flutter {}dependencies {- def kotlin_version = '2.0.20'- def kotlin_coroutines_version = '1.9.0'- def work_version = '2.9.1'- def concurrent_version = '1.2.0'- def guava_version = '33.3.1-android'- def glide_version = '4.16.0'- def serialization_version = '1.8.1'- def compose_version = '1.1.1'- def gson_version = '2.10.1'- def okhttp_version = '4.12.0'-- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"- implementation "com.squareup.okhttp3:okhttp:$okhttp_version"- implementation 'org.chromium.net:cronet-embedded:143.7445.0'- implementation("androidx.media3:media3-datasource-okhttp:1.10.0")- implementation("androidx.media3:media3-datasource-cronet:1.10.0")- implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"- implementation "androidx.work:work-runtime-ktx:$work_version"- implementation "androidx.concurrent:concurrent-futures:$concurrent_version"- implementation "com.google.guava:guava:$guava_version"- implementation "com.github.bumptech.glide:glide:$glide_version"- implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version"-- ksp "com.github.bumptech.glide:ksp:$glide_version"- coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.2'+ implementation libs.okhttp+ implementation libs.cronet.embedded+ implementation libs.media3.datasource.okhttp+ implementation libs.media3.datasource.cronet+ implementation libs.kotlinx.coroutines.android+ implementation libs.work.runtime.ktx+ implementation libs.concurrent.futures+ implementation libs.guava+ implementation libs.glide+ implementation libs.kotlinx.serialization.json++ ksp libs.glide.ksp+ coreLibraryDesugaring libs.desugar.jdk.libs//Glance Widget- implementation "androidx.glance:glance-appwidget:$compose_version"- implementation "com.google.code.gson:gson:$gson_version"+ implementation libs.glance.appwidget+ implementation libs.gson// Glance Configure- implementation "androidx.activity:activity-compose:1.8.2"- implementation "androidx.compose.ui:ui:$compose_version"- implementation "androidx.compose.ui:ui-tooling:$compose_version"- implementation "androidx.compose.material3:material3:1.2.1"- implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"- implementation "com.google.android.material:material:1.12.0"+ implementation libs.activity.compose+ implementation libs.compose.ui+ implementation libs.compose.ui.tooling+ implementation libs.compose.material3+ implementation libs.lifecycle.runtime.ktx+ implementation libs.material}// This is uncommented in F-Droid build scriptdiff --git a/mobile/android/app/src/main/AndroidManifest.xml b/mobile/android/app/src/main/AndroidManifest.xmlindex db3859ab6e..436d8c492d 100644--- a/mobile/android/app/src/main/AndroidManifest.xml+++ b/mobile/android/app/src/main/AndroidManifest.xml@@ -39,10 +39,6 @@android:exported="false"android:foregroundServiceType="dataSync|shortService" />- <meta-data- android:name="io.flutter.embedding.android.EnableImpeller"- android:value="false" />-<meta-dataandroid:name="com.google.firebase.messaging.default_notification_icon"android:resource="@drawable/notification_icon" />diff --git a/mobile/android/build.gradle b/mobile/android/build.gradleindex 719c946bd6..2663154d9d 100644--- a/mobile/android/build.gradle+++ b/mobile/android/build.gradle@@ -1,6 +1,4 @@allprojects {- ext.kotlin_version = '2.2.20'-repositories {google()mavenCentral()@@ -10,22 +8,7 @@ allprojects {rootProject.buildDir = '../build'subprojects {- // fix for verifyReleaseResources- // ============- afterEvaluate { project ->- if (project.plugins.hasPlugin("com.android.application") ||- project.plugins.hasPlugin("com.android.library")) {- project.android {- compileSdkVersion 36- buildToolsVersion "36.0.0"- }- }- }- // ============project.buildDir = "${rootProject.buildDir}/${project.name}"-}--subprojects {project.evaluationDependsOn(':app')}@@ -36,4 +19,3 @@ tasks.register("clean", Delete) {tasks.named('wrapper') {distributionType = Wrapper.DistributionType.ALL}-diff --git a/mobile/android/gradle/libs.versions.toml b/mobile/android/gradle/libs.versions.tomlnew file mode 100644index 0000000000..0161433c05--- /dev/null+++ b/mobile/android/gradle/libs.versions.toml@@ -0,0 +1,51 @@+[versions]+agp = "8.11.2"+kotlin = "2.2.20"+ksp = "2.2.20-2.0.3"+coroutines = "1.9.0"+work = "2.9.1"+concurrent = "1.2.0"+guava = "33.3.1-android"+glide = "4.16.0"+serialization-json = "1.8.1"+glance = "1.1.1"+gson = "2.10.1"+okhttp = "4.12.0"+cronet = "143.7445.0"+media3 = "1.10.0"+desugar = "2.1.2"+activity-compose = "1.8.2"+compose-ui = "1.1.1"+material3 = "1.2.1"+lifecycle = "2.6.2"+material = "1.12.0"++[libraries]+okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }+cronet-embedded = { module = "org.chromium.net:cronet-embedded", version.ref = "cronet" }+media3-datasource-okhttp = { module = "androidx.media3:media3-datasource-okhttp", version.ref = "media3" }+media3-datasource-cronet = { module = "androidx.media3:media3-datasource-cronet", version.ref = "media3" }+kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }+work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "work" }+concurrent-futures = { module = "androidx.concurrent:concurrent-futures", version.ref = "concurrent" }+guava = { module = "com.google.guava:guava", version.ref = "guava" }+glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }+glide-ksp = { module = "com.github.bumptech.glide:ksp", version.ref = "glide" }+kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization-json" }+desugar-jdk-libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar" }+glance-appwidget = { module = "androidx.glance:glance-appwidget", version.ref = "glance" }+gson = { module = "com.google.code.gson:gson", version.ref = "gson" }+activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activity-compose" }+compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose-ui" }+compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose-ui" }+compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "material3" }+lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }+material = { module = "com.google.android.material:material", version.ref = "material" }++[plugins]+android-application = { id = "com.android.application", version.ref = "agp" }+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }+# TODO: update to version.ref = "kotlin" when background_downloader is removed+kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version = "1.9.22" }+kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }+ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }diff --git a/mobile/android/gradle/wrapper/gradle-wrapper.properties b/mobile/android/gradle/wrapper/gradle-wrapper.propertiesindex ed4c299adb..6514f919fd 100644--- a/mobile/android/gradle/wrapper/gradle-wrapper.properties+++ b/mobile/android/gradle/wrapper/gradle-wrapper.properties@@ -1,6 +1,6 @@distributionBase=GRADLE_USER_HOMEdistributionPath=wrapper/dists-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zipnetworkTimeout=10000validateDistributionUrl=truezipStoreBase=GRADLE_USER_HOMEdiff --git a/mobile/android/settings.gradle b/mobile/android/settings.gradleindex fbed55a3e3..664cb9c263 100644--- a/mobile/android/settings.gradle+++ b/mobile/android/settings.gradle@@ -18,10 +18,11 @@ pluginManagement {plugins {id "dev.flutter.flutter-plugin-loader" version "1.0.0"- id "com.android.application" version '8.11.2' apply false+ id "com.android.application" version "8.11.2" apply falseid "org.jetbrains.kotlin.android" version "2.2.20" apply false- id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.22' apply false- id 'com.google.devtools.ksp' version '2.2.20-2.0.3' apply false+ // TODO: update to match kotlin version when background_downloader is removed+ id "org.jetbrains.kotlin.plugin.serialization" version "1.9.22" apply false+ id "com.google.devtools.ksp" version "2.2.20-2.0.3" apply false}include ":app"diff --git a/mobile/dart_test.yaml b/mobile/dart_test.yamldeleted file mode 100644index fa54954090..0000000000--- a/mobile/dart_test.yaml+++ /dev/null@@ -1,3 +0,0 @@-# Used to filter out tags from test runs-tags:- widget:diff --git a/mobile/ios/Flutter/AppFrameworkInfo.plist b/mobile/ios/Flutter/AppFrameworkInfo.plistindex 1dc6cf7652..391a902b2b 100644--- a/mobile/ios/Flutter/AppFrameworkInfo.plist+++ b/mobile/ios/Flutter/AppFrameworkInfo.plist@@ -20,7 +20,5 @@<string>????</string><key>CFBundleVersion</key><string>1.0</string>- <key>MinimumOSVersion</key>- <string>13.0</string></dict></plist>diff --git a/mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolvedindex 432e81234d..187a67cb27 100644--- a/mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved+++ b/mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved@@ -19,31 +19,13 @@"version" : "7.8.0"}},- {- "identity" : "opencombine",- "kind" : "remoteSourceControl",- "location" : "https://github.com/OpenCombine/OpenCombine.git",- "state" : {- "revision" : "8576f0d579b27020beccbccc3ea6844f3ddfc2c2",- "version" : "0.14.0"- }- },{"identity" : "sqlite-data","kind" : "remoteSourceControl","location" : "https://github.com/pointfreeco/sqlite-data","state" : {- "revision" : "b66b894b9a5710f1072c8eb6448a7edfc2d743d9",- "version" : "1.3.0"- }- },- {- "identity" : "swift-case-paths",- "kind" : "remoteSourceControl",- "location" : "https://github.com/pointfreeco/swift-case-paths",- "state" : {- "revision" : "6989976265be3f8d2b5802c722f9ba168e227c71",- "version" : "1.7.2"+ "revision" : "da3a94ed49c7a30d82853de551c07a93196e8cab",+ "version" : "1.6.1"}},{@@ -96,8 +78,8 @@"kind" : "remoteSourceControl","location" : "https://github.com/apple/swift-http-structured-headers.git","state" : {- "revision" : "a9f3c352f4d46afd155e00b3c6e85decae6bcbeb",- "version" : "1.5.0"+ "revision" : "76d7627bd88b47bf5a0f8497dd244885960dde0b",+ "version" : "1.6.0"}},{@@ -141,8 +123,8 @@"kind" : "remoteSourceControl","location" : "https://github.com/pointfreeco/swift-structured-queries","state" : {- "revision" : "9c84335373bae5f5c9f7b5f0adf3ae10f2cab5b9",- "version" : "0.25.2"+ "revision" : "8da8818fccd9959bd683934ddc62cf45bb65b3c8",+ "version" : "0.31.1"}},{@@ -154,15 +136,6 @@"version" : "602.0.0"}},- {- "identity" : "swift-tagged",- "kind" : "remoteSourceControl",- "location" : "https://github.com/pointfreeco/swift-tagged",- "state" : {- "revision" : "3907a9438f5b57d317001dc99f3f11b46882272b",- "version" : "0.10.0"- }- },{"identity" : "xctest-dynamic-overlay","kind" : "remoteSourceControl",diff --git a/mobile/ios/Runner/AppDelegate.swift b/mobile/ios/Runner/AppDelegate.swiftindex 2d41fd541e..627e1575eb 100644--- a/mobile/ios/Runner/AppDelegate.swift+++ b/mobile/ios/Runner/AppDelegate.swift@@ -9,7 +9,7 @@ import shared_preferences_foundationimport UIKit@main-@objc class AppDelegate: FlutterAppDelegate {+@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate {override func application(_ application: UIApplication,didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?@@ -21,23 +21,26 @@ import UIKitSwiftNativeVideoPlayerPlugin.cookieStorage = URLSessionManager.cookieStorageURLSessionManager.patchBackgroundDownloader()- GeneratedPluginRegistrant.register(with: self)- let controller: FlutterViewController = window?.rootViewController as! FlutterViewController- AppDelegate.registerPlugins(with: controller.engine, controller: controller)BackgroundWorkerApiImpl.registerBackgroundWorkers()return super.application(application, didFinishLaunchingWithOptions: launchOptions)}-- public static func registerPlugins(with engine: FlutterEngine, controller: FlutterViewController?) {- NativeSyncApiImpl.register(with: engine.registrar(forPlugin: NativeSyncApiImpl.name)!)- LocalImageApiSetup.setUp(binaryMessenger: engine.binaryMessenger, api: LocalImageApiImpl())- RemoteImageApiSetup.setUp(binaryMessenger: engine.binaryMessenger, api: RemoteImageApiImpl())- BackgroundWorkerFgHostApiSetup.setUp(binaryMessenger: engine.binaryMessenger, api: BackgroundWorkerApiImpl())- ConnectivityApiSetup.setUp(binaryMessenger: engine.binaryMessenger, api: ConnectivityApiImpl())- NetworkApiSetup.setUp(binaryMessenger: engine.binaryMessenger, api: NetworkApiImpl(viewController: controller))++ func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) {+ GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry)+ let messenger = engineBridge.applicationRegistrar.messenger()+ AppDelegate.registerPlugins(with: engineBridge.pluginRegistry, messenger: messenger)+ }++ public static func registerPlugins(with registry: FlutterPluginRegistry, messenger: FlutterBinaryMessenger) {+ NativeSyncApiImpl.register(with: registry.registrar(forPlugin: NativeSyncApiImpl.name)!)+ LocalImageApiSetup.setUp(binaryMessenger: messenger, api: LocalImageApiImpl())+ RemoteImageApiSetup.setUp(binaryMessenger: messenger, api: RemoteImageApiImpl())+ BackgroundWorkerFgHostApiSetup.setUp(binaryMessenger: messenger, api: BackgroundWorkerApiImpl())+ ConnectivityApiSetup.setUp(binaryMessenger: messenger, api: ConnectivityApiImpl())+ NetworkApiSetup.setUp(binaryMessenger: messenger, api: NetworkApiImpl())}-+public static func cancelPlugins(with engine: FlutterEngine) {(engine.valuePublished(byPlugin: NativeSyncApiImpl.name) as? NativeSyncApiImpl)?.detachFromEngine()}diff --git a/mobile/ios/Runner/Background/BackgroundWorker.swift b/mobile/ios/Runner/Background/BackgroundWorker.swiftindex 85e1a55d3d..c5b5e1778a 100644--- a/mobile/ios/Runner/Background/BackgroundWorker.swift+++ b/mobile/ios/Runner/Background/BackgroundWorker.swift@@ -95,7 +95,7 @@ class BackgroundWorker: BackgroundWorkerBgHostApi {// Register plugins in the new engineGeneratedPluginRegistrant.register(with: engine)// Register custom plugins- AppDelegate.registerPlugins(with: engine, controller: nil)+ AppDelegate.registerPlugins(with: engine, messenger: engine.binaryMessenger)flutterApi = BackgroundWorkerFlutterApi(binaryMessenger: engine.binaryMessenger)BackgroundWorkerBgHostApiSetup.setUp(binaryMessenger: engine.binaryMessenger, api: self)diff --git a/mobile/ios/Runner/Core/NetworkApiImpl.swift b/mobile/ios/Runner/Core/NetworkApiImpl.swiftindex 3c4be8e718..82a913d837 100644--- a/mobile/ios/Runner/Core/NetworkApiImpl.swift+++ b/mobile/ios/Runner/Core/NetworkApiImpl.swift@@ -10,11 +10,14 @@ enum ImportError: Error {}class NetworkApiImpl: NetworkApi {- weak var viewController: UIViewController?private var activeImporter: CertImporter?-- init(viewController: UIViewController?) {- self.viewController = viewController++ private var viewController: UIViewController? {+ UIApplication.shared.connectedScenes+ .compactMap { $0 as? UIWindowScene }+ .flatMap { $0.windows }+ .first { $0.isKeyWindow }?+ .rootViewController}func selectCertificate(promptText: ClientCertPrompt, completion: @escaping (Result<Void, any Error>) -> Void) {diff --git a/mobile/ios/Runner/Info.plist b/mobile/ios/Runner/Info.plistindex 9d194ad665..a37b46b5bc 100644--- a/mobile/ios/Runner/Info.plist+++ b/mobile/ios/Runner/Info.plist@@ -106,8 +106,6 @@</array><key>CFBundleVersion</key><string>240</string>- <key>FLTEnableImpeller</key>- <true/><key>ITSAppUsesNonExemptEncryption</key><false/><key>LSApplicationQueriesSchemes</key>@@ -178,6 +176,27 @@<string>UIInterfaceOrientationLandscapeLeft</string><string>UIInterfaceOrientationLandscapeRight</string></array>+ <key>UIApplicationSceneManifest</key>+ <dict>+ <key>UIApplicationSupportsMultipleScenes</key>+ <false/>+ <key>UISceneConfigurations</key>+ <dict>+ <key>UIWindowSceneSessionRoleApplication</key>+ <array>+ <dict>+ <key>UISceneClassName</key>+ <string>UIWindowScene</string>+ <key>UISceneDelegateClassName</key>+ <string>FlutterSceneDelegate</string>+ <key>UISceneConfigurationName</key>+ <string>flutter</string>+ <key>UISceneStoryboardFile</key>+ <string>Main</string>+ </dict>+ </array>+ </dict>+ </dict><key>UIViewControllerBasedStatusBarAppearance</key><true/><key>io.flutter.embedded_views_preview</key>diff --git a/mobile/lib/infrastructure/repositories/db.repository.dart b/mobile/lib/infrastructure/repositories/db.repository.dartindex eca8810b91..eabefbb806 100644--- a/mobile/lib/infrastructure/repositories/db.repository.dart+++ b/mobile/lib/infrastructure/repositories/db.repository.dart@@ -1,3 +1,5 @@+// ignore_for_file: experimental_member_use+import 'dart:async';import 'package:drift/drift.dart';diff --git a/mobile/mise.toml b/mobile/mise.tomlindex 88b8902053..4d20a0a149 100644--- a/mobile/mise.toml+++ b/mobile/mise.toml@@ -1,5 +1,5 @@[tools]-flutter = "3.35.7"+flutter = "3.41.6"[tools."github:CQLabs/homebrew-dcm"]version = "1.30.0"@@ -40,7 +40,13 @@ depends = [[tasks."codegen:translation"]alias = "translation"description = "Generate translations from i18n JSONs"-run = [{ task = "//:i18n:format-fix" }, { tasks = ["i18n:loader", "i18n:keys"] }]+run = [+ { task = "//:i18n:format-fix" },+ { tasks = [+ "i18n:loader",+ "i18n:keys",+ ] },+][tasks."codegen:app-icon"]description = "Generate app icons"diff --git a/mobile/pubspec.lock b/mobile/pubspec.lockindex f2caf05be8..4e21ce7e64 100644--- a/mobile/pubspec.lock+++ b/mobile/pubspec.lock@@ -213,10 +213,10 @@ packages:dependency: transitivedescription:name: characters- sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803+ sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716burl: "https://pub.dev"source: hosted- version: "1.4.0"+ version: "1.4.1"charcode:dependency: transitivedescription:@@ -1136,26 +1136,26 @@ packages:dependency: transitivedescription:name: matcher- sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2+ sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861url: "https://pub.dev"source: hosted- version: "0.12.17"+ version: "0.12.19"material_color_utilities:dependency: transitivedescription:name: material_color_utilities- sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec+ sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"url: "https://pub.dev"source: hosted- version: "0.11.1"+ version: "0.13.0"meta:dependency: transitivedescription:name: meta- sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c+ sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"url: "https://pub.dev"source: hosted- version: "1.16.0"+ version: "1.17.0"mime:dependency: transitivedescription:@@ -1855,10 +1855,10 @@ packages:dependency: transitivedescription:name: test_api- sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"+ sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a"url: "https://pub.dev"source: hosted- version: "0.7.6"+ version: "0.7.10"thumbhash:dependency: "direct main"description:@@ -2132,5 +2132,5 @@ packages:source: hostedversion: "3.1.3"sdks:- dart: ">=3.9.0 <4.0.0"- flutter: ">=3.35.7"+ dart: ">=3.11.0 <4.0.0"+ flutter: "3.41.6"diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yamlindex 5eb4deb924..6f1deaba4a 100644--- a/mobile/pubspec.yaml+++ b/mobile/pubspec.yaml@@ -5,8 +5,8 @@ publish_to: 'none'version: 2.7.5+3046environment:- sdk: '>=3.8.0 <4.0.0'- flutter: 3.35.7+ sdk: '>=3.11.0 <4.0.0'+ flutter: 3.41.6dependencies:async: ^2.13.0diff --git a/mobile/scripts/fdroid_build_isar.sh b/mobile/scripts/fdroid_build_isar.shdeleted file mode 100755index a145268356..0000000000--- a/mobile/scripts/fdroid_build_isar.sh+++ /dev/null@@ -1,18 +0,0 @@-#!/usr/bin/env sh--test -d .isar || exit-cp .isar-cargo.lock .isar/Cargo.lock-(cd .isar || exit-bash tool/build_android.sh x86-bash tool/build_android.sh x64-bash tool/build_android.sh armv7-bash tool/build_android.sh arm64-mv libisar_android_arm64.so libisar.so-mv libisar.so ../.pub-cache/hosted/pub.dev/isar_community_flutter_libs-*/android/src/main/jniLibs/arm64-v8a/-mv libisar_android_armv7.so libisar.so-mv libisar.so ../.pub-cache/hosted/pub.dev/isar_community_flutter_libs-*/android/src/main/jniLibs/armeabi-v7a/-mv libisar_android_x64.so libisar.so-mv libisar.so ../.pub-cache/hosted/pub.dev/isar_community_flutter_libs-*/android/src/main/jniLibs/x86_64/-mv libisar_android_x86.so libisar.so-mv libisar.so ../.pub-cache/hosted/pub.dev/isar_community_flutter_libs-*/android/src/main/jniLibs/x86/-)diff --git a/mobile/scripts/fdroid_update_isar.sh b/mobile/scripts/fdroid_update_isar.shdeleted file mode 100755index 814f50a8a1..0000000000--- a/mobile/scripts/fdroid_update_isar.sh+++ /dev/null@@ -1,14 +0,0 @@-#!/usr/bin/env sh--isar_version="$(awk '/isar: /{gsub(/\^/, "", $2); print $2}' pubspec.yaml)"-checked_out_version="$(git -C .isar describe --tags)"--if [ "$isar_version" = "$checked_out_version" ]; then- echo "isar is up-to-date."- exit 0-fi-echo "Updating from version $checked_out_version to $isar_version."--git -C .isar checkout "$isar_version"-cargo generate-lockfile --manifest-path .isar/Cargo.toml-mv .isar/Cargo.lock .isar-cargo.lock