- changed to different openssl lib

- redesigned app icon

android-sources/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="com.itsblue.flgvertretungbeta" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.1.0" android:versionCode="17" android:installLocation="auto">
+<manifest package="com.itsblue.flgvertretungtest" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.1.0" android:versionCode="17" android:installLocation="auto">
     <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28"/>
 
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.

android-sources/libs/arm64-v8a/lib/symlink-windows.bat

@@ -1,3 +0,0 @@
-del libcrypto.so libssl.so
-mklink /H libcrypto.so libcrypto.so.1.1
-mklink /H libssl.so libssl.so.1.1

android-sources/libs/armeabi/lib/symlink-windows.bat

@@ -1,3 +0,0 @@
-del libcrypto.so libssl.so
-mklink /H libcrypto.so libcrypto.so.1.1
-mklink /H libssl.so libssl.so.1.1

android-sources/libs/x86/lib/symlink-windows.bat

@@ -1,3 +0,0 @@
-del libcrypto.so libssl.so
-mklink /H libcrypto.so libcrypto.so.1.1
-mklink /H libssl.so libssl.so.1.1

android-sources/libs/x86_64/lib/symlink-windows.bat

@@ -1,3 +0,0 @@
-del libcrypto.so libssl.so
-mklink /H libcrypto.so libcrypto.so.1.1
-mklink /H libssl.so libssl.so.1.1

android_openssl-master/README.md

@@ -0,0 +1,15 @@
+# android_openssl
+OpenSSL scripts and bins for Android (useful for Qt on Android apps)
+
+In this repo you can find prebuilt openssl libs for Android and a qmake `.pri` file.
+
+The following branches/tag(s) are available
+* `1.0.x` branch has OpenSSL 1.0.x which can be used with **Qt up to 5.12.3**
+* `5.12.4_5.13.0` tag has OpenSSL 1.1.x which can be used **ONLY with 5.12.4 and 5.13.0**. Be aware that on Android 5 (API 21) these libs names are clasing with the system SSL libs which are using OpenSSL 1.0, this means your Qt app will fail to use OpenSSL 1.1 as the system ones are already loaded by the OS.
+* `master` branch is needed for **Qt 5.12.5+ and 5.13.1+**
+
+To add openssl in your qmake project just add:
+```
+include(<path/to/android_openssl/openssl.pri)
+```
+to your `.pro` file

android_openssl-master/build_ssl.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+
+VERSION=1.1.1d
+export ANDROID_NDK_HOME=~/android/ndk-bundle
+ANDROID_API=21
+
+if [ ! -f "openssl-$VERSION.tar.gz" ]; then
+    wget https://www.openssl.org/source/openssl-$VERSION.tar.gz
+fi
+
+for arch in "x86_64" "x86" "arm64" "arm"
+do
+    rm -fr $arch
+    mkdir $arch
+    rm -fr openssl-$VERSION
+    tar xfa openssl-$VERSION.tar.gz
+    cd openssl-$VERSION
+
+    case $arch in
+        arm)
+            ANDROID_API=16
+            ;;
+        x86)
+            ANDROID_API=16
+            ;;
+        arm64)
+            ANDROID_API=21
+            ;;
+        x86_64)
+            ANDROID_API=21
+            ;;
+    esac
+    ANDROID_TOOLCHAIN=""
+    for host in "linux-x86_64" "linux-x86" "darwin-x86_64" "darwin-x86"
+    do
+        if [ -d "$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/$host/bin" ]; then
+            ANDROID_TOOLCHAIN="$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/$host/bin"
+            break
+        fi
+    done
+
+    export PATH="$ANDROID_TOOLCHAIN":"$PATH"
+
+    ./Configure shared android-${arch} -D__ANDROID_API__=${ANDROID_API} || exit 1
+    make depend
+    make -j$(nproc) SHLIB_VERSION_NUMBER= SHLIB_EXT=_1_1.so build_libs || exit 1
+    llvm-strip -strip-all libcrypto_1_1.so
+    llvm-strip -strip-all libssl_1_1.so
+    cp libcrypto_1_1.so ../$arch
+    cp libssl_1_1.so ../$arch
+    cd ..
+done

android_openssl-master/openssl.pri

@@ -0,0 +1,35 @@
+versionAtLeast(QT_VERSION, "5.14.0") {
+    ANDROID_EXTRA_LIBS += \
+        $$PWD/arm/libcrypto_1_1.so \
+        $$PWD/arm/libssl_1_1.so \
+        $$PWD/arm64/libcrypto_1_1.so \
+        $$PWD/arm64/libssl_1_1.so \
+        $$PWD/x86/libcrypto_1_1.so \
+        $$PWD/x86/libssl_1_1.so \
+        $$PWD/x86_64/libcrypto_1_1.so \
+        $$PWD/x86_64/libssl_1_1.so
+} else {
+    equals(ANDROID_TARGET_ARCH,armeabi-v7a) {
+        ANDROID_EXTRA_LIBS += \
+            $$PWD/arm/libcrypto.so \
+            $$PWD/arm/libssl.so
+    }
+
+    equals(ANDROID_TARGET_ARCH,arm64-v8a) {
+        ANDROID_EXTRA_LIBS += \
+            $$PWD/arm64/libcrypto_1_1.so \
+            $$PWD/arm64/libssl_1_1.so
+    }
+
+    equals(ANDROID_TARGET_ARCH,x86) {
+        ANDROID_EXTRA_LIBS += \
+            $$PWD/x86/libcrypto_1_1.so \
+            $$PWD/x86/libssl_1_1.so
+    }
+
+    equals(ANDROID_TARGET_ARCH,x86_64) {
+        ANDROID_EXTRA_LIBS += \
+            $$PWD/x86_64/libcrypto_1_1.so \
+            $$PWD/x86_64/libssl_1_1.so
+    }
+}

fannyapp.pro

@@ -56,6 +56,7 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
 android {
     QT += androidextras
     ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android-sources
+    include($$PWD/android_openssl-master/openssl.pri)
 }
 
 win {
@@ -74,4 +75,3 @@ DISTFILES += \
     CHANGELOG.md \
     android-sources/src/de/itsblue/fannyapp/MainActivity.java \
     android-sources/src/org/ekkescorner/utils/QShareUtils.java
-

sources/serverconn.cpp

@@ -72,7 +72,7 @@ int ServerConn::login(QString username, QString password, bool permanent)
     pdata.addQueryItem("password", password);
 
     // send the request
-    QVariantMap ret = this->senddata(QUrl("http://www.fanny-leicht.de/j34/templates/g5_helium/intern/events.php"), pdata);
+    QVariantMap ret = this->senddata(QUrl("https://www.fanny-leicht.de/j34/templates/g5_helium/intern/events.php"), pdata);
 
     if(ret["status"].toInt() == 200){
         // if not 200 was returned -> user data was correct
@@ -360,7 +360,8 @@ int ServerConn::getFoodPlan()
             QString dataValue = foodplanDay.toObject().value(foodplanDataKey).toString();
             if(foodplanDataKey == foodplanDateKey){
                 QDateTime date;
-                date.setTime_t(uint(dataValue.toInt()));
+                date.setSecsSinceEpoch(uint(dataValue.toInt()));
+                date.setTimeSpec(Qt::UTC);
 
                 // get the current date and time
                 QDateTime currentDateTime = QDateTime::currentDateTimeUtc();
@@ -372,7 +373,7 @@ int ServerConn::getFoodPlan()
                     // the given day is today
                     readableDateString = "Heute";
                 }
-                else if (date.toTime_t() < ( currentDateTime.toTime_t() + ( 24 * 60 * 60 ))) {
+                else if (date.toTime_t() < ( currentDateTime.toTime_t() + ( 48 * 60 * 60 ) )) {
                     // the given day is tomorrow
                     readableDateString = "Morgen";
                 }