Page MenuHomePhabricator
Differential D8920

Revert "[native] fix RetrySend not visible when message fails"
ClosedPublic
Actions

Authored by ginsu on Aug 22 2023, 12:14 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Apr 6, 9:33 PM
Unknown Object (File)
Tue, Apr 1, 8:34 AM
Unknown Object (File)
Mon, Mar 31, 10:40 PM
Unknown Object (File)
Tue, Mar 11, 3:56 PM
Unknown Object (File)
Mar 3 2025, 1:35 PM
Unknown Object (File)
Mar 1 2025, 4:42 PM
Unknown Object (File)
Mar 1 2025, 4:42 PM
Unknown Object (File)
Mar 1 2025, 4:41 PM
View All 85 Files
Subscribers
ashoat
tomek

Details

Reviewers
ashoat
tomek
atul
Commits
rCOMM7dde47e88e9e: Revert "[native] fix RetrySend not visible when message fails"
Summary

This reverts commit df101e5f740acb88690353c7412a2e5bc9c5413a.

Test Plan

n/a

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

Diff 30267

View Options

native/chat/composed-message.react.js

Show All 30 Lines
use super::DatabaseClient; use super::DatabaseClient;
impl DatabaseClient { impl DatabaseClient {
/// Gets the next one-time key for the account and then, in a transaction, /// Gets the next one-time key for the account and then, in a transaction,
/// deletes the key and updates the key count /// deletes the key and updates the key count
/// ///
/// Returns the retrieved one-time key if it exists and a boolean indicating /// Returns the retrieved one-time key if it exists and a boolean indicating
/// whether the `spawn_refresh_keys_task`` was called /// whether the `spawn_refresh_keys_task`` was called
#[tracing::instrument(skip_all)]
pub(super) async fn get_one_time_key( pub(super) async fn get_one_time_key(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
account_type: OlmAccountType, account_type: OlmAccountType,
can_request_more_keys: bool, can_request_more_keys: bool,
) -> Result<(Option<String>, bool), Error> { ) -> Result<(Option<String>, bool), Error> {
use crate::constants::devices_table; use crate::constants::devices_table;
▲ Show 20 Lines • Show All 102 Lines • ▼ Show 20 Lines loop {
); );
return Err(Error::AwsSdk(dynamo_db_error)); return Err(Error::AwsSdk(dynamo_db_error));
} }
} }
} }
} }
} }
#[tracing::instrument(skip_all)]
async fn get_one_time_keys( async fn get_one_time_keys(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
account_type: OlmAccountType, account_type: OlmAccountType,
num_keys: Option<usize>, num_keys: Option<usize>,
) -> Result<Vec<OTKRow>, Error> { ) -> Result<Vec<OTKRow>, Error> {
use crate::constants::one_time_keys_table::*; use crate::constants::one_time_keys_table::*;
Show All 33 Lines if let Some(limit) = num_keys {
error!("There are fewer one-time keys than the number requested"); error!("There are fewer one-time keys than the number requested");
return Err(Error::NotEnoughOneTimeKeys); return Err(Error::NotEnoughOneTimeKeys);
} }
} }
Ok(otk_rows) Ok(otk_rows)
} }
#[tracing::instrument(skip_all)]
pub async fn append_one_time_prekeys( pub async fn append_one_time_prekeys(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
content_one_time_keys: &Vec<String>, content_one_time_keys: &Vec<String>,
notif_one_time_keys: &Vec<String>, notif_one_time_keys: &Vec<String>,
) -> Result<(), Error> { ) -> Result<(), Error> {
use crate::constants::retry; use crate::constants::retry;
▲ Show 20 Lines • Show All 115 Lines • ▼ Show 20 Lines loop {
} }
} }
} }
} }
Ok(()) Ok(())
} }
#[tracing::instrument(skip_all)]
async fn get_otk_count( async fn get_otk_count(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
account_type: OlmAccountType, account_type: OlmAccountType,
) -> Result<usize, Error> { ) -> Result<usize, Error> {
use crate::constants::devices_table; use crate::constants::devices_table;
▲ Show 20 Lines • Show All 142 Lines • Show Last 20 Lines
View Options

native/chat/failed-send.react.js

Show All 30 Lines
use super::DatabaseClient; use super::DatabaseClient;
impl DatabaseClient { impl DatabaseClient {
/// Gets the next one-time key for the account and then, in a transaction, /// Gets the next one-time key for the account and then, in a transaction,
/// deletes the key and updates the key count /// deletes the key and updates the key count
/// ///
/// Returns the retrieved one-time key if it exists and a boolean indicating /// Returns the retrieved one-time key if it exists and a boolean indicating
/// whether the `spawn_refresh_keys_task`` was called /// whether the `spawn_refresh_keys_task`` was called
#[tracing::instrument(skip_all)]
pub(super) async fn get_one_time_key( pub(super) async fn get_one_time_key(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
account_type: OlmAccountType, account_type: OlmAccountType,
can_request_more_keys: bool, can_request_more_keys: bool,
) -> Result<(Option<String>, bool), Error> { ) -> Result<(Option<String>, bool), Error> {
use crate::constants::devices_table; use crate::constants::devices_table;
▲ Show 20 Lines • Show All 102 Lines • ▼ Show 20 Lines loop {
); );
return Err(Error::AwsSdk(dynamo_db_error)); return Err(Error::AwsSdk(dynamo_db_error));
} }
} }
} }
} }
} }
#[tracing::instrument(skip_all)]
async fn get_one_time_keys( async fn get_one_time_keys(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
account_type: OlmAccountType, account_type: OlmAccountType,
num_keys: Option<usize>, num_keys: Option<usize>,
) -> Result<Vec<OTKRow>, Error> { ) -> Result<Vec<OTKRow>, Error> {
use crate::constants::one_time_keys_table::*; use crate::constants::one_time_keys_table::*;
Show All 33 Lines if let Some(limit) = num_keys {
error!("There are fewer one-time keys than the number requested"); error!("There are fewer one-time keys than the number requested");
return Err(Error::NotEnoughOneTimeKeys); return Err(Error::NotEnoughOneTimeKeys);
} }
} }
Ok(otk_rows) Ok(otk_rows)
} }
#[tracing::instrument(skip_all)]
pub async fn append_one_time_prekeys( pub async fn append_one_time_prekeys(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
content_one_time_keys: &Vec<String>, content_one_time_keys: &Vec<String>,
notif_one_time_keys: &Vec<String>, notif_one_time_keys: &Vec<String>,
) -> Result<(), Error> { ) -> Result<(), Error> {
use crate::constants::retry; use crate::constants::retry;
▲ Show 20 Lines • Show All 115 Lines • ▼ Show 20 Lines loop {
} }
} }
} }
} }
Ok(()) Ok(())
} }
#[tracing::instrument(skip_all)]
async fn get_otk_count( async fn get_otk_count(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
account_type: OlmAccountType, account_type: OlmAccountType,
) -> Result<usize, Error> { ) -> Result<usize, Error> {
use crate::constants::devices_table; use crate::constants::devices_table;
▲ Show 20 Lines • Show All 142 Lines • Show Last 20 Lines
View Options

native/chat/message.react.js

Show All 30 Lines
use super::DatabaseClient; use super::DatabaseClient;
impl DatabaseClient { impl DatabaseClient {
/// Gets the next one-time key for the account and then, in a transaction, /// Gets the next one-time key for the account and then, in a transaction,
/// deletes the key and updates the key count /// deletes the key and updates the key count
/// ///
/// Returns the retrieved one-time key if it exists and a boolean indicating /// Returns the retrieved one-time key if it exists and a boolean indicating
/// whether the `spawn_refresh_keys_task`` was called /// whether the `spawn_refresh_keys_task`` was called
#[tracing::instrument(skip_all)]
pub(super) async fn get_one_time_key( pub(super) async fn get_one_time_key(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
account_type: OlmAccountType, account_type: OlmAccountType,
can_request_more_keys: bool, can_request_more_keys: bool,
) -> Result<(Option<String>, bool), Error> { ) -> Result<(Option<String>, bool), Error> {
use crate::constants::devices_table; use crate::constants::devices_table;
▲ Show 20 Lines • Show All 102 Lines • ▼ Show 20 Lines loop {
); );
return Err(Error::AwsSdk(dynamo_db_error)); return Err(Error::AwsSdk(dynamo_db_error));
} }
} }
} }
} }
} }
#[tracing::instrument(skip_all)]
async fn get_one_time_keys( async fn get_one_time_keys(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
account_type: OlmAccountType, account_type: OlmAccountType,
num_keys: Option<usize>, num_keys: Option<usize>,
) -> Result<Vec<OTKRow>, Error> { ) -> Result<Vec<OTKRow>, Error> {
use crate::constants::one_time_keys_table::*; use crate::constants::one_time_keys_table::*;
Show All 33 Lines if let Some(limit) = num_keys {
error!("There are fewer one-time keys than the number requested"); error!("There are fewer one-time keys than the number requested");
return Err(Error::NotEnoughOneTimeKeys); return Err(Error::NotEnoughOneTimeKeys);
} }
} }
Ok(otk_rows) Ok(otk_rows)
} }
#[tracing::instrument(skip_all)]
pub async fn append_one_time_prekeys( pub async fn append_one_time_prekeys(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
content_one_time_keys: &Vec<String>, content_one_time_keys: &Vec<String>,
notif_one_time_keys: &Vec<String>, notif_one_time_keys: &Vec<String>,
) -> Result<(), Error> { ) -> Result<(), Error> {
use crate::constants::retry; use crate::constants::retry;
▲ Show 20 Lines • Show All 115 Lines • ▼ Show 20 Lines loop {
} }
} }
} }
} }
Ok(()) Ok(())
} }
#[tracing::instrument(skip_all)]
async fn get_otk_count( async fn get_otk_count(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
account_type: OlmAccountType, account_type: OlmAccountType,
) -> Result<usize, Error> { ) -> Result<usize, Error> {
use crate::constants::devices_table; use crate::constants::devices_table;
▲ Show 20 Lines • Show All 142 Lines • Show Last 20 Lines
View Options

native/chat/robotext-message.react.js

Show All 30 Lines
use super::DatabaseClient; use super::DatabaseClient;
impl DatabaseClient { impl DatabaseClient {
/// Gets the next one-time key for the account and then, in a transaction, /// Gets the next one-time key for the account and then, in a transaction,
/// deletes the key and updates the key count /// deletes the key and updates the key count
/// ///
/// Returns the retrieved one-time key if it exists and a boolean indicating /// Returns the retrieved one-time key if it exists and a boolean indicating
/// whether the `spawn_refresh_keys_task`` was called /// whether the `spawn_refresh_keys_task`` was called
#[tracing::instrument(skip_all)]
pub(super) async fn get_one_time_key( pub(super) async fn get_one_time_key(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
account_type: OlmAccountType, account_type: OlmAccountType,
can_request_more_keys: bool, can_request_more_keys: bool,
) -> Result<(Option<String>, bool), Error> { ) -> Result<(Option<String>, bool), Error> {
use crate::constants::devices_table; use crate::constants::devices_table;
▲ Show 20 Lines • Show All 102 Lines • ▼ Show 20 Lines loop {
); );
return Err(Error::AwsSdk(dynamo_db_error)); return Err(Error::AwsSdk(dynamo_db_error));
} }
} }
} }
} }
} }
#[tracing::instrument(skip_all)]
async fn get_one_time_keys( async fn get_one_time_keys(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
account_type: OlmAccountType, account_type: OlmAccountType,
num_keys: Option<usize>, num_keys: Option<usize>,
) -> Result<Vec<OTKRow>, Error> { ) -> Result<Vec<OTKRow>, Error> {
use crate::constants::one_time_keys_table::*; use crate::constants::one_time_keys_table::*;
Show All 33 Lines if let Some(limit) = num_keys {
error!("There are fewer one-time keys than the number requested"); error!("There are fewer one-time keys than the number requested");
return Err(Error::NotEnoughOneTimeKeys); return Err(Error::NotEnoughOneTimeKeys);
} }
} }
Ok(otk_rows) Ok(otk_rows)
} }
#[tracing::instrument(skip_all)]
pub async fn append_one_time_prekeys( pub async fn append_one_time_prekeys(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
content_one_time_keys: &Vec<String>, content_one_time_keys: &Vec<String>,
notif_one_time_keys: &Vec<String>, notif_one_time_keys: &Vec<String>,
) -> Result<(), Error> { ) -> Result<(), Error> {
use crate::constants::retry; use crate::constants::retry;
▲ Show 20 Lines • Show All 115 Lines • ▼ Show 20 Lines loop {
} }
} }
} }
} }
Ok(()) Ok(())
} }
#[tracing::instrument(skip_all)]
async fn get_otk_count( async fn get_otk_count(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
account_type: OlmAccountType, account_type: OlmAccountType,
) -> Result<usize, Error> { ) -> Result<usize, Error> {
use crate::constants::devices_table; use crate::constants::devices_table;
▲ Show 20 Lines • Show All 142 Lines • Show Last 20 Lines