From f14878b05ee885f1747feab256011b4da72ae778 Mon Sep 17 00:00:00 2001
From: Erik Prabowo Kamal <erik@darapsa.co.id>
Date: Fri, 23 Aug 2019 15:36:18 +0800
Subject: Started to use cURL

---
 kelakon.pro | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'kelakon.pro')

diff --git a/kelakon.pro b/kelakon.pro
index fb0d403..e0e0d89 100644
--- a/kelakon.pro
+++ b/kelakon.pro
@@ -1,6 +1,15 @@
 QT += quickcontrols2
 
+HEADERS += \
+	rtclient.h \
+	networkworker.hxx
+
 SOURCES += \
-    main.cxx
+	rtclient.c \
+	networkworker.cxx \
+	main.cxx
 
 RESOURCES += kelakon.qrc
+
+LIBS += \
+	-lcurl
-- 
cgit v1.3


From 356fa9d29a53aa0dba28016b932f8042f8d3970a Mon Sep 17 00:00:00 2001
From: Erik Prabowo Kamal <erik@darapsa.co.id>
Date: Fri, 23 Aug 2019 17:47:20 +0800
Subject: Started using cURL on Android

There's a quirk since Clang.
It seems the Android search path setting messes up the standard library
compilation.
So for now, what you do is remove the android-* setting to make Qt
compile, even though it would say it cannot find libcurl, and then put
the setting back again to link with libcurl.
---
 kelakon.pro | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'kelakon.pro')

diff --git a/kelakon.pro b/kelakon.pro
index e0e0d89..8f1240f 100644
--- a/kelakon.pro
+++ b/kelakon.pro
@@ -11,5 +11,12 @@ SOURCES += \
 
 RESOURCES += kelakon.qrc
 
+android-* {
+	INCLUDEPATH += $$(ANDROID_STANDALONE_TOOLCHAIN)/usr/include
+	LIBS += -L$$(ANDROID_STANDALONE_TOOLCHAIN)/usr/lib
+	ANDROID_EXTRA_LIBS += \
+		$$(ANDROID_STANDALONE_TOOLCHAIN)/usr/lib/libcurl.so
+}
+
 LIBS += \
 	-lcurl
-- 
cgit v1.3


From 06eb4d8c7992def13ad5ca70baba3acda2f35a06 Mon Sep 17 00:00:00 2001
From: Erik Prabowo Kamal <erik@darapsa.co.id>
Date: Sat, 24 Aug 2019 14:56:01 +0800
Subject: Simplified qmake syntax

---
 kelakon.pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kelakon.pro')

diff --git a/kelakon.pro b/kelakon.pro
index 8f1240f..ab6c01c 100644
--- a/kelakon.pro
+++ b/kelakon.pro
@@ -11,7 +11,7 @@ SOURCES += \
 
 RESOURCES += kelakon.qrc
 
-android-* {
+android {
 	INCLUDEPATH += $$(ANDROID_STANDALONE_TOOLCHAIN)/usr/include
 	LIBS += -L$$(ANDROID_STANDALONE_TOOLCHAIN)/usr/lib
 	ANDROID_EXTRA_LIBS += \
-- 
cgit v1.3


From 393bb95e97f8e53c430fb95926128ad2b683af63 Mon Sep 17 00:00:00 2001
From: Erik Prabowo Kamal <erik@darapsa.co.id>
Date: Sat, 24 Aug 2019 18:20:29 +0800
Subject: On Android, include OpenSSL libs

---
 kelakon.pro | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'kelakon.pro')

diff --git a/kelakon.pro b/kelakon.pro
index ab6c01c..3ae1497 100644
--- a/kelakon.pro
+++ b/kelakon.pro
@@ -15,6 +15,8 @@ android {
 	INCLUDEPATH += $$(ANDROID_STANDALONE_TOOLCHAIN)/usr/include
 	LIBS += -L$$(ANDROID_STANDALONE_TOOLCHAIN)/usr/lib
 	ANDROID_EXTRA_LIBS += \
+		$$(ANDROID_STANDALONE_TOOLCHAIN)/usr/lib/libcrypto.so \
+		$$(ANDROID_STANDALONE_TOOLCHAIN)/usr/lib/libssl.so \
 		$$(ANDROID_STANDALONE_TOOLCHAIN)/usr/lib/libcurl.so
 }
 
-- 
cgit v1.3


From c4d1459599fc312ca4bdd5300d3f00ba24bd2af3 Mon Sep 17 00:00:00 2001
From: Erik Prabowo Kamal <erik@darapsa.co.id>
Date: Sat, 24 Aug 2019 21:31:42 +0800
Subject: Made specific Android settings apply on Qt Creator

By using the "contains" function, and also just hardcode the toolchain
path.
---
 kelakon.pro | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'kelakon.pro')

diff --git a/kelakon.pro b/kelakon.pro
index 3ae1497..35bc0a9 100644
--- a/kelakon.pro
+++ b/kelakon.pro
@@ -11,13 +11,13 @@ SOURCES += \
 
 RESOURCES += kelakon.qrc
 
-android {
-	INCLUDEPATH += $$(ANDROID_STANDALONE_TOOLCHAIN)/usr/include
-	LIBS += -L$$(ANDROID_STANDALONE_TOOLCHAIN)/usr/lib
+contains(ANDROID_TARGET_ARCH,armeabi-v7a) {
+	INCLUDEPATH += /usr/local/arm-linux-androideabi/sysroot/usr/include
+	LIBS += -L/usr/local/arm-linux-androideabi/sysroot/usr/lib
 	ANDROID_EXTRA_LIBS += \
-		$$(ANDROID_STANDALONE_TOOLCHAIN)/usr/lib/libcrypto.so \
-		$$(ANDROID_STANDALONE_TOOLCHAIN)/usr/lib/libssl.so \
-		$$(ANDROID_STANDALONE_TOOLCHAIN)/usr/lib/libcurl.so
+		/usr/local/arm-linux-androideabi/sysroot/usr/lib/libcrypto.so \
+		/usr/local/arm-linux-androideabi/sysroot/usr/lib/libssl.so \
+		/usr/local/arm-linux-androideabi/sysroot/usr/lib/libcurl.so
 }
 
 LIBS += \
-- 
cgit v1.3


From c3abee20a084b3669d648077086105672cee6564 Mon Sep 17 00:00:00 2001
From: Erik Prabowo Kamal <erik@darapsa.co.id>
Date: Sun, 25 Aug 2019 09:59:11 +0800
Subject: Managed to differentiate C from C++ compilation

---
 kelakon.pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kelakon.pro')

diff --git a/kelakon.pro b/kelakon.pro
index 35bc0a9..0892052 100644
--- a/kelakon.pro
+++ b/kelakon.pro
@@ -12,7 +12,7 @@ SOURCES += \
 RESOURCES += kelakon.qrc
 
 contains(ANDROID_TARGET_ARCH,armeabi-v7a) {
-	INCLUDEPATH += /usr/local/arm-linux-androideabi/sysroot/usr/include
+	QMAKE_CFLAGS += -I/usr/local/arm-linux-androideabi/sysroot/usr/include
 	LIBS += -L/usr/local/arm-linux-androideabi/sysroot/usr/lib
 	ANDROID_EXTRA_LIBS += \
 		/usr/local/arm-linux-androideabi/sysroot/usr/lib/libcrypto.so \
-- 
cgit v1.3


From 6be07cabf768c5bdc11c14a750281e1c7b8b62ec Mon Sep 17 00:00:00 2001
From: Erik Prabowo Kamal <erik@darapsa.co.id>
Date: Sun, 25 Aug 2019 10:51:06 +0800
Subject: ARM64 Android settings for cURL

---
 kelakon.pro | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'kelakon.pro')

diff --git a/kelakon.pro b/kelakon.pro
index 0892052..61a0b3a 100644
--- a/kelakon.pro
+++ b/kelakon.pro
@@ -11,6 +11,15 @@ SOURCES += \
 
 RESOURCES += kelakon.qrc
 
+contains(ANDROID_TARGET_ARCH,arm64-v8a) {
+	QMAKE_CFLAGS += -I/usr/local/aarch64-linux-android/sysroot/usr/include
+	LIBS += -L/usr/local/aarch64-linux-android/sysroot/usr/lib
+	ANDROID_EXTRA_LIBS += \
+		/usr/local/aarch64-linux-android/sysroot/usr/lib/libcrypto.so \
+		/usr/local/aarch64-linux-android/sysroot/usr/lib/libssl.so \
+		/usr/local/aarch64-linux-android/sysroot/usr/lib/libcurl.so
+}
+
 contains(ANDROID_TARGET_ARCH,armeabi-v7a) {
 	QMAKE_CFLAGS += -I/usr/local/arm-linux-androideabi/sysroot/usr/include
 	LIBS += -L/usr/local/arm-linux-androideabi/sysroot/usr/lib
-- 
cgit v1.3


From b9bc9d9e391e6567a12182b9f6de355be1f5be1c Mon Sep 17 00:00:00 2001
From: Erik Prabowo Kamal <erik@darapsa.co.id>
Date: Sun, 25 Aug 2019 14:10:59 +0800
Subject: Reordered

---
 kelakon.pro | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'kelakon.pro')

diff --git a/kelakon.pro b/kelakon.pro
index 61a0b3a..c02a1b7 100644
--- a/kelakon.pro
+++ b/kelakon.pro
@@ -11,6 +11,9 @@ SOURCES += \
 
 RESOURCES += kelakon.qrc
 
+LIBS += \
+	-lcurl
+
 contains(ANDROID_TARGET_ARCH,arm64-v8a) {
 	QMAKE_CFLAGS += -I/usr/local/aarch64-linux-android/sysroot/usr/include
 	LIBS += -L/usr/local/aarch64-linux-android/sysroot/usr/lib
@@ -28,6 +31,3 @@ contains(ANDROID_TARGET_ARCH,armeabi-v7a) {
 		/usr/local/arm-linux-androideabi/sysroot/usr/lib/libssl.so \
 		/usr/local/arm-linux-androideabi/sysroot/usr/lib/libcurl.so
 }
-
-LIBS += \
-	-lcurl
-- 
cgit v1.3


From c47e2b615be10861262752742d7aa5b306195d10 Mon Sep 17 00:00:00 2001
From: Erik Prabowo Kamal <erik@darapsa.co.id>
Date: Sun, 25 Aug 2019 17:48:25 +0800
Subject: Capitalised Android app label

---
 android/AndroidManifest.xml | 95 +++++++++++++++++++++++++++++++++++++++++++++
 kelakon.pro                 |  4 ++
 2 files changed, 99 insertions(+)
 create mode 100644 android/AndroidManifest.xml

(limited to 'kelakon.pro')

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
new file mode 100644
index 0000000..37a543f
--- /dev/null
+++ b/android/AndroidManifest.xml
@@ -0,0 +1,95 @@
+<?xml version='1.0' encoding='utf-8'?>
+<manifest package="id.co.darapsa.kelakon" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" 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.
+         Remove the comment if you do not require these default permissions. -->
+        <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+
+    <!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
+         Remove the comment if you do not require these default features. -->
+        <uses-feature android:glEsVersion="0x00020000" android:required="true" />
+
+    <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
+
+    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Kelakon">
+        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density"
+                  android:name="org.qtproject.qt5.android.bindings.QtActivity"
+                  android:label="Kelakon"
+                  android:screenOrientation="unspecified"
+                  android:launchMode="singleTop">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+
+            <!-- Application arguments -->
+            <!-- meta-data android:name="android.app.arguments" android:value="arg1 arg2 arg3"/ -->
+            <!-- Application arguments -->
+
+            <meta-data android:name="android.app.lib_name" android:value="kelakon"/>
+            <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
+            <meta-data android:name="android.app.repository" android:value="default"/>
+            <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
+            <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
+            <!-- Deploy Qt libs as part of package -->
+            <meta-data android:name="android.app.bundle_local_qt_libs" android:value="1"/>
+            <meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
+            <meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
+            <!-- Run with local libs -->
+            <meta-data android:name="android.app.use_local_qt_libs" android:value="1"/>
+            <meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
+            <meta-data android:name="android.app.load_local_libs" android:value="plugins/platforms/android/libqtforandroid.so:plugins/bearer/libqandroidbearer.so:lib/libQt5QuickParticles.so"/>
+            <meta-data android:name="android.app.load_local_jars" android:value="jar/QtAndroid.jar:jar/QtAndroidBearer.jar"/>
+            <meta-data android:name="android.app.static_init_classes" android:value=""/>
+            <!-- Used to specify custom system library path to run with local system libs -->
+            <!-- <meta-data android:name="android.app.system_libs_prefix" android:value="/system/lib/"/> -->
+            <!--  Messages maps -->
+            <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
+            <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
+            <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
+            <meta-data android:value="@string/unsupported_android_version" android:name="android.app.unsupported_android_version"/>
+            <!--  Messages maps -->
+
+            <!-- Splash screen -->
+            <!-- Orientation-specific (portrait/landscape) data is checked first. If not available for current orientation,
+                 then android.app.splash_screen_drawable. For best results, use together with splash_screen_sticky and
+                 use hideSplashScreen() with a fade-out animation from Qt Android Extras to hide the splash screen when you
+                 are done populating your window with content. -->
+            <!-- meta-data android:name="android.app.splash_screen_drawable_portrait" android:resource="@drawable/logo_portrait" / -->
+            <!-- meta-data android:name="android.app.splash_screen_drawable_landscape" android:resource="@drawable/logo_landscape" / -->
+            <!-- meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/ -->
+            <!-- meta-data android:name="android.app.splash_screen_sticky" android:value="true"/ -->
+            <!-- Splash screen -->
+
+            <!-- Background running -->
+            <!-- Warning: changing this value to true may cause unexpected crashes if the
+                          application still try to draw after
+                          "applicationStateChanged(Qt::ApplicationSuspended)"
+                          signal is sent! -->
+            <meta-data android:name="android.app.background_running" android:value="false"/>
+            <!-- Background running -->
+
+            <!-- auto screen scale factor -->
+            <meta-data android:name="android.app.auto_screen_scale_factor" android:value="false"/>
+            <!-- auto screen scale factor -->
+
+            <!-- extract android style -->
+            <!-- available android:values :
+                * default - In most cases this will be the same as "full", but it can also be something else if needed, e.g., for compatibility reasons
+                * full - useful QWidget & Quick Controls 1 apps
+                * minimal - useful for Quick Controls 2 apps, it is much faster than "full"
+                * none - useful for apps that don't use any of the above Qt modules
+                -->
+            <meta-data android:name="android.app.extract_android_style" android:value="default"/>
+            <!-- extract android style -->
+    </activity>
+
+    <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
+
+    </application>
+
+</manifest>
diff --git a/kelakon.pro b/kelakon.pro
index c02a1b7..c91ba3e 100644
--- a/kelakon.pro
+++ b/kelakon.pro
@@ -31,3 +31,7 @@ contains(ANDROID_TARGET_ARCH,armeabi-v7a) {
 		/usr/local/arm-linux-androideabi/sysroot/usr/lib/libssl.so \
 		/usr/local/arm-linux-androideabi/sysroot/usr/lib/libcurl.so
 }
+
+android {
+	ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
+}
-- 
cgit v1.3


From afdab77790e8db165b43e9ab34cb26313b067856 Mon Sep 17 00:00:00 2001
From: Erik Prabowo Kamal <erik@darapsa.co.id>
Date: Tue, 27 Aug 2019 08:28:24 +0800
Subject: Added rtclient module

---
 .gitmodules |  3 +++
 kelakon.pro |  5 +++--
 rtclient    |  1 +
 rtclient.c  | 33 ---------------------------------
 rtclient.h  | 15 ---------------
 5 files changed, 7 insertions(+), 50 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 rtclient
 delete mode 100644 rtclient.c
 delete mode 100644 rtclient.h

(limited to 'kelakon.pro')

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..ca6a061
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "rtclient"]
+	path = rtclient
+	url = ssh://darapsa.co.id/usr/local/git/rtclient.git
diff --git a/kelakon.pro b/kelakon.pro
index c91ba3e..db85290 100644
--- a/kelakon.pro
+++ b/kelakon.pro
@@ -1,17 +1,18 @@
 QT += quickcontrols2
 
 HEADERS += \
-	rtclient.h \
 	networkworker.hxx
 
 SOURCES += \
-	rtclient.c \
 	networkworker.cxx \
 	main.cxx
 
 RESOURCES += kelakon.qrc
 
+INCLUDEPATH += $$PWD/rtclient
+
 LIBS += \
+	$$PWD/rtclient/librtclient.a \
 	-lcurl
 
 contains(ANDROID_TARGET_ARCH,arm64-v8a) {
diff --git a/rtclient b/rtclient
new file mode 160000
index 0000000..647a634
--- /dev/null
+++ b/rtclient
@@ -0,0 +1 @@
+Subproject commit 647a634d99c37d512cb4589c129985626786e9bd
diff --git a/rtclient.c b/rtclient.c
deleted file mode 100644
index 1be0579..0000000
--- a/rtclient.c
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifdef DEBUG
-#ifdef ANDROID
-#include <android/log.h>
-#else
-#include <stdio.h>
-#endif // ANDROID
-#endif // DEBUG
-#include <stdbool.h>
-#include <curl/curl.h>
-#include "rtclient.h"
-
-static CURL *handle = NULL;
-
-bool rtclient_init()
-{
-	curl_global_init(CURL_GLOBAL_SSL);
-	handle = curl_easy_init();
-	if (handle) {
-		curl_easy_setopt(handle, CURLOPT_FOLLOWLOCATION, 1L);
-#ifdef DEBUG
-		curl_easy_setopt(handle, CURLOPT_VERBOSE, 1L);
-#endif
-	}
-
-	return (bool)handle;
-}
-
-void rtclient_cleanup()
-{
-	if (handle)
-		curl_easy_cleanup(handle);
-	curl_global_cleanup();
-}
diff --git a/rtclient.h b/rtclient.h
deleted file mode 100644
index 53b8a51..0000000
--- a/rtclient.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef RTCLIENT_H
-#define RTCLIENT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-	bool rtclient_init();
-	void rtclient_cleanup();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // RTCLIENT_H
-- 
cgit v1.3


From 40db7eb6ec8115342410b45a94f842d06bf63d91 Mon Sep 17 00:00:00 2001
From: Erik Prabowo Kamal <erik@darapsa.co.id>
Date: Tue, 27 Aug 2019 09:41:35 +0800
Subject: Added the user class to the qmake project

---
 kelakon.pro | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'kelakon.pro')

diff --git a/kelakon.pro b/kelakon.pro
index db85290..12dc52d 100644
--- a/kelakon.pro
+++ b/kelakon.pro
@@ -1,10 +1,12 @@
 QT += quickcontrols2
 
 HEADERS += \
-	networkworker.hxx
+	networkworker.hxx \
+	user.hxx
 
 SOURCES += \
 	networkworker.cxx \
+	user.cxx \
 	main.cxx
 
 RESOURCES += kelakon.qrc
-- 
cgit v1.3