Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-19 22:46:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Prepare for android builds (#88)

Browse Source 
* upgrade ci

* fixup

* update ci script

* Update run.sh

* refactor(time): drop libc time functions

* fix(ffi): use i64 instead off time_t

* fix(ci): install croos

* fix: remove unused dc_check_password

* fix(ffi): enable ssl vendoring by default

* chore: remove unused import

* fix(deps): add vendored flag for reqwest

* chore(ci): use cross fork

* fix: handle invalid  server configurations

Closes #90

* Disable android from circle ci for now
This commit is contained in:
Friedel Ziegelmayer
2019-05-28 17:41:50 +02:00
committed by Lars-Magnus Skog
parent 2a5d0c64d5
commit 0d51c7dd2e
30 changed files with 459 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/imap.rs
View File

@@ -372,6 +372,10 @@ impl Imap {
}
fn setup_handle_if_needed(&self, context: &Context) -> libc::c_int {
if self.config.read().unwrap().imap_server.is_empty() {
return 0;
}
if self.should_reconnect() {
self.unsetup_handle(context);
}
@@ -433,18 +437,15 @@ impl Imap {
let imap_server: &str = config.imap_server.as_ref();
let imap_port = config.imap_port;
eprintln!("failed to connect: {:?}", err);
unsafe {
dc_log_event_seq(
context,
Event::ERROR_NETWORK,
&mut 0 as *mut i32,
b"Could not connect to IMAP-server %s:%i.\x00" as *const u8
as *const libc::c_char,
imap_server,
imap_port as usize as libc::c_int,
)
};
log_event!(
context,
Event::ERROR_NETWORK,
0,
format!(
"Could not connect to IMAP-server {}:{}. ({})",
imap_server, imap_port, err
),
);
return 0;
}
@@ -458,15 +459,12 @@ impl Imap {
1
}
Err((err, _)) => {
eprintln!("failed to login: {:?}", err);
unsafe {
dc_log_event_seq(
context,
Event::ERROR_NETWORK,
&mut 0 as *mut i32,
b"Cannot login\x00" as *const u8 as *const libc::c_char,
)
};
log_event!(
context,
Event::ERROR_NETWORK,
0,
format!("Cannot login ({})", err),
);
self.unsetup_handle(context);
@@ -547,6 +545,7 @@ impl Imap {
}
if self.setup_handle_if_needed(context) == 0 {
self.free_connect_params();
return 0;
}