From 5462c15547825c18139c69dc0b10b02d04bf9f10 Mon Sep 17 00:00:00 2001
From: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Date: Wed, 27 Mar 2019 16:36:08 +0000
Subject: Revert "Start app and get runnables list by homescreen"

https://gerrit.automotivelinux.org/gerrit/#/c/20559/
and
https://gerrit.automotivelinux.org/gerrit/#/c/20223/

caused the launcher not to display any icons.

Reverting until resolved.

This reverts commit 607fdc0374e76a272455cc010f35693ba8b6894b.

Change-Id: I3040f0a44b8cfc449e57c27e32ed631fc98b34fd
---
 launcher/src/applicationmodel.cpp | 77 ++++++++-------------------------------
 1 file changed, 15 insertions(+), 62 deletions(-)

(limited to 'launcher/src/applicationmodel.cpp')

diff --git a/launcher/src/applicationmodel.cpp b/launcher/src/applicationmodel.cpp
index 258fac6..14e2ea1 100644
--- a/launcher/src/applicationmodel.cpp
+++ b/launcher/src/applicationmodel.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2016 The Qt Company Ltd.
  * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
- * Copyright (c) 2018,2019 TOYOTA MOTOR CORPORATION
+ * Copyright (c) 2018 TOYOTA MOTOR CORPORATION
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,9 +33,6 @@ class ApplicationModel::Private
 public:
     Private();
 
-    void addApp(QString icon, QString name, QString id);
-    void removeApp(QString id);
-
     QList<AppInfo> data;
 };
 
@@ -55,33 +52,22 @@ namespace {
 
 ApplicationModel::Private::Private()
 {
-}
-
-void ApplicationModel::Private::addApp(QString icon, QString name, QString id)
-{
-    HMI_DEBUG("addApp","name: %s icon: %s id: %s.", name.toStdString().c_str(), icon.toStdString().c_str(), id.toStdString().c_str());
-    for(int i = 0; i < this->data.size(); ++i) {
-        if(this->data[i].id() == id)
-            return;
-    }
+    QString apps = afm_user_daemon_proxy->runnables(QStringLiteral(""));
+    QJsonDocument japps = QJsonDocument::fromJson(apps.toUtf8());
+    for (auto const &app : japps.array()) {
+        QJsonObject const &jso = app.toObject();
+        auto const name = jso["name"].toString();
+        auto const id = jso["id"].toString();
+        auto const icon = get_icon_name(jso);
 
-    QString _icon = name.toLower();
-    if ( !QFile::exists(QString(":/images/%1_active.svg").arg(_icon)) ||
-         !QFile::exists(QString(":/images/%1_inactive.svg").arg(_icon)) )
-    {
-        _icon = "blank";
-    }
-    this->data.append(AppInfo(_icon, name, id));
-}
+        if ( name != "launcher" &&
+             name != "homescreen-2017" &&
+             name != "homescreen" &&
+             name != "OnScreenApp") {
+            this->data.append(AppInfo(icon, name, id));
+        }
 
-void ApplicationModel::Private::removeApp(QString id)
-{
-    HMI_DEBUG("removeApp","id: %s.",id.toStdString().c_str());
-    for (int i = 0; i < this->data.size(); ++i) {
-          if (this->data.at(i).id() == id) {
-              this->data.removeAt(i);
-              break;
-          }
+        HMI_DEBUG("launcher","name: %s icon: %s id: %s.", name.toStdString().c_str(), icon.toStdString().c_str(), id.toStdString().c_str());
     }
 }
 
@@ -174,36 +160,3 @@ void ApplicationModel::move(int from, int to)
         HMI_NOTICE("launcher","from : %d, to : %d. false.", from, to);
     }
 }
-
-void ApplicationModel::updateApplist(QStringList info)
-{
-    QString icon = info.at(0);
-    QString name = info.at(1);
-    QString id = info.at(2);
-
-    beginResetModel();
-    if(icon == "") { // uninstall
-        d->removeApp(id);
-    }
-    else {
-        // new app
-        d->addApp(icon, name, id);
-    }
-    endResetModel();
-}
-
-void ApplicationModel::initAppList(QString data)
-{
-    HMI_DEBUG("launcher","init application list.");
-    beginResetModel();
-    QJsonDocument japps = QJsonDocument::fromJson(data.toUtf8());
-    for (auto const &app : japps.array()) {
-        QJsonObject const &jso = app.toObject();
-        auto const name = jso["name"].toString();
-        auto const id = jso["id"].toString();
-        auto const icon = get_icon_name(jso);
-
-        d->addApp(icon, name, id);
-    }
-    endResetModel();
-}
-- 
cgit 1.2.3-korg