chore: update to edition 2024

apiclient/Cargo.toml

@@ -5,7 +5,7 @@
 [package]
 name = "phnxapiclient"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 description = "HTTP client for the server REST API"
 

apiclient/src/as_api/mod.rs

@@ -3,20 +3,21 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
 use phnxtypes::{
-    credentials::{keys::ClientSigningKey, ClientCredentialPayload},
+    credentials::{ClientCredentialPayload, keys::ClientSigningKey},
     crypto::{
+        RatchetEncryptionKey,
         kdf::keys::RatchetSecret,
         opaque::{
             OpaqueLoginFinish, OpaqueLoginRequest, OpaqueRegistrationRecord,
             OpaqueRegistrationRequest,
         },
         signatures::signable::Signable,
-        RatchetEncryptionKey,
     },
     endpoint_paths::ENDPOINT_AS,
     errors::auth_service::AsProcessingError,
     identifiers::{AsClientId, QualifiedUserName},
     messages::{
+        AsTokenType,
         client_as::{
             AsCredentialsParams, AsPublishConnectionPackagesParamsTbs, AsRequestParams,
             ClientConnectionPackageParamsTbs, ClientToAsMessage, ConnectionPackage,
@@ -33,7 +34,6 @@ use phnxtypes::{
             UserClientsResponseIn, UserConnectionPackagesResponseIn,
         },
         client_qs::DequeueMessagesResponse,
-        AsTokenType,
     },
 };
 use privacypass::batched_tokens_ristretto255::TokenRequest;

apiclient/src/ds_api/mod.rs

@@ -10,10 +10,11 @@ use super::*;
 use mls_assist::{
     messages::AssistedMessageOut,
     openmls::prelude::{
-        tls_codec::Serialize, GroupEpoch, GroupId, LeafNodeIndex, MlsMessageOut, RatchetTreeIn,
+        GroupEpoch, GroupId, LeafNodeIndex, MlsMessageOut, RatchetTreeIn, tls_codec::Serialize,
     },
 };
 use phnxtypes::{
+    LibraryError,
     credentials::keys::{ClientSigningKey, PseudonymousCredentialSigningKey},
     crypto::{
         ear::keys::GroupStateEarKey,
@@ -24,8 +25,8 @@ use phnxtypes::{
     identifiers::QsReference,
     messages::{
         client_ds::{
-            ConnectionGroupInfoParams, ExternalCommitInfoParams, UpdateQsClientReferenceParams,
-            WelcomeInfoParams, SUPPORTED_DS_API_VERSIONS,
+            ConnectionGroupInfoParams, ExternalCommitInfoParams, SUPPORTED_DS_API_VERSIONS,
+            UpdateQsClientReferenceParams, WelcomeInfoParams,
         },
         client_ds_out::{
             ClientToDsMessageOut, ClientToDsMessageTbsOut, CreateGroupParamsOut,
@@ -37,7 +38,6 @@ use phnxtypes::{
         },
     },
     time::TimeStamp,
-    LibraryError,
 };
 
 use tls_codec::DeserializeBytes;

apiclient/src/lib.rs

@@ -6,7 +6,7 @@
 
 use std::{sync::Arc, time::Duration};
 
-use phnxtypes::{endpoint_paths::ENDPOINT_HEALTH_CHECK, DEFAULT_PORT_HTTP, DEFAULT_PORT_HTTPS};
+use phnxtypes::{DEFAULT_PORT_HTTP, DEFAULT_PORT_HTTPS, endpoint_paths::ENDPOINT_HEALTH_CHECK};
 use reqwest::{Client, ClientBuilder, StatusCode, Url};
 use thiserror::Error;
 use url::ParseError;

apiclient/src/qs_api/mod.rs

@@ -5,44 +5,44 @@
 use http::StatusCode;
 use mls_assist::openmls::prelude::KeyPackage;
 use phnxtypes::{
+    LibraryError,
     crypto::{
+        RatchetEncryptionKey,
         ear::keys::KeyPackageEarKey,
         kdf::keys::RatchetSecret,
         signatures::{
             keys::{QsClientSigningKey, QsClientVerifyingKey, QsUserSigningKey},
             signable::Signable,
             traits::SigningKeyBehaviour,
         },
-        RatchetEncryptionKey,
     },
     endpoint_paths::ENDPOINT_QS,
     errors::version::VersionError,
     identifiers::{QsClientId, QsUserId},
     messages::{
+        FriendshipToken,
         client_qs::{
             ClientKeyPackageParams, ClientKeyPackageResponse, CreateClientRecordResponse,
             CreateUserRecordResponse, DeleteClientRecordParams, DeleteUserRecordParams,
             DequeueMessagesParams, DequeueMessagesResponse, EncryptionKeyResponse,
             KeyPackageParams, KeyPackageResponseIn, QsProcessResponseIn,
-            QsVersionedProcessResponseIn, UpdateClientRecordParams, UpdateUserRecordParams,
-            SUPPORTED_QS_API_VERSIONS,
+            QsVersionedProcessResponseIn, SUPPORTED_QS_API_VERSIONS, UpdateClientRecordParams,
+            UpdateUserRecordParams,
         },
         client_qs_out::{
             ClientToQsMessageOut, ClientToQsMessageTbsOut, CreateClientRecordParamsOut,
             CreateUserRecordParamsOut, PublishKeyPackagesParamsOut, QsRequestParamsOut,
             QsVersionedRequestParamsOut,
         },
         push_token::EncryptedPushToken,
-        FriendshipToken,
     },
-    LibraryError,
 };
 use thiserror::Error;
 use tls_codec::{DeserializeBytes, Serialize};
 
 use crate::{
-    version::{extract_api_version_negotiation, negotiate_api_version},
     ApiClient, Protocol,
+    version::{extract_api_version_negotiation, negotiate_api_version},
 };
 
 pub mod ws;

apiclient/src/qs_api/tests.rs

@@ -6,13 +6,13 @@ use std::{net::TcpListener, time::Duration};
 
 use actix::{Actor, ActorContext, AsyncContext, StreamHandler};
 use actix_web::{
+    App, HttpRequest, HttpResponse, HttpServer, Responder,
     dev::Server,
     middleware::Logger,
     web::{self},
-    App, HttpRequest, HttpResponse, HttpServer, Responder,
 };
 use actix_web_actors::ws;
-use base64::{engine::general_purpose, Engine as _};
+use base64::{Engine as _, engine::general_purpose};
 use phnxtypes::{
     codec::PhnxCodec,
     endpoint_paths::ENDPOINT_QS_WS,
@@ -24,7 +24,7 @@ use tokio_util::sync::CancellationToken;
 use tracing::{error, info};
 use uuid::Uuid;
 
-use crate::{qs_api::ws::WsEvent, ApiClient};
+use crate::{ApiClient, qs_api::ws::WsEvent};
 
 static QUEUE_ID_VALUE: Uuid = Uuid::nil();
 

apiclient/src/qs_api/ws.rs

@@ -5,7 +5,7 @@
 use core::time;
 use std::{pin::pin, time::Duration};
 
-use base64::{engine::general_purpose, Engine as _};
+use base64::{Engine as _, engine::general_purpose};
 use futures_util::{SinkExt, StreamExt};
 use http::{HeaderValue, Request};
 use phnxtypes::{
@@ -19,12 +19,11 @@ use tls_codec::DeserializeBytes;
 use tokio::{
     net::TcpStream,
     sync::mpsc,
-    time::{sleep, Instant},
+    time::{Instant, sleep},
 };
 use tokio_tungstenite::{
-    connect_async,
+    MaybeTlsStream, WebSocketStream, connect_async,
     tungstenite::{client::IntoClientRequest, protocol::Message},
-    MaybeTlsStream, WebSocketStream,
 };
 use tokio_util::sync::{CancellationToken, DropGuard};
 use tracing::{error, info};

apiclient/src/version.rs

@@ -9,9 +9,9 @@ use std::{
 
 use http::{HeaderMap, StatusCode};
 use phnxtypes::{
-    errors::version::VersionError,
-    messages::{client_ds::CURRENT_DS_API_VERSION, client_qs::CURRENT_QS_API_VERSION, ApiVersion},
     ACCEPTED_API_VERSIONS_HEADER,
+    errors::version::VersionError,
+    messages::{ApiVersion, client_ds::CURRENT_DS_API_VERSION, client_qs::CURRENT_QS_API_VERSION},
 };
 use tracing::error;
 

applogic/Cargo.toml

@@ -6,7 +6,7 @@
 name = "phnxapplogic"
 version = "0.1.0"
 authors = ["Phoenix R&D GmbH <[email protected]>"]
-edition = "2021"
+edition = "2024"
 publish = false
 description = "Multi-platform client application logic"
 

applogic/src/api/conversation_details_cubit.rs

@@ -8,15 +8,15 @@ use std::{sync::Arc, time::Duration};
 
 use chrono::{DateTime, SubsecRound, Utc};
 use flutter_rust_bridge::frb;
-use phnxcoreclient::{clients::CoreUser, store::Store, ConversationMessageId, MimiContent};
-use phnxcoreclient::{store::StoreNotification, ConversationId};
+use phnxcoreclient::{ConversationId, store::StoreNotification};
+use phnxcoreclient::{ConversationMessageId, MimiContent, clients::CoreUser, store::Store};
 use tokio::{sync::watch, time::sleep};
 use tokio_stream::{Stream, StreamExt};
 use tokio_util::sync::CancellationToken;
 use tracing::error;
 
-use crate::util::{spawn_from_sync, Cubit, CubitCore};
 use crate::StreamSink;
+use crate::util::{Cubit, CubitCore, spawn_from_sync};
 
 use super::{
     conversation_list_cubit::converation_into_ui_details,

applogic/src/api/conversation_list_cubit.rs

@@ -8,18 +8,18 @@ use std::{pin::pin, sync::Arc};
 
 use flutter_rust_bridge::frb;
 use phnxcoreclient::{
+    Conversation,
     clients::CoreUser,
     store::{Store, StoreEntityId, StoreOperation},
-    Conversation,
 };
-use phnxcoreclient::{store::StoreNotification, ConversationId};
+use phnxcoreclient::{ConversationId, store::StoreNotification};
 use tokio::sync::watch;
 use tokio_stream::{Stream, StreamExt};
 use tokio_util::sync::CancellationToken;
 use tracing::debug;
 
-use crate::util::{spawn_from_sync, Cubit, CubitCore};
 use crate::StreamSink;
+use crate::util::{Cubit, CubitCore, spawn_from_sync};
 
 use super::{
     types::{UiConversation, UiConversationDetails, UiConversationMessage},

applogic/src/api/logging.rs

@@ -17,9 +17,9 @@ use flutter_rust_bridge::frb;
 use regex::Regex;
 
 use crate::{
-    logging::{init_logger, LOG_FILE_RING_BUFFER, LOG_FILE_RING_BUFFER_SIZE},
-    util::{FileRingBuffer, FileRingBufferLock},
     StreamSink,
+    logging::{LOG_FILE_RING_BUFFER, LOG_FILE_RING_BUFFER_SIZE, init_logger},
+    util::{FileRingBuffer, FileRingBufferLock},
 };
 
 /// Initializes the Rust logging system

applogic/src/api/message_cubit.rs

@@ -8,18 +8,18 @@ use std::{pin::pin, sync::Arc};
 
 use flutter_rust_bridge::frb;
 use phnxcoreclient::{
-    store::{Store, StoreNotification, StoreOperation, StoreResult},
     ConversationMessageId,
+    store::{Store, StoreNotification, StoreOperation, StoreResult},
 };
 use tokio::sync::watch;
 use tokio_stream::{Stream, StreamExt};
 use tokio_util::sync::CancellationToken;
 use tracing::{debug, error};
 
 use crate::{
-    api::types::UiFlightPosition,
-    util::{spawn_from_sync, Cubit, CubitCore},
     StreamSink,
+    api::types::UiFlightPosition,
+    util::{Cubit, CubitCore, spawn_from_sync},
 };
 
 use super::{types::UiConversationMessage, user_cubit::UserCubitBase};

applogic/src/api/message_list_cubit.rs

@@ -8,17 +8,17 @@ use std::{collections::HashMap, pin::pin, sync::Arc};
 
 use flutter_rust_bridge::frb;
 use phnxcoreclient::{
-    store::{Store, StoreEntityId, StoreNotification, StoreOperation},
     ConversationId, ConversationMessage, ConversationMessageId,
+    store::{Store, StoreEntityId, StoreNotification, StoreOperation},
 };
 use tokio::sync::watch;
 use tokio_stream::{Stream, StreamExt};
 use tokio_util::sync::CancellationToken;
 use tracing::{debug, error, warn};
 
 use crate::{
-    util::{spawn_from_sync, Cubit, CubitCore},
     StreamSink,
+    util::{Cubit, CubitCore, spawn_from_sync},
 };
 
 use super::{

applogic/src/api/user.rs

@@ -7,11 +7,12 @@
 use anyhow::{Context, Result};
 use flutter_rust_bridge::frb;
 use phnxcoreclient::{
+    Asset, UserProfile,
     clients::{
-        store::{ClientRecord, ClientRecordState},
         CoreUser,
+        store::{ClientRecord, ClientRecordState},
     },
-    open_client_db, Asset, UserProfile,
+    open_client_db,
 };
 use phnxtypes::{
     identifiers::{AsClientId, QualifiedUserName},

applogic/src/api/user_cubit.rs

@@ -10,21 +10,21 @@ use std::time::Duration;
 use anyhow::bail;
 use flutter_rust_bridge::frb;
 use phnxapiclient::qs_api::ws::WsEvent;
-use phnxcoreclient::{clients::CoreUser, store::Store, ConversationId};
 use phnxcoreclient::{Asset, UserProfile};
+use phnxcoreclient::{ConversationId, clients::CoreUser, store::Store};
 use phnxtypes::identifiers::QualifiedUserName;
 use phnxtypes::messages::client_ds::QsWsMessage;
 use tokio::sync::RwLock;
 use tokio_util::sync::{CancellationToken, DropGuard};
 use tracing::{error, info, warn};
 
 use crate::{
-    api::types::{UiContact, UiUserProfile},
-    messages::FetchedMessages,
+    StreamSink,
+    util::{FibonacciBackoff, spawn_from_sync},
 };
 use crate::{
-    util::{spawn_from_sync, FibonacciBackoff},
-    StreamSink,
+    api::types::{UiContact, UiUserProfile},
+    messages::FetchedMessages,
 };
 
 use super::{types::ImageData, user::User};

applogic/src/background_execution/java_api.rs

@@ -3,9 +3,9 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
 use jni::{
+    JNIEnv,
     objects::{JClass, JString},
     sys::jstring,
-    JNIEnv,
 };
 
 use crate::{background_execution::processing::retrieve_messages_sync, logging::init_logger};

applogic/src/background_execution/swift_api.rs

@@ -2,10 +2,10 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-use std::ffi::{c_char, CStr, CString};
+use std::ffi::{CStr, CString, c_char};
 
 use crate::background_execution::{
-    processing::retrieve_messages_sync, IncomingNotificationContent,
+    IncomingNotificationContent, processing::retrieve_messages_sync,
 };
 use crate::logging::init_logger;
 

applogic/src/logging/dart.rs

@@ -8,13 +8,13 @@ use std::sync::LazyLock;
 use chrono::Utc;
 use parking_lot::RwLock;
 use tracing::field::{Field, Visit};
-use tracing::{warn, Event, Subscriber};
+use tracing::{Event, Subscriber, warn};
+use tracing_subscriber::Layer;
 use tracing_subscriber::layer::Context;
 use tracing_subscriber::registry::LookupSpan;
-use tracing_subscriber::Layer;
 
-use crate::api::logging::LogEntry;
 use crate::StreamSink;
+use crate::api::logging::LogEntry;
 
 static DART_SINK: LazyLock<RwLock<Option<StreamSink<LogEntry>>>> =
     LazyLock::new(|| RwLock::new(None));

applogic/src/logging/mod.rs

@@ -14,8 +14,8 @@ use anyhow::Context;
 use tracing::warn;
 use tracing::{info, level_filters::LevelFilter};
 use tracing_subscriber::util::{SubscriberInitExt, TryInitError};
+use tracing_subscriber::{EnvFilter, registry};
 use tracing_subscriber::{fmt, layer::SubscriberExt};
-use tracing_subscriber::{registry, EnvFilter};
 
 use crate::util::{FileRingBuffer, FileRingBufferLock};
 

applogic/src/messages.rs

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
 use anyhow::Result;
-use phnxcoreclient::{clients::process::process_qs::ProcessedQsMessages, ConversationId};
+use phnxcoreclient::{ConversationId, clients::process::process_qs::ProcessedQsMessages};
 
 use crate::{api::user::User, notifications::LocalNotificationContent};