Show First 20 Lines • Show All 132 Lines • ▼ Show 20 Lines	RUNTIME.spawn(async move {
return;		return;
}		}

trigger_backup_file_upload();		trigger_backup_file_upload();
// The promise will be resolved when the backup is uploaded		// The promise will be resolved when the backup is uploaded
});		});
}		}

pub fn retrieve_backup_keys(		pub fn get_backup_user_keys(
		user_identifier: String,
backup_secret: String,		backup_secret: String,
backup_id: String,		backup_id: String,
promise_id: u32,		promise_id: u32,
) {		) {
RUNTIME.spawn(async move {		RUNTIME.spawn(async move {
let result = download_backup_keys(backup_id, backup_secret)		let result =
		download_backup_keys(user_identifier, backup_secret, backup_id)
.await		.await
.map_err(\|err\| err.to_string());		.map_err(\|err\| err.to_string());

let result = match result {		let result = match result {
Ok(result) => result,		Ok(result) => result,
Err(error) => {		Err(error) => {
string_callback(error, promise_id, "".to_string());		string_callback(error, promise_id, "".to_string());
return;		return;
}		}
};		};
▲ Show 20 Lines • Show All 179 Lines • ▼ Show 20 Lines	) -> Result<LatestBackupInfoResponse, Box<dyn Error>> {
Ok(LatestBackupInfoResponse {		Ok(LatestBackupInfoResponse {
backup_id,		backup_id,
user_id,		user_id,
siwe_backup_msg,		siwe_backup_msg,
})		})
}		}

async fn download_backup_keys(		async fn download_backup_keys(
backup_id: String,		user_identifier: String,
backup_secret: String,		backup_secret: String,
		backup_id: String,
) -> Result<UserKeys, Box<dyn Error>> {		) -> Result<UserKeys, Box<dyn Error>> {
let backup_client = BackupClient::new(BACKUP_SOCKET_ADDR)?;		let backup_client = BackupClient::new(BACKUP_SOCKET_ADDR)?;
let user_identity = get_user_identity_from_secure_store()?;

let backup_descriptor = BackupDescriptor::BackupID {		let backup_descriptor = BackupDescriptor::Latest { user_identifier };
backup_id: backup_id.clone(),
user_identity: user_identity.clone(),
};

let mut encrypted_user_keys = backup_client		let mut encrypted_user_keys = backup_client
.download_backup_data(&backup_descriptor, RequestedData::UserKeys)		.download_backup_data(&backup_descriptor, RequestedData::UserKeys)
.await?;		.await?;
let mut backup_key = compute_backup_key_str(&backup_secret, &backup_id)?;		let mut backup_key = compute_backup_key_str(&backup_secret, &backup_id)?;
UserKeys::from_encrypted(&mut encrypted_user_keys, &mut backup_key)		UserKeys::from_encrypted(&mut encrypted_user_keys, &mut backup_key)
}		}

▲ Show 20 Lines • Show All 82 Lines • ▼ Show 20 Lines
}		}

/// Stores the Olm account in `pickled_account`. However, Olm account		/// Stores the Olm account in `pickled_account`. However, Olm account
/// information might be out of date. We have decided we don't need		/// information might be out of date. We have decided we don't need
/// to update this when one-time keys (OTKs) or prekeys change.		/// to update this when one-time keys (OTKs) or prekeys change.
/// The reasoning behind this decision is that the backed-up Olm account		/// The reasoning behind this decision is that the backed-up Olm account
/// is primarily used for signing an update to the device list. For these		/// is primarily used for signing an update to the device list. For these
/// operations only the identity signing key is necessary.		/// operations only the identity signing key is necessary.
		// This struct should match `UserKeys` in `lib/types/backup-types.js`
#[derive(Debug, Serialize, Deserialize)]		#[derive(Debug, Serialize, Deserialize)]
		#[serde(rename_all = "camelCase")]
struct UserKeys {		struct UserKeys {
backup_data_key: String,		backup_data_key: String,
backup_log_data_key: String,		backup_log_data_key: String,
pickle_key: String,		pickle_key: String,
pickled_account: String,		pickled_account: String,
}		}

impl UserKeys {		impl UserKeys {
Show All 31 Lines

View Options

native/avatars/edit-user-avatar.react.js

Show First 20 Lines • Show All 132 Lines • ▼ Show 20 Lines	RUNTIME.spawn(async move {
return;		return;
}		}

trigger_backup_file_upload();		trigger_backup_file_upload();
// The promise will be resolved when the backup is uploaded		// The promise will be resolved when the backup is uploaded
});		});
}		}

pub fn retrieve_backup_keys(		pub fn get_backup_user_keys(
		user_identifier: String,
backup_secret: String,		backup_secret: String,
backup_id: String,		backup_id: String,
promise_id: u32,		promise_id: u32,
) {		) {
RUNTIME.spawn(async move {		RUNTIME.spawn(async move {
let result = download_backup_keys(backup_id, backup_secret)		let result =
		download_backup_keys(user_identifier, backup_secret, backup_id)
.await		.await
.map_err(\|err\| err.to_string());		.map_err(\|err\| err.to_string());

let result = match result {		let result = match result {
Ok(result) => result,		Ok(result) => result,
Err(error) => {		Err(error) => {
string_callback(error, promise_id, "".to_string());		string_callback(error, promise_id, "".to_string());
return;		return;
}		}
};		};
▲ Show 20 Lines • Show All 179 Lines • ▼ Show 20 Lines	) -> Result<LatestBackupInfoResponse, Box<dyn Error>> {
Ok(LatestBackupInfoResponse {		Ok(LatestBackupInfoResponse {
backup_id,		backup_id,
user_id,		user_id,
siwe_backup_msg,		siwe_backup_msg,
})		})
}		}

async fn download_backup_keys(		async fn download_backup_keys(
backup_id: String,		user_identifier: String,
backup_secret: String,		backup_secret: String,
		backup_id: String,
) -> Result<UserKeys, Box<dyn Error>> {		) -> Result<UserKeys, Box<dyn Error>> {
let backup_client = BackupClient::new(BACKUP_SOCKET_ADDR)?;		let backup_client = BackupClient::new(BACKUP_SOCKET_ADDR)?;
let user_identity = get_user_identity_from_secure_store()?;

let backup_descriptor = BackupDescriptor::BackupID {		let backup_descriptor = BackupDescriptor::Latest { user_identifier };
backup_id: backup_id.clone(),
user_identity: user_identity.clone(),
};

let mut encrypted_user_keys = backup_client		let mut encrypted_user_keys = backup_client
.download_backup_data(&backup_descriptor, RequestedData::UserKeys)		.download_backup_data(&backup_descriptor, RequestedData::UserKeys)
.await?;		.await?;
let mut backup_key = compute_backup_key_str(&backup_secret, &backup_id)?;		let mut backup_key = compute_backup_key_str(&backup_secret, &backup_id)?;
UserKeys::from_encrypted(&mut encrypted_user_keys, &mut backup_key)		UserKeys::from_encrypted(&mut encrypted_user_keys, &mut backup_key)
}		}

▲ Show 20 Lines • Show All 82 Lines • ▼ Show 20 Lines
}		}

/// Stores the Olm account in `pickled_account`. However, Olm account		/// Stores the Olm account in `pickled_account`. However, Olm account
/// information might be out of date. We have decided we don't need		/// information might be out of date. We have decided we don't need
/// to update this when one-time keys (OTKs) or prekeys change.		/// to update this when one-time keys (OTKs) or prekeys change.
/// The reasoning behind this decision is that the backed-up Olm account		/// The reasoning behind this decision is that the backed-up Olm account
/// is primarily used for signing an update to the device list. For these		/// is primarily used for signing an update to the device list. For these
/// operations only the identity signing key is necessary.		/// operations only the identity signing key is necessary.
		// This struct should match `UserKeys` in `lib/types/backup-types.js`
#[derive(Debug, Serialize, Deserialize)]		#[derive(Debug, Serialize, Deserialize)]
		#[serde(rename_all = "camelCase")]
struct UserKeys {		struct UserKeys {
backup_data_key: String,		backup_data_key: String,
backup_log_data_key: String,		backup_log_data_key: String,
pickle_key: String,		pickle_key: String,
pickled_account: String,		pickled_account: String,
}		}

impl UserKeys {		impl UserKeys {
Show All 31 Lines

[native] Use `outline` variant of `emote-smile` in `Edit*Avatar` for consistencyClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 25299

native/avatars/edit-thread-avatar.react.js

native/avatars/edit-user-avatar.react.js

[native] Use `outline` variant of `emote-smile` in `Edit*Avatar` for consistency
ClosedPublic
Actions

Revision Contents
Changeset List