From 79f76a533d4f40068db595c91dd638d537d1501f Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Sat, 10 Apr 2021 15:51:30 +0200
Subject: [PATCH] neutrino.cpp: enable check for package updates with new
 setting

---
 src/gui/update_check_packages.cpp | 2 +-
 src/gui/update_settings.cpp       | 5 ++++-
 src/neutrino.cpp                  | 9 +++++++--
 src/system/settings.h             | 1 +
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/gui/update_check_packages.cpp b/src/gui/update_check_packages.cpp
index ed00838ab..3c91fbfff 100644
--- a/src/gui/update_check_packages.cpp
+++ b/src/gui/update_check_packages.cpp
@@ -51,7 +51,7 @@ CUpdateCheck* CUpdateCheck::getInstance()
 
 void CUpdateCheck::check4PackageUpdates()
 {
-	if (!g_settings.softupdate_autocheck)
+	if (!g_settings.softupdate_autocheck_packages)
 		return;
 
 	COPKGManager man;
diff --git a/src/gui/update_settings.cpp b/src/gui/update_settings.cpp
index 49b97fe7f..bb5fe9ec5 100644
--- a/src/gui/update_settings.cpp
+++ b/src/gui/update_settings.cpp
@@ -38,6 +38,7 @@
 #include <mymenu.h>
 #include <neutrino_menue.h>
 #include <gui/filebrowser.h>
+#include <gui/opkg_manager.h>
 #include <gui/update_ext.h>
 #include <gui/update_settings.h>
 #include <gui/widget/icons.h>
@@ -147,6 +148,7 @@ int CUpdateSettings::initMenu()
 #endif
 
 	CMenuOptionChooser *autocheck = new CMenuOptionChooser(LOCALE_FLASHUPDATE_AUTOCHECK, &g_settings.softupdate_autocheck, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, OnOffNotifier);
+	CMenuOptionChooser *package_autocheck = new CMenuOptionChooser("Package update check", &g_settings.softupdate_autocheck_packages, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, OnOffNotifier);
 //	apply_settings->setHint("", LOCALE_MENU_HINT_XXX);
 
 	w_upsettings.addItem(fw_update_dir);
@@ -161,7 +163,8 @@ int CUpdateSettings::initMenu()
 #endif
 #endif
 	w_upsettings.addItem(autocheck);
-
+	if (COPKGManager::hasOpkgSupport())
+		w_upsettings.addItem(package_autocheck);
 #if 0
 	w_upsettings.addItem(apply_kernel);
 #endif
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 88c8f3893..ba85fe8ea 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -98,6 +98,7 @@
 #include "gui/update_ext.h"
 #include "gui/update.h"
 //#include "gui/update_check.h"
+#include "gui/update_check_packages.h"
 #include "gui/videosettings.h"
 #include "gui/audio_select.h"
 #include "gui/weather.h"
@@ -397,6 +398,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
 
 
 	g_settings.softupdate_autocheck = configfile.getBool("softupdate_autocheck" , false);
+	g_settings.softupdate_autocheck_packages = configfile.getInt32("softupdate_autocheck_packages" , false);
 
 	// video
 	int vid_Mode_default = VIDEO_STD_720P50;
@@ -1877,6 +1879,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
 	configfile.setInt32 ("softupdate_name_mode_apply", g_settings.softupdate_name_mode_apply);
 	configfile.setInt32 ("softupdate_name_mode_backup", g_settings.softupdate_name_mode_backup);
 	configfile.setBool("softupdate_autocheck", g_settings.softupdate_autocheck);
+	configfile.setInt32("softupdate_autocheck_packages", g_settings.softupdate_autocheck_packages);
 
 	configfile.setInt32("flashupdate_createimage_add_var",    g_settings.flashupdate_createimage_add_var);
 	configfile.setInt32("flashupdate_createimage_add_root1",  g_settings.flashupdate_createimage_add_root1);
@@ -3059,8 +3062,9 @@ TIMER_START();
 #endif
 
 TIMER_STOP("################################## after all ##################################");
-	if (g_settings.softupdate_autocheck) {
 #if 0
+	if (g_settings.softupdate_autocheck) {
+
 		hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_FLASHUPDATE_CHECKUPDATE_INTERNET));
 		hintBox->paint();
 		CFlashUpdate flash;
@@ -3071,8 +3075,9 @@ TIMER_STOP("################################## after all #######################
 		}
 		hintBox->hide();
 		delete hintBox;
-#endif
 	}
+#endif
+	CUpdateCheck::getInstance()->startThread();
 
 	for (std::list<std::string>::iterator it = g_settings.xmltv_xml.begin(); it != g_settings.xmltv_xml.end(); it++)
 		g_Sectionsd->readSIfromXMLTV((*it).c_str());
diff --git a/src/system/settings.h b/src/system/settings.h
index d431ac825..a5c41aee2 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -829,6 +829,7 @@ struct SNeutrinoSettings
 	std::string softupdate_proxyusername;
 	std::string softupdate_proxypassword;
 	int softupdate_autocheck;
+	int softupdate_autocheck_packages;
 	int softupdate_name_mode_apply;
 	int softupdate_name_mode_backup;
 	int apply_settings;