From 684c054dabff5f0c9f745eeeafd857abb78d8c34 Mon Sep 17 00:00:00 2001 From: José Bollo Date: Sat, 11 Nov 2017 09:49:54 +0100 Subject: Add env var IDENTITY_WEBSOCKET MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I0b6089b2560c61748cdf7b56a5dc0c627c64ad75 Signed-off-by: José Bollo --- homescreen/HomeScreen.launch | 6 ++++++ homescreen/conf/HomeScreen.service | 4 +++- homescreen/src/usermanagement.cpp | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100755 homescreen/HomeScreen.launch diff --git a/homescreen/HomeScreen.launch b/homescreen/HomeScreen.launch new file mode 100755 index 0000000..ba97ee6 --- /dev/null +++ b/homescreen/HomeScreen.launch @@ -0,0 +1,6 @@ +#!/bin/sh + +x=`grep X-AFM--http-port= /var/local/lib/systemd/user/*agl-identity*.service | sed s/.*=//` +export IDENTITY_WEBSOCKET="ws://localhost:$x/api?token=HELLO" + +exec /usr/AGL/homescreen/HomeScreen diff --git a/homescreen/conf/HomeScreen.service b/homescreen/conf/HomeScreen.service index 3a89242..623ac99 100644 --- a/homescreen/conf/HomeScreen.service +++ b/homescreen/conf/HomeScreen.service @@ -3,11 +3,13 @@ Description=AGL reference HomeScreen Requires=dbus.service afm-user-daemon.service InputEventManager.service HomeScreenAppFrameworkBinderAGL.service After=dbus.service afm-user-daemon.service InputEventManager.service HomeScreenAppFrameworkBinderAGL.service WindowManager.service ConditionKernelCommandLine=!agl.nogfx +Requires=afm-service-agl-identity-service@0.1.service +After=afm-service-agl-identity-service@0.1.service [Service] Type=dbus BusName=org.agl.homescreen -ExecStart=/usr/AGL/homescreen/HomeScreen +ExecStart=/usr/AGL/homescreen/HomeScreen.launch # 4194304(= 1 << 22) is special surface id for HomeScreen Environment=QT_IVI_SURFACE_ID=4194304 QT_WAYLAND_SHELL_INTEGRATION=ivi-shell LD_PRELOAD=/usr/lib/libEGL.so.1 Restart=on-failure diff --git a/homescreen/src/usermanagement.cpp b/homescreen/src/usermanagement.cpp index 2537afc..6a24a05 100644 --- a/homescreen/src/usermanagement.cpp +++ b/homescreen/src/usermanagement.cpp @@ -1,3 +1,4 @@ +#include #include "usermanagement.h" #include #include @@ -100,7 +101,7 @@ void UserManagement::slot_turnOffRed() void UserManagement::connectWebsockets() { #ifdef REAL_SERVER - const QUrl url(REAL_SERVER); + const QUrl url(getenv("IDENTITY_WEBSOCKET") ?: REAL_SERVER); #else const QUrl url(QStringLiteral("ws://localhost:1234")); #endif -- cgit 1.2.3-korg