~nicohman/signal-rs

470875a3eed683f458bde2434ac9f0480c3fdf16 — nicohman 7 months ago 9328462
Finish CreateChat, add links
M Cargo.lock => Cargo.lock +171 -611
@@ 34,47 34,12 @@ dependencies = [
]

[[package]]
name = "andrew"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b7f09f89872c2b6b29e319377b1fbe91c6f5947df19a25596e121cf19a7b35e"
dependencies = [
 "bitflags",
 "line_drawing",
 "rusttype 0.7.9",
 "walkdir",
 "xdg",
 "xml-rs",
]

[[package]]
name = "android_glue"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "000444226fcff248f2bc4c7625be32c63caccfecc2723a2b9f78a7487a49c407"

[[package]]
name = "android_log-sys"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8052e2d8aabbb8d556d6abbcce2a22b9590996c5f849b9c7ce4544a2e3b984e"

[[package]]
name = "anyhow"
version = "1.0.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1"

[[package]]
name = "approx"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3"
dependencies = [
 "num-traits",
]

[[package]]
name = "arrayref"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"


@@ 141,6 106,12 @@ dependencies = [

[[package]]
name = "bitflags"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"

[[package]]
name = "bitflags"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"


@@ 205,17 176,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"

[[package]]
name = "calloop"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7aa2097be53a00de9e8fc349fea6d76221f398f5c4fa550d420669906962d160"
dependencies = [
 "mio 0.6.23",
 "mio-extras",
 "nix",
]

[[package]]
name = "cc"
version = "1.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index"


@@ 240,15 200,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

[[package]]
name = "cgl"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff"
dependencies = [
 "libc",
]

[[package]]
name = "chrono"
version = "0.4.19"
source = "registry+https://github.com/rust-lang/crates.io-index"


@@ 267,22 218,7 @@ version = "0.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
dependencies = [
 "bitflags",
]

[[package]]
name = "cocoa"
version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c49e86fc36d5704151f5996b7b3795385f50ce09e3be0f47a0cfde869681cf8"
dependencies = [
 "bitflags",
 "block",
 "core-foundation 0.7.0",
 "core-graphics",
 "foreign-types",
 "libc",
 "objc",
 "bitflags 1.2.1",
]

[[package]]


@@ 319,62 255,21 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"

[[package]]
name = "core-foundation"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
dependencies = [
 "core-foundation-sys 0.7.0",
 "libc",
]

[[package]]
name = "core-foundation"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62"
dependencies = [
 "core-foundation-sys 0.8.2",
 "core-foundation-sys",
 "libc",
]

[[package]]
name = "core-foundation-sys"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"

[[package]]
name = "core-foundation-sys"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"

[[package]]
name = "core-graphics"
version = "0.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923"
dependencies = [
 "bitflags",
 "core-foundation 0.7.0",
 "foreign-types",
 "libc",
]

[[package]]
name = "core-video-sys"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34ecad23610ad9757664d644e369246edde1803fcb43ed72876565098a5d3828"
dependencies = [
 "cfg-if 0.1.10",
 "core-foundation-sys 0.7.0",
 "core-graphics",
 "libc",
 "objc",
]

[[package]]
name = "cpp"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"


@@ 415,9 310,9 @@ dependencies = [
 "cc",
 "cpp_common 0.5.6",
 "lazy_static",
 "proc-macro2 1.0.24",
 "proc-macro2",
 "regex",
 "syn",
 "syn 1.0.58",
 "unicode-xid 0.2.1",
]



@@ 440,8 335,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df78ad28e5fe814285016779fb3d3b874520c799a847e6190bf2b834cc4ff283"
dependencies = [
 "lazy_static",
 "proc-macro2 1.0.24",
 "syn",
 "proc-macro2",
 "syn 1.0.58",
]

[[package]]


@@ 479,9 374,9 @@ dependencies = [
 "cpp_common 0.5.6",
 "if_rust_version",
 "lazy_static",
 "proc-macro2 1.0.24",
 "proc-macro2",
 "quote 1.0.8",
 "syn",
 "syn 1.0.58",
]

[[package]]


@@ 671,7 566,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd670e5ff58768ef624207fb95709ce63b8d05573fb9a05165f0eef471ea6a3a"
dependencies = [
 "procedural-masquerade",
 "syn",
 "syn 1.0.58",
]

[[package]]


@@ 699,17 594,6 @@ dependencies = [
]

[[package]]
name = "derivative"
version = "2.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eaed5874effa6cde088c644ddcdcb4ffd1511391c5be4fdd7a5ccd02c7e4a183"
dependencies = [
 "proc-macro2 1.0.24",
 "quote 1.0.8",
 "syn",
]

[[package]]
name = "digest"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"


@@ 729,10 613,10 @@ dependencies = [
]

[[package]]
name = "dirs-sys"
version = "0.3.5"
name = "dirs"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"
checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
dependencies = [
 "libc",
 "redox_users",


@@ 740,18 624,14 @@ dependencies = [
]

[[package]]
name = "dispatch"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"

[[package]]
name = "dlib"
version = "0.4.2"
name = "dirs-sys"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b11f15d1e3268f140f68d390637d5e76d849782d971ae7063e0da69fe9709a76"
checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"
dependencies = [
 "libloading 0.6.7",
 "libc",
 "redox_users",
 "winapi 0.3.9",
]

[[package]]


@@ 781,10 661,10 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d1bd85a79872123319ccaa668d1d46912d61053e1a6deb7c2c1e392e034f5824"
dependencies = [
 "proc-macro2 1.0.24",
 "proc-macro2",
 "proc_macro_roids",
 "quote 1.0.8",
 "syn",
 "syn 1.0.58",
]

[[package]]


@@ 814,9 694,9 @@ version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
dependencies = [
 "proc-macro2 1.0.24",
 "proc-macro2",
 "quote 1.0.8",
 "syn",
 "syn 1.0.58",
 "synstructure",
]



@@ 879,7 759,7 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6"
dependencies = [
 "bitflags",
 "bitflags 1.2.1",
 "fsevent-sys",
]



@@ 904,7 784,7 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
dependencies = [
 "bitflags",
 "bitflags 1.2.1",
 "fuchsia-zircon-sys",
]



@@ 970,9 850,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3520e0eb4e704e88d771b92d51273ee212997f0d8282f17f5d8ff1cb39104e42"
dependencies = [
 "proc-macro-hack",
 "proc-macro2 1.0.24",
 "proc-macro2",
 "quote 1.0.8",
 "syn",
 "syn 1.0.58",
]

[[package]]


@@ 1077,23 957,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"

[[package]]
name = "gl_generator"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d"
dependencies = [
 "khronos_api",
 "log",
 "xml-rs",
]

[[package]]
name = "glib"
version = "0.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c685013b7515e668f1b57a165b009d4d28cb139a8a989bbd699c10dad29d0c5"
dependencies = [
 "bitflags",
 "bitflags 1.2.1",
 "futures-channel",
 "futures-core",
 "futures-executor",


@@ 1117,9 986,9 @@ dependencies = [
 "itertools",
 "proc-macro-crate",
 "proc-macro-error",
 "proc-macro2 1.0.24",
 "proc-macro2",
 "quote 1.0.8",
 "syn",
 "syn 1.0.58",
]

[[package]]


@@ 1133,94 1002,6 @@ dependencies = [
]

[[package]]
name = "glium"
version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "030bb23a12fac7e589b002c5e131e89348df88f91b56e3f3dbc4249527eeebf9"
dependencies = [
 "backtrace",
 "fnv",
 "gl_generator",
 "glutin",
 "lazy_static",
 "memoffset 0.5.6",
 "smallvec 1.6.1",
 "takeable-option",
]

[[package]]
name = "glutin"
version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a9666c8fd9afd008f6559e2468c35e11aad1d110d525bb3b354e4138ec0e20f"
dependencies = [
 "android_glue",
 "cgl",
 "cocoa",
 "core-foundation 0.7.0",
 "core-graphics",
 "glutin_egl_sys",
 "glutin_emscripten_sys",
 "glutin_gles2_sys",
 "glutin_glx_sys",
 "glutin_wgl_sys",
 "lazy_static",
 "libloading 0.5.2",
 "log",
 "objc",
 "osmesa-sys",
 "parking_lot 0.10.2",
 "wayland-client",
 "winapi 0.3.9",
 "winit",
]

[[package]]
name = "glutin_egl_sys"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2abb6aa55523480c4adc5a56bbaa249992e2dddb2fc63dc96e04a3355364c211"
dependencies = [
 "gl_generator",
 "winapi 0.3.9",
]

[[package]]
name = "glutin_emscripten_sys"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80de4146df76e8a6c32b03007bc764ff3249dcaeb4f675d68a06caf1bac363f1"

[[package]]
name = "glutin_gles2_sys"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8094e708b730a7c8a1954f4f8a31880af00eb8a1c5b5bf85d28a0a3c6d69103"
dependencies = [
 "gl_generator",
 "objc",
]

[[package]]
name = "glutin_glx_sys"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e393c8fc02b807459410429150e9c4faffdb312d59b8c038566173c81991351"
dependencies = [
 "gl_generator",
 "x11-dl",
]

[[package]]
name = "glutin_wgl_sys"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3da5951a1569dbab865c6f2a863efafff193a93caf05538d193e9e3816d21696"
dependencies = [
 "gl_generator",
]

[[package]]
name = "gobject-sys"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"


@@ 1393,7 1174,7 @@ version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f"
dependencies = [
 "bitflags",
 "bitflags 1.2.1",
 "inotify-sys",
 "libc",
]


@@ 1417,15 1198,6 @@ dependencies = [
]

[[package]]
name = "instant"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
dependencies = [
 "cfg-if 1.0.0",
]

[[package]]
name = "iovec"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"


@@ 1456,12 1228,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"

[[package]]
name = "jni-sys"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"

[[package]]
name = "js-sys"
version = "0.3.46"
source = "registry+https://github.com/rust-lang/crates.io-index"


@@ 1481,12 1247,6 @@ dependencies = [
]

[[package]]
name = "khronos_api"
version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"

[[package]]
name = "lazy_static"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"


@@ 1520,35 1280,6 @@ dependencies = [
]

[[package]]
name = "libloading"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
dependencies = [
 "cc",
 "winapi 0.3.9",
]

[[package]]
name = "libloading"
version = "0.6.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883"
dependencies = [
 "cfg-if 1.0.0",
 "winapi 0.3.9",
]

[[package]]
name = "line_drawing"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5cc7ad3d82c845bdb5dde34ffdcc7a5fb4d2996e1e1ee0f19c33bc80e15196b9"
dependencies = [
 "num-traits",
]

[[package]]
name = "locale_config"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"


@@ 1578,6 1309,18 @@ dependencies = [
]

[[package]]
name = "mac-notification-sys"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3dfb6b71a9a89cd38b395d994214297447e8e63b1ba5708a9a2b0b1048ceda76"
dependencies = [
 "cc",
 "chrono",
 "dirs",
 "objc-foundation",
]

[[package]]
name = "malloc_buf"
version = "0.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"


@@ 1784,37 1527,6 @@ dependencies = [
]

[[package]]
name = "ndk"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95a356cafe20aee088789830bfea3a61336e84ded9e545e00d3869ce95dcb80c"
dependencies = [
 "jni-sys",
 "ndk-sys",
 "num_enum",
]

[[package]]
name = "ndk-glue"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d1730ee2e3de41c3321160a6da815f008c4006d71b095880ea50e17cf52332b8"
dependencies = [
 "android_log-sys",
 "lazy_static",
 "libc",
 "log",
 "ndk",
 "ndk-sys",
]

[[package]]
name = "ndk-sys"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b2820aca934aba5ed91c79acc72b6a44048ceacc5d36c035ed4e051f12d887d"

[[package]]
name = "net2"
version = "0.2.37"
source = "registry+https://github.com/rust-lang/crates.io-index"


@@ 1831,7 1543,7 @@ version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce"
dependencies = [
 "bitflags",
 "bitflags 1.2.1",
 "cc",
 "cfg-if 0.1.10",
 "libc",


@@ 1844,7 1556,7 @@ version = "4.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80ae4a7688d1fab81c5bf19c64fc8db920be8d519ce6336ed4e7efe024724dbd"
dependencies = [
 "bitflags",
 "bitflags 1.2.1",
 "filetime",
 "fsevent",
 "fsevent-sys",


@@ 1857,6 1569,17 @@ dependencies = [
]

[[package]]
name = "notify-rust"
version = "4.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95a3a5dd7b4b415b112ce0fae1988f3e6dee90a96918bf3950b5f2289b19a04b"
dependencies = [
 "dbus",
 "mac-notification-sys",
 "winrt-notification",
]

[[package]]
name = "ntapi"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"


@@ 1895,34 1618,32 @@ dependencies = [
]

[[package]]
name = "num_enum"
version = "0.4.3"
name = "objc"
version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca565a7df06f3d4b485494f25ba05da1435950f4dc263440eda7a6fa9b8e36e4"
checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
dependencies = [
 "derivative",
 "num_enum_derive",
 "malloc_buf",
]

[[package]]
name = "num_enum_derive"
version = "0.4.3"
name = "objc-foundation"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffa5a33ddddfee04c0283a7653987d634e880347e96b5b2ed64de07efb59db9d"
checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
dependencies = [
 "proc-macro-crate",
 "proc-macro2 1.0.24",
 "quote 1.0.8",
 "syn",
 "block",
 "objc",
 "objc_id",
]

[[package]]
name = "objc"
version = "0.2.7"
name = "objc_id"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
dependencies = [
 "malloc_buf",
 "objc",
]

[[package]]


@@ 1958,7 1679,7 @@ version = "0.10.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "038d43985d1ddca7a9900630d8cd031b56e4794eecc2e9ea39dd17aa04399a70"
dependencies = [
 "bitflags",
 "bitflags 1.2.1",
 "cfg-if 1.0.0",
 "foreign-types",
 "lazy_static",


@@ 1986,24 1707,6 @@ dependencies = [
]

[[package]]
name = "ordered-float"
version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7"
dependencies = [
 "num-traits",
]

[[package]]
name = "osmesa-sys"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b"
dependencies = [
 "shared_library",
]

[[package]]
name = "owned-read"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"


@@ 2039,9 1742,9 @@ dependencies = [
name = "pallet-macros"
version = "0.4.0"
dependencies = [
 "proc-macro2 1.0.24",
 "proc-macro2",
 "quote 1.0.8",
 "syn",
 "syn 1.0.58",
]

[[package]]


@@ 2124,9 1827,9 @@ version = "0.4.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895"
dependencies = [
 "proc-macro2 1.0.24",
 "proc-macro2",
 "quote 1.0.8",
 "syn",
 "syn 1.0.58",
]

[[package]]


@@ 2135,9 1838,9 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "caa25a6393f22ce819b0f50e0be89287292fda8d425be38ee0ca14c4931d9e71"
dependencies = [
 "proc-macro2 1.0.24",
 "proc-macro2",
 "quote 1.0.8",
 "syn",
 "syn 1.0.58",
]

[[package]]


@@ 2186,9 1889,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
dependencies = [
 "proc-macro-error-attr",
 "proc-macro2 1.0.24",
 "proc-macro2",
 "quote 1.0.8",
 "syn",
 "syn 1.0.58",
 "version_check",
]



@@ 2198,7 1901,7 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
dependencies = [
 "proc-macro2 1.0.24",
 "proc-macro2",
 "quote 1.0.8",
 "version_check",
]


@@ 2217,15 1920,6 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"

[[package]]
name = "proc-macro2"
version = "0.4.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
dependencies = [
 "unicode-xid 0.1.0",
]

[[package]]
name = "proc-macro2"
version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"


@@ 2239,9 1933,9 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06675fa2c577f52bcf77fbb511123927547d154faa08097cc012c66ec3c9611a"
dependencies = [
 "proc-macro2 1.0.24",
 "proc-macro2",
 "quote 1.0.8",
 "syn",
 "syn 1.0.58",
]

[[package]]


@@ 2268,9 1962,9 @@ version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1da093791f2d883b53429170c9c69e603611d3a15652c8a2e6d2c203d8503c2c"
dependencies = [
 "proc-macro2 1.0.24",
 "proc-macro2",
 "quote 1.0.8",
 "syn",
 "syn 1.0.58",
]

[[package]]


@@ 2281,20 1975,11 @@ checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"

[[package]]
name = "quote"
version = "0.6.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
dependencies = [
 "proc-macro2 0.4.30",
]

[[package]]
name = "quote"
version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
dependencies = [
 "proc-macro2 1.0.24",
 "proc-macro2",
]

[[package]]


@@ 2407,15 2092,6 @@ dependencies = [
]

[[package]]
name = "raw-window-handle"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a441a7a6c80ad6473bd4b74ec1c9a4c951794285bf941c2126f607c72e48211"
dependencies = [
 "libc",
]

[[package]]
name = "rayon"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"


@@ 2461,7 2137,7 @@ version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05ec8ca9416c5ea37062b502703cd7fcb207736bc294f6e0cf367ac6fc234570"
dependencies = [
 "bitflags",
 "bitflags 1.2.1",
]

[[package]]


@@ 2581,26 2257,6 @@ dependencies = [
]

[[package]]
name = "rusttype"
version = "0.7.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "310942406a39981bed7e12b09182a221a29e0990f3e7e0c971f131922ed135d5"
dependencies = [
 "rusttype 0.8.3",
]

[[package]]
name = "rusttype"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f61411055101f7b60ecf1041d87fb74205fb20b0c7a723f07ef39174cf6b4c0"
dependencies = [
 "approx",
 "ordered-float",
 "stb_truetype",
]

[[package]]
name = "ryu"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"


@@ 2637,9 2293,9 @@ version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1759c2e3c8580017a484a7ac56d3abc5a6c1feadf88db2f3633f12ae4268c69"
dependencies = [
 "bitflags",
 "core-foundation 0.9.1",
 "core-foundation-sys 0.8.2",
 "bitflags 1.2.1",
 "core-foundation",
 "core-foundation-sys",
 "libc",
 "security-framework-sys",
]


@@ 2650,7 2306,7 @@ version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f99b9d5e26d2a71633cc4f2ebae7cc9f874044e0c351a27e17892d76dce5678b"
dependencies = [
 "core-foundation-sys 0.8.2",
 "core-foundation-sys",
 "libc",
]



@@ 2684,9 2340,9 @@ version = "1.0.119"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "552954ce79a059ddd5fd68c271592374bd15cab2274970380c000118aeffe1cd"
dependencies = [
 "proc-macro2 1.0.24",
 "proc-macro2",
 "quote 1.0.8",
 "syn",
 "syn 1.0.58",
]

[[package]]


@@ 2706,9 2362,9 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76"
dependencies = [
 "proc-macro2 1.0.24",
 "proc-macro2",
 "quote 1.0.8",
 "syn",
 "syn 1.0.58",
]

[[package]]


@@ 2737,16 2393,6 @@ dependencies = [
]

[[package]]
name = "shared_library"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11"
dependencies = [
 "lazy_static",
 "libc",
]

[[package]]
name = "signal-hook-registry"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"


@@ 2773,11 2419,10 @@ dependencies = [
 "futures-util",
 "gettext-rs",
 "glib",
 "glib-macros",
 "glium",
 "home",
 "lazy_static",
 "mio 0.7.7",
 "notify-rust",
 "once_cell 0.2.4",
 "pallet",
 "qmetaobject",


@@ 2831,22 2476,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"

[[package]]
name = "smithay-client-toolkit"
version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "421c8dc7acf5cb205b88160f8b4cc2c5cfabe210e43b2f80f009f4c1ef910f1d"
dependencies = [
 "andrew",
 "bitflags",
 "dlib",
 "lazy_static",
 "memmap",
 "nix",
 "wayland-client",
 "wayland-protocols",
]

[[package]]
name = "snap"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"


@@ 2870,13 2499,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"

[[package]]
name = "stb_truetype"
version = "0.3.1"
name = "strum"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f77b6b07e862c66a9f3e62a07588fee67cd90a9135a2b942409f195507b4fb51"
dependencies = [
 "byteorder",
]
checksum = "4ca6e4730f517e041e547ffe23d29daab8de6b73af4b6ae2a002108169f5e7da"

[[package]]
name = "strum"


@@ 2886,14 2512,35 @@ checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b"

[[package]]
name = "strum_macros"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3384590878eb0cab3b128e844412e2d010821e7e091211b9d87324173ada7db8"
dependencies = [
 "quote 0.3.15",
 "syn 0.11.11",
]

[[package]]
name = "strum_macros"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c"
dependencies = [
 "heck",
 "proc-macro2 1.0.24",
 "proc-macro2",
 "quote 1.0.8",
 "syn",
 "syn 1.0.58",
]

[[package]]
name = "syn"
version = "0.11.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
dependencies = [
 "quote 0.3.15",
 "synom",
 "unicode-xid 0.0.4",
]

[[package]]


@@ 2902,20 2549,29 @@ version = "1.0.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc60a3d73ea6594cd712d830cc1f0390fd71542d8c8cd24e70cc54cdfd5e05d5"
dependencies = [
 "proc-macro2 1.0.24",
 "proc-macro2",
 "quote 1.0.8",
 "unicode-xid 0.2.1",
]

[[package]]
name = "synom"
version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
dependencies = [
 "unicode-xid 0.0.4",
]

[[package]]
name = "synstructure"
version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
dependencies = [
 "proc-macro2 1.0.24",
 "proc-macro2",
 "quote 1.0.8",
 "syn",
 "syn 1.0.58",
 "unicode-xid 0.2.1",
]



@@ 2927,20 2583,14 @@ checksum = "0f3ecc17269a19353b3558b313bba738b25d82993e30d62a18406a24aba4649b"
dependencies = [
 "heck",
 "pkg-config",
 "strum",
 "strum_macros",
 "strum 0.18.0",
 "strum_macros 0.18.0",
 "thiserror",
 "toml",
 "version-compare",
]

[[package]]
name = "takeable-option"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36ae8932fcfea38b7d3883ae2ab357b0d57a02caaa18ebb4f5ece08beaec4aa0"

[[package]]
name = "tantivy"
version = "0.13.3"
source = "registry+https://github.com/rust-lang/crates.io-index"


@@ 3044,9 2694,9 @@ version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1"
dependencies = [
 "proc-macro2 1.0.24",
 "proc-macro2",
 "quote 1.0.8",
 "syn",
 "syn 1.0.58",
]

[[package]]


@@ 3113,9 2763,9 @@ version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
dependencies = [
 "proc-macro2 1.0.24",
 "proc-macro2",
 "quote 1.0.8",
 "syn",
 "syn 1.0.58",
]

[[package]]


@@ 3274,12 2924,6 @@ checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"

[[package]]
name = "unicode-xid"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"

[[package]]
name = "unicode-xid"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"


@@ 3396,9 3040,9 @@ dependencies = [
 "bumpalo",
 "lazy_static",
 "log",
 "proc-macro2 1.0.24",
 "proc-macro2",
 "quote 1.0.8",
 "syn",
 "syn 1.0.58",
 "wasm-bindgen-shared",
]



@@ 3430,9 3074,9 @@ version = "0.2.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549"
dependencies = [
 "proc-macro2 1.0.24",
 "proc-macro2",
 "quote 1.0.8",
 "syn",
 "syn 1.0.58",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
]


@@ 3444,66 3088,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158"

[[package]]
name = "wayland-client"
version = "0.23.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af1080ebe0efabcf12aef2132152f616038f2d7dcbbccf7b2d8c5270fe14bcda"
dependencies = [
 "bitflags",
 "calloop",
 "downcast-rs",
 "libc",
 "mio 0.6.23",
 "nix",
 "wayland-commons",
 "wayland-scanner",
 "wayland-sys",
]

[[package]]
name = "wayland-commons"
version = "0.23.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb66b0d1a27c39bbce712b6372131c6e25149f03ffb0cd017cf8f7de8d66dbdb"
dependencies = [
 "nix",
 "wayland-sys",
]

[[package]]
name = "wayland-protocols"
version = "0.23.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6cc286643656742777d55dc8e70d144fa4699e426ca8e9d4ef454f4bf15ffcf9"
dependencies = [
 "bitflags",
 "wayland-client",
 "wayland-commons",
 "wayland-scanner",
]

[[package]]
name = "wayland-scanner"
version = "0.23.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93b02247366f395b9258054f964fe293ddd019c3237afba9be2ccbe9e1651c3d"
dependencies = [
 "proc-macro2 0.4.30",
 "quote 0.6.13",
 "xml-rs",
]

[[package]]
name = "wayland-sys"
version = "0.23.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d94e89a86e6d6d7c7c9b19ebf48a03afaac4af6bc22ae570e9a24124b75358f4"
dependencies = [
 "dlib",
 "lazy_static",
]

[[package]]
name = "web-sys"
version = "0.3.46"
source = "registry+https://github.com/rust-lang/crates.io-index"


@@ 3557,46 3141,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

[[package]]
name = "winit"
version = "0.22.2"
name = "winreg"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e4ccbf7ddb6627828eace16cacde80fc6bf4dbb3469f88487262a02cf8e7862"
checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69"
dependencies = [
 "bitflags",
 "cocoa",
 "core-foundation 0.7.0",
 "core-graphics",
 "core-video-sys",
 "dispatch",
 "instant",
 "lazy_static",
 "libc",
 "log",
 "mio 0.6.23",
 "mio-extras",
 "ndk",
 "ndk-glue",
 "ndk-sys",
 "objc",
 "parking_lot 0.10.2",
 "percent-encoding",
 "raw-window-handle",
 "smithay-client-toolkit",
 "wayland-client",
 "winapi 0.3.9",
 "x11-dl",
]

[[package]]
name = "winreg"
version = "0.7.0"
name = "winrt"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69"
checksum = "7e30cba82e22b083dc5a422c2ee77e20dc7927271a0dc981360c57c1453cb48d"
dependencies = [
 "winapi 0.3.9",
]

[[package]]
name = "winrt-notification"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57790eb281688a4682dab44df2a1ba8b78373233bd71cb291c3e75fecb1a01c4"
dependencies = [
 "strum 0.8.0",
 "strum_macros 0.8.0",
 "winapi 0.3.9",
 "winrt",
 "xml-rs",
]

[[package]]
name = "ws2_32-sys"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"


@@ 3607,25 3182,10 @@ dependencies = [
]

[[package]]
name = "x11-dl"
version = "2.18.5"
name = "xml-rs"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2bf981e3a5b3301209754218f962052d4d9ee97e478f4d26d4a6eced34c1fef8"
checksum = "e1945e12e16b951721d7976520b0832496ef79c31602c7a29d950de79ba74621"
dependencies = [
 "lazy_static",
 "libc",
 "maybe-uninit",
 "pkg-config",
 "bitflags 0.9.1",
]

[[package]]
name = "xdg"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57"

[[package]]
name = "xml-rs"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b07db065a5cf61a7e4ba64f29e67db906fb1787316516c4e6e5ff0fea1efcd8a"

M Cargo.toml => Cargo.toml +1 -2
@@ 12,6 12,7 @@ cstr = "0.1.0"
cpp = "0.4"
tungstenite = "0.11.0"
url = "2.1.0"
notify-rust = "4.2.2"
serde = { version = "1.0.115", features = ["derive"]}
serde_json = "1.0.57"
mio = { version = "0.7", features = ["tcp", "os-poll"]}


@@ 19,7 20,6 @@ futures-util = { version = "0.3", default-features = true, features = ["async-aw
tokio = { version = "0.2.22",features = ["io-util", "full", "stream"] }
tokio-tungstenite = "0.11.0"
enum_variant_type = "0.2.0"
glium = { version = "0.27", default-features = true }
crossbeam-channel = "0.4.4"
glib = "0.10"
once_cell = "^0"


@@ 28,7 28,6 @@ regex = "1.4.1"
reqwest = "0.10.8"
confy = "0.4.0"
serde_repr = "0.1"
glib-macros = "0.10.0"
dbus-tokio = "0.6.0"
dbus = "0.9.0"
home = "0.5.3"	

M qml/ChatList.qml => qml/ChatList.qml +0 -2
@@ 19,8 19,6 @@ Page {
            width: chatView.width
            height: 40
            onClicked: {
                console.log(model.tel);
                console.log(model);
                signalState.currentChat = model;
                signalState.setCurrent(tel);
                signal.show_chat(tel);

M qml/CreateChat.qml => qml/CreateChat.qml +28 -5
@@ 5,19 5,42 @@ Page {
	background: Rectangle {
		color: theme.background
	}
	title: "Create Chat"
	anchors.fill: stackView
	ColumnLayout {
		anchors.leftMargin: 10
		anchors.fill: parent
		Row {
			Label {
				font.pixelSize: Qt.application.font.pixelSize * 1.3
				text: "Create a new chat"
				height: 20
			}
		}
		ListView {
			anchors.fill: parent
			Layout.topMargin: 20
			Layout.fillWidth: true
			Layout.fillHeight: true
			model: signal.contacts
			delegate: ItemDelegate {
				height: 20
				Component.onCompleted: {
					console.log(signal.contacts);
				width: parent.width
				height: 40
				onClicked: {
					// Dumb hack to get around fact that we don't have an official Chat yet
	                signalState.currentChat = {
	                	is_group: false
	                };
	                signalState.currentName = model.name;
	                signalState.setCurrent(model.tel);
	                signal.show_chat(model.tel);
	                signalState.openView("chatHistory");
				}
				Row {
					topPadding: 20
					Avatar {
						tel: model.tel
						width: 40
						height: 40
					}
					Label {
						height: 20
						text: model.name

M qml/CreateContact.qml => qml/CreateContact.qml +11 -2
@@ 3,13 3,22 @@ import QtQuick.Controls 2.5
import QtQuick.Layouts 1.15

Page {
    width: 600
    height: 400
    anchors.fill: stackView
    background: Rectangle {
        color: theme.background
    }
    title: "Create New Contact"

    ColumnLayout {
        anchors.leftMargin: 10
        anchors.fill: parent
        Row {
            Label {
                font.pixelSize: Qt.application.font.pixelSize * 1.3
                text: "Create a new contact"
                height: 20
            }
        }
        Row {
            TextField {
            	id: contactNameInput

M qml/MessageUI.qml => qml/MessageUI.qml +11 -2
@@ 54,7 54,7 @@ ItemDelegate {
                    id: msgRightClick
                    MenuItem {
                        onClicked: {
                            signal.del_message(signalState.currentChat.tel, message.message.sent_at);
                            signal.del_message(signalState.current, message.message.sent_at);
                        }
                        text: "Delete"
                    }


@@ 77,12 77,21 @@ ItemDelegate {
                Row {
                    leftPadding: 5
                    Label {
                        MouseArea {
                            anchors.fill: parent
                            cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
                            acceptedButtons: Qt.NoButton
                        }
                        onLinkActivated: Qt.openUrlExternally(link)
                    	color: theme.highlightedText
                        font.pixelSize: Qt.application.font.pixelSize
                        font.bold: false
                        id: textLabel
                        width: message.oneLine ? textLabel.implicitWidth : message.maxDelegateWidth
                        text: message.message.message
                        text: {
                            var regex = new RegExp("http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+");
                            return message.message.message.toString().replace(regex, "<a href=\"$&\">$&</a>");
                        }
                        wrapMode: Text.Wrap
                    }
                }

M qml/main.qml => qml/main.qml +4 -2
@@ 6,7 6,7 @@ import QtQuick.Controls.Material 2.12
ApplicationWindow {
    id: window
    width: 640
    height: 471
    height: 470
    visible: true
    title: signal.name
    color: theme.background


@@ 46,9 46,9 @@ ApplicationWindow {
            font.pixelSize: Qt.application.font.pixelSize * 1.6
            onClicked: {
                if (stackView.depth > 1) {
                    signal.show_view(stackView.currentItem.objectName);
                    stackView.pop()
                    signalState.currentView = stackView.currentItem.objectName;
                    signal.show_view(stackView.currentItem.objectName);
                } else {
                    drawer.open()
                }


@@ 72,6 72,7 @@ ApplicationWindow {
                anchors.rightMargin: 5
                anchors.top: parent.top
                anchors.topMargin: 5
                font.pixelSize: Qt.application.font.pixelSize * 1.1
                onClicked: {
                    signalState.openView("editContact");
                }


@@ 82,6 83,7 @@ ApplicationWindow {
                text: "Create Chat"
                anchors.right: parent.right
                anchors.rightMargin: 5
                font.pixelSize: Qt.application.font.pixelSize * 1.1
                anchors.top: parent.top
                anchors.topMargin: 5
                onClicked: {

M src/main.rs => src/main.rs +27 -16
@@ 27,6 27,7 @@ extern crate enum_variant_type;
extern crate futures_util;
extern crate glib;
extern crate mio;
extern crate notify_rust;
extern crate reqwest;
extern crate serde;
#[macro_use]


@@ 36,11 37,8 @@ extern crate home;
extern crate serde_json;
extern crate tempfile;
extern crate tokio;
extern crate tokio_tungstenite;
use std::ffi::CStr;
extern crate tungstenite;
extern crate url;

#[macro_use]
extern crate lazy_static;
use qmetaobject::QAbstractListModel;


@@ 55,6 53,7 @@ use std::collections::*;
mod config;
use config::*;
use gettextrs::{bindtextdomain, textdomain};
use notify_rust::Notification;
use signal::signal_cli::*;
use std::cell::*;
use std::env;


@@ 62,19 61,16 @@ use std::path::PathBuf;
use std::process::Command;
use std::rc::*;
use std::result::Result;

mod scli;
pub trait SignalBackend {
    fn messages_id<'a>(&'a self, tel: &str) -> Result<BTreeMap<i64, SignalMessage>, anyhow::Error>;
    fn message<'a>(&'a self, tel: &str, id: i64) -> Result<SignalMessage, anyhow::Error>;
    fn messages<'a>(
        &'a self,
    ) -> Result<BTreeMap<String, BTreeMap<i64, SignalMessage>>, anyhow::Error>;
    fn contact<'a>(&'a self, tel: &str) -> Result<Contact, anyhow::Error>;
    fn contacts<'a>(&'a self) -> HashMap<String, Contact>;
    fn messages_id(&self, tel: &str) -> Result<BTreeMap<i64, SignalMessage>, anyhow::Error>;
    fn message(&self, tel: &str, id: i64) -> Result<SignalMessage, anyhow::Error>;
    fn messages(&self) -> Result<BTreeMap<String, BTreeMap<i64, SignalMessage>>, anyhow::Error>;
    fn contact(&self, tel: &str) -> Result<Contact, anyhow::Error>;
    fn contacts(&self) -> HashMap<String, Contact>;
    fn process_response(&mut self, response: SignalResponse);
    fn new(res_sender: glib::Sender<SignalResponse>, config: Config) -> Self;
    fn groups<'a>(&'a self) -> HashMap<String, Group>;
    fn groups(&self) -> HashMap<String, Group>;
    fn avatar(&self, id: &str) -> Option<String>;
}
#[derive(QObject, Default)]


@@ 100,6 96,7 @@ pub struct SignalUI {
    contact: qt_method!(fn(&self, tel: String) -> String),
    del_message: qt_method!(fn(&self, chat_id: String, sent_at: i64)),
    ready: qt_signal!(),
    resolve_name: qt_method!(fn(&self, source: String) -> String),
    avatar: qt_method!(fn(&self, id: String) -> QString),
    send_group_message: qt_method!(fn(&self, chat_id: String, message: String)),
}


@@ 153,6 150,9 @@ impl SignalUI {
            .send(SignalRequest::SendMessage { to, message })
            .expect("Couldn't send SendMessage");
    }
    fn resolve_name(&self, source: String) -> String {
        self.state.as_ref().unwrap().resolve_name(source)
    }
    fn send_group_message(&self, chat_id: String, message: String) {
        self.state
            .as_ref()


@@ 209,7 209,6 @@ impl SignalUI {
                    slf.chats_changed();
                }
                if let SignalResponse::ContactList(ref contacts) = res {
                    println!("{:?}", contacts);
                    slf.contacts.borrow_mut().reset_data(contacts.clone());
                    slf.contacts_changed();
                }


@@ 220,6 219,11 @@ impl SignalUI {
                                .get_mut()
                                .push(QMLSignalMessage::from_msg(msg.clone()));
                        }
                        /*Notification::new()
                        .summary(&slf.resolve_name(msg.source.clone()))
                        .body(msg.message.as_str())
                        .show()
                        .unwrap();*/
                    }
                }
                if let SignalResponse::RmMessage {


@@ 417,11 421,18 @@ where
            .send(SignalResponse::ChatList(chats))
            .expect("Couldn't send ChatList");
    }
    pub fn resolve_name(&self, source: String) -> String {
        if let Some(contact) = self.sbackend.contact(source.as_str()).ok() {
            return contact.name;
        } else {
            return source;
        }
    }
    pub fn update_contacts(&self) {
        let mut contacts: Vec<Contact> = self.sbackend.contacts().values().cloned().collect();
        contacts.sort_by_key(|x| x.name.clone());
        self.res_sender
            .send(SignalResponse::ContactList(
                self.sbackend.contacts().values().cloned().collect(),
            ))
            .send(SignalResponse::ContactList(contacts))
            .expect("Couldn't send ContactList");
    }
    /// Shows a given chat by tel

M src/scli.rs => src/scli.rs +1 -3
@@ 475,9 475,7 @@ impl SignalBackend for SCLISession {
        match response {
            SignalResponse::RmMessage { chat_id, sent_at } => {
                if let Some(doc) = self.message_doc(&chat_id, sent_at).ok() {
                    self.msg_store
                        .delete(doc.id)
                        .expect("Couldn't delete message");
                    self.msg_store.delete(doc.id);
                }
            }
            SignalResponse::SignalCLIEnvelope(msg) => {

M src/signal.rs => src/signal.rs +0 -1
@@ 2,7 2,6 @@ use enum_variant_type::EnumVariantType;
use futures_util::sink::SinkExt;
use futures_util::stream::*;
use futures_util::{future, StreamExt};
use glib_macros::*;
use pallet::DocumentLike;
use qmetaobject::*;
use regex::Regex;