Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-05 14:26:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

location: use "bool" for "independent" argument

Browse Source
This commit is contained in:
Alexander Krotov
2019-11-06 13:50:14 +03:00
parent 1a33b1c574
commit 51a804a80f
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/dc_receive_imf.rs
View File

@@ -850,7 +850,7 @@ fn save_locations(
if mime_parser.message_kml.is_some() { if mime_parser.message_kml.is_some() {
let locations = &mime_parser.message_kml.as_ref().unwrap().locations; let locations = &mime_parser.message_kml.as_ref().unwrap().locations;
let newest_location_id = let newest_location_id =
location::save(context, chat_id, from_id, locations, 1).unwrap_or_default(); location::save(context, chat_id, from_id, locations, true).unwrap_or_default();
if 0 != newest_location_id && 0 == hidden { if 0 != newest_location_id && 0 == hidden {
if location::set_msg_location_id(context, insert_msg_id, newest_location_id).is_ok() { if location::set_msg_location_id(context, insert_msg_id, newest_location_id).is_ok() {
location_id_written = true; location_id_written = true;
@@ -865,7 +865,8 @@ fn save_locations(
if contact.get_addr().to_lowercase() == addr.to_lowercase() { if contact.get_addr().to_lowercase() == addr.to_lowercase() {
let locations = &mime_parser.location_kml.as_ref().unwrap().locations; let locations = &mime_parser.location_kml.as_ref().unwrap().locations;
let newest_location_id = let newest_location_id =
location::save(context, chat_id, from_id, locations, 0).unwrap_or_default(); location::save(context, chat_id, from_id, locations, false)
.unwrap_or_default();
if newest_location_id != 0 && hidden == 0 && !location_id_written { if newest_location_id != 0 && hidden == 0 && !location_id_written {
if let Err(err) = location::set_msg_location_id( if let Err(err) = location::set_msg_location_id(
context, context,

4
src/location.rs
View File

@@ -492,7 +492,7 @@ pub fn save(
chat_id: u32, chat_id: u32,
contact_id: u32, contact_id: u32,
locations: &[Location], locations: &[Location],
independent: i32, independent: bool,
) -> Result<u32, Error> { ) -> Result<u32, Error> {
ensure!(chat_id > DC_CHAT_ID_LAST_SPECIAL, "Invalid chat id"); ensure!(chat_id > DC_CHAT_ID_LAST_SPECIAL, "Invalid chat id");
context.sql.prepare2( context.sql.prepare2(
@@ -507,7 +507,7 @@ pub fn save(
for location in locations { for location in locations {
let exists = stmt_test.exists(params![location.timestamp, contact_id as i32])?; let exists = stmt_test.exists(params![location.timestamp, contact_id as i32])?;
if 0 != independent || !exists { if independent || !exists {
stmt_insert.execute(params![ stmt_insert.execute(params![
location.timestamp, location.timestamp,
contact_id as i32, contact_id as i32,