Added no sleep thread, Blocked PS button while in installer, Blocked …

…USB Connection popup while in app

CMakeLists.txt

@@ -15,7 +15,7 @@ include("${VITASDK}/share/vita.cmake" REQUIRED)
 set(VITA_APP_NAME "EasyVPK")
 set(VITA_TITLEID  "ESVPK0009")
 set(UPDATER_TITLEID "ESUPD0009")
-set(VITA_VERSION  "02.00")
+set(VITA_VERSION  "02.01")
 
 
 set(PACKAGE_TEMP_FOLDER "ux0:/temp/pkg/")

sce_sys/livearea/contents/template.xml

@@ -28,7 +28,7 @@
 	<frame id="frame4">
 		<liveitem>
 			<text align="left" text-align="left" word-wrap="off" ellipsis="on">
-				<str size="18" color="#ffffff" shadow="on">v2.0.0</str>
+				<str size="18" color="#ffffff" shadow="on">v2.0.1</str>
 			</text>
 		</liveitem>
 	</frame>

src/main.cpp

@@ -7,9 +7,11 @@
 #include <psp2/ime_dialog.h>
 #include <psp2/appmgr.h>
 #include <psp2/promoterutil.h>
+#include <psp2/shellutil.h> 
 
 #include "net/download.hpp"
 #include "utils/filesystem.hpp"
+#include "utils/nosleep_thread.h"
 #include "utils/search.hpp"
 #include "utils/vitaPackage.h"
 
@@ -18,9 +20,6 @@
 #include "screens/installer.hpp"
 
 
-SceCtrlData pad;
-
-
 void initSceAppUtil() {
 
 	// Init SceAppUtil
@@ -40,6 +39,8 @@ void initSceAppUtil() {
 
 int main() {
 	initSceAppUtil();
+	sceShellUtilInitEvents(0); // Init SceShellUtil events
+	StartNoSleepThread(); // Sleep invalidates file descriptors
 
     // remove updater app if installed
     { // extra scope needed to cause VitaPackage cleanup procedure
@@ -71,6 +72,8 @@ int main() {
 	Installer installerView;
 	Details detailsView;
 
+	SceCtrlData pad;
+
 	while(1) {
 		sceCtrlPeekBufferPositive(0, &pad, 1);
 		vita2d_start_drawing();
@@ -94,6 +97,8 @@ int main() {
 
 		if (pad.buttons == SCE_CTRL_SELECT || sharedData.scene == -1)
 			break;
+
+		sceShellUtilLock(SCE_SHELL_UTIL_LOCK_TYPE_USB_CONNECTION); // Prevent automatic CMA connection
 	}
 
 	httpTerm();

src/main.hpp

@@ -23,9 +23,9 @@
 
 
 using namespace std;
-
 using json = nlohmann::json;
 
+
 extern unsigned int basicfont_size;
 extern unsigned char basicfont[];
 

src/screens/installer.cpp

@@ -393,13 +393,17 @@ void Installer::draw(SharedData &sharedData) {
 		sharedData.scene = 1;
 		return;
 	}
-
+
+    sceShellUtilLock(SCE_SHELL_UTIL_LOCK_TYPE_PS_BTN); // Lock PS button
+
 	SceUID main_thread = sceKernelCreateThread("main_downloader", downloader_main, 0x40, 0x1000000, 0, 0, NULL);
 	if (main_thread >= 0){
 		sceKernelStartThread(main_thread, 0, NULL);
 		sceKernelWaitThreadEnd(main_thread, NULL, NULL);
 	}
 
+	sceShellUtilUnlock(SCE_SHELL_UTIL_LOCK_TYPE_PS_BTN); // Unlock PS button
+
 	if (launchUpdater)
 		openApp(UPDATER_TITLEID);
 

src/utils/nosleep_thread.cpp

@@ -0,0 +1,20 @@
+#include "nosleep_thread.h"
+
+#include <psp2/kernel/threadmgr.h>
+#include <psp2/kernel/processmgr.h>
+
+
+void StartNoSleepThread() {
+	SceUID thid_sleep = sceKernelCreateThread("nosleep_thread", (SceKernelThreadEntry)nosleep_thread, 0x40, 0x1000, 0, 0, nullptr);
+	sceKernelStartThread(thid_sleep, 0, nullptr);
+}
+
+int nosleep_thread(SceSize args, void *argp) {
+	while (true) {
+		sceKernelPowerTick(SCE_KERNEL_POWER_TICK_DISABLE_AUTO_SUSPEND);
+		sceKernelDelayThread(10 * 1000 * 1000);
+	}
+
+	sceKernelExitDeleteThread(0);
+	return 0;
+}

src/utils/nosleep_thread.h

@@ -0,0 +1,7 @@
+#pragma once
+
+#include <psp2/types.h>
+
+
+void StartNoSleepThread();
+int nosleep_thread(SceSize args, void *argp);