# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1553494269 -3600
# Node ID ef77423ce500b86b6eaad2d18c1c8251dfc45476
# Parent  b0461363bc658065e884958d62c91cf7fea51f56
core: store tls_validation flag in host and use if for file upload.

diff -r b0461363bc65 -r ef77423ce500 android/sat.conf
--- a/android/sat.conf	Wed Mar 20 09:29:44 2019 +0100
+++ b/android/sat.conf	Mon Mar 25 07:11:09 2019 +0100
@@ -4,5 +4,6 @@
 log_fmt = #[%%(levelname)s][%%(name)s] %%(message)s
 
 [cagou]
+no_certificate_validation = true
 log_level = debug
 log_fmt = [%%(levelname)s][%%(name)s] %%(message)s
diff -r b0461363bc65 -r ef77423ce500 cagou/core/cagou_main.py
--- a/cagou/core/cagou_main.py	Wed Mar 20 09:29:44 2019 +0100
+++ b/cagou/core/cagou_main.py	Mon Mar 25 07:11:09 2019 +0100
@@ -429,10 +429,11 @@
         self._visible_widgets = {}  # visible widgets by classes
         self.version = C.APP_VERSION  # will be replaced by getVersion()
 
-        if C.bool(config.getConfig(main_config,
-                                   C.CONFIG_SECTION,
-                                   'no_certificate_validation',
-                                   C.BOOL_FALSE)):
+        self.tls_validation =  not C.bool(config.getConfig(main_config,
+                                                           C.CONFIG_SECTION,
+                                                           'no_certificate_validation',
+                                                           C.BOOL_FALSE))
+        if not self.tls_validation:
             from cagou.core import patches
             patches.apply()
             log.warning(u"SSL certificate validation is disabled, this is unsecure!")
diff -r b0461363bc65 -r ef77423ce500 cagou/plugins/plugin_wid_chat.py
--- a/cagou/plugins/plugin_wid_chat.py	Wed Mar 20 09:29:44 2019 +0100
+++ b/cagou/plugins/plugin_wid_chat.py	Mon Mar 25 07:11:09 2019 +0100
@@ -627,12 +627,13 @@
                 file_path,
                 "",
                 "",
-                {"ignore_tls_errors": C.BOOL_TRUE},  # FIXME: should not be the default
+                {"ignore_tls_errors": C.boolConst(not G.host.tls_validation)},
                 self.profile,
                 callback = partial(
                     G.host.actionManager,
                     progress_cb = partial(self.fileTransferCb, cleaning_cb=cleaning_cb),
-                    progress_eb = partial(self.fileTransferEb, cleaning_cb=cleaning_cb),               )
+                    progress_eb = partial(self.fileTransferEb, cleaning_cb=cleaning_cb),
+                    )
             )
         elif transfer_type == C.TRANSFER_SEND:
             if self.type == C.CHAT_GROUP: