haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Report better SSL state for mobile apps 

I tried to enable SSL, because I didn't want to be insecure, as
stated by the message "insecure: ssl disabled". But for mobile
apps the whole communication is actually local and SSL no any
support option, so this is hopefully a better message.

Change-Id: I35c50772ed49910997b80e6f449483da21775120
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98552
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
private/tml/ios-gen2
Jan-Marek Glogowski 2020-07-11 02:57:25 +02:00 committed by Michael Meeks
parent 63620b1823
commit c45d8197a6
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -915,7 +915,7 @@ mobile_app=
ENABLE_MOBILEAPP=
MOBILEAPP=0
AC_MSG_CHECKING([Is this a mobile app])
if test "$enable_gtkapp" = "yes" -o "$enable_iosapp" = "yes" -o "$enable_androidapp"; then
if test "$enable_gtkapp" = "yes" -o "$enable_iosapp" = "yes" -o "$enable_androidapp" = "yes"; then
AC_MSG_RESULT([Yes])
mobile_app=true;
MOBILEAPP=1
@ -933,7 +933,11 @@ if test "$enable_ssl" != "no" -a "$mobile_app" != "true"; then
ENABLE_SSL=true
AC_DEFINE([ENABLE_SSL],1,[Whether to enable SSL])
else
ssl_msg="insecure: ssl disabled"
if test "$mobile_app" != "true"; then
ssl_msg="insecure: ssl disabled"
else
ssl_msg="invalid for mobile apps (disabled)"
fi
ENABLE_SSL=false
AC_DEFINE([ENABLE_SSL],0,[Whether to enable SSL])
fi