Added ability to disable vpk warning

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ### Changelog 1.95
 
+- Added option to disable warning messages when installing vpks.
 - Fixed bug in USB connection, where your Memory Card could be corrupted.
 - Fixed line breaks in SFO files and long names will now scroll.
 - Fixed compatibility with `udcd_uvc.skprx ` thanks to xerpi.

config.c

@@ -222,11 +222,8 @@ int readConfigBuffer(void *buffer, int size, ConfigEntry *entries, int n_entries
 int readConfig(const char *path, ConfigEntry *entries, int n_entries) {
   void *buffer = NULL;
   int size = allocateReadFile(path, &buffer);
-  if (size < 0) {
-    if (buffer)
-      free(buffer);
+  if (size < 0)
     return size;
-  }
 
   readConfigBuffer(buffer, size, entries, n_entries);
 

language.c

@@ -219,6 +219,7 @@ void loadLanguage(int id) {
     LANGUAGE_ENTRY(VITASHELL_SETTINGS_USBDEVICE),
     LANGUAGE_ENTRY(VITASHELL_SETTINGS_SELECT_BUTTON),
     LANGUAGE_ENTRY(VITASHELL_SETTINGS_NO_AUTO_UPDATE),
+    LANGUAGE_ENTRY(VITASHELL_SETTINGS_WARNING_MESSAGE),
     LANGUAGE_ENTRY(VITASHELL_SETTINGS_RESTART_SHELL),
     LANGUAGE_ENTRY(VITASHELL_SETTINGS_POWER),
     LANGUAGE_ENTRY(VITASHELL_SETTINGS_REBOOT),

language.h

@@ -178,6 +178,7 @@ enum LanguageContainer {
   VITASHELL_SETTINGS_USBDEVICE,
   VITASHELL_SETTINGS_SELECT_BUTTON,
   VITASHELL_SETTINGS_NO_AUTO_UPDATE,
+  VITASHELL_SETTINGS_WARNING_MESSAGE,
   VITASHELL_SETTINGS_RESTART_SHELL,
   VITASHELL_SETTINGS_POWER,
   VITASHELL_SETTINGS_REBOOT,

modules/kernel/exports.yml

@@ -13,4 +13,4 @@ VitaShellKernel2:
         - shellKernelIsUx0Redirected
         - shellKernelRedirectUx0
         - shellKernelMountById
-        - shellKernelGetRifVitaKey
+        - shellKernelGetRifVitaKey

modules/kernel/vitashell_kernel.h

@@ -33,4 +33,4 @@ int shellKernelRedirectUx0(const char *blkdev, const char *blkdev2);
 int shellKernelMountById(ShellMountIdArgs *args);
 int shellKernelGetRifVitaKey(const void *license_buf, void *klicensee);
 
-#endif
+#endif

modules/patch/exports.yml

@@ -5,4 +5,4 @@ VitaShellPatch:
     minor: 0
   main:
     start: module_start
-    stop: module_stop
+    stop: module_stop

modules/patch/main.c

@@ -56,4 +56,4 @@ int module_stop(SceSize args, void *argp) {
     taiInjectReleaseForKernel(hooks[0]);
 
   return SCE_KERNEL_STOP_SUCCESS;
-}
+}

modules/usbdevice/exports.yml

@@ -5,4 +5,4 @@ VitaShellUsbDevice:
     minor: 0
   main:
     start: module_start
-    stop: module_stop
+    stop: module_stop

modules/user/exports.yml

@@ -13,4 +13,4 @@ VitaShellUser:
         - shellUserIsUx0Redirected
         - shellUserRedirectUx0
         - shellUserMountById
-        - shellUserGetRifVitaKey
+        - shellUserGetRifVitaKey

modules/user/main.c

@@ -49,4 +49,4 @@ int module_start(SceSize args, void *argp) {
 
 int module_stop(SceSize args, void *argp) {
   return SCE_KERNEL_STOP_SUCCESS;
-}
+}

modules/user/vitashell_user.h

@@ -26,4 +26,4 @@ int shellUserRedirectUx0(const char *blkdev, const char *blkdev2);
 int shellUserMountById(ShellMountIdArgs *args);
 int shellUserGetRifVitaKey(const void *license_buf, void *klicensee);
 
-#endif
+#endif

package_installer.c

@@ -193,11 +193,8 @@ int makeHeadBin() {
   // Read param.sfo
   void *sfo_buffer = NULL;
   int res = allocateReadFile(PACKAGE_DIR "/sce_sys/param.sfo", &sfo_buffer);
-  if (res < 0) {
-    if (sfo_buffer)
-      free(sfo_buffer);
+  if (res < 0)
     return res;
-  }
 
   // Get title id
   char titleid[12];
@@ -336,7 +333,7 @@ int install_thread(SceSize args_size, InstallArguments *args) {
 
       // Team molecule's request: Full permission access warning
       uint64_t authid = *(uint64_t *)(buffer + 0x80);
-      if (authid != 0x2F00000000000002) {
+      if (!vitashell_config.disable_warning && authid != 0x2F00000000000002) {
         closeWaitDialog();
 
         initMessageDialog(SCE_MSG_DIALOG_BUTTON_TYPE_YESNO, language_container[INSTALL_WARNING]);
@@ -399,7 +396,7 @@ int install_thread(SceSize args_size, InstallArguments *args) {
 
     // Team molecule's request: Full permission access warning
     int unsafe = archiveCheckFilesForUnsafeFself(); // 0: Safe, 1: Unsafe, 2: Dangerous
-    if (unsafe) {
+    if (!vitashell_config.disable_warning && unsafe) {
       closeWaitDialog();
 
       initMessageDialog(SCE_MSG_DIALOG_BUTTON_TYPE_YESNO, language_container[unsafe == 2 ? INSTALL_BRICK_WARNING : INSTALL_WARNING]);

refresh.c

@@ -60,11 +60,8 @@ int refreshNeeded(const char *app_path)
   snprintf(sfo_path, MAX_PATH_LENGTH, "%s/sce_sys/param.sfo", app_path);
   void *sfo_buffer = NULL;
   int sfo_size = allocateReadFile(sfo_path, &sfo_buffer);
-  if (sfo_size < 0) {
-    if (sfo_buffer)
-      free(sfo_buffer);
+  if (sfo_size < 0)
     return sfo_size;
-  }
 
   // Get title and content ids
   char titleid[12], contentid[50];

resources/english_us.txt

@@ -159,6 +159,7 @@ VITASHELL_SETTINGS_THEME             = "Theme"
 VITASHELL_SETTINGS_USBDEVICE         = "USB device"
 VITASHELL_SETTINGS_SELECT_BUTTON     = "SELECT button"
 VITASHELL_SETTINGS_NO_AUTO_UPDATE    = "Disable auto-update"
+VITASHELL_SETTINGS_WARNING_MESSAGE   = "Disable warning messages"
 VITASHELL_SETTINGS_RESTART_SHELL     = "Restart VitaShell"
 VITASHELL_SETTINGS_POWER             = "Power"
 VITASHELL_SETTINGS_REBOOT            = "Reboot"

settings.c

@@ -57,16 +57,17 @@ static ConfigEntry theme_entries[] = {
 };
 
 SettingsMenuOption main_settings[] = {
-  // { VITASHELL_SETTINGS_LANGUAGE,    SETTINGS_OPTION_TYPE_BOOLEAN, NULL, NULL, 0, NULL, 0, &language },
-  { VITASHELL_SETTINGS_THEME,          SETTINGS_OPTION_TYPE_OPTIONS, NULL, NULL, 0, NULL, 0, NULL },
+  // { VITASHELL_SETTINGS_LANGUAGE,     SETTINGS_OPTION_TYPE_BOOLEAN, NULL, NULL, 0, NULL, 0, &language },
+  { VITASHELL_SETTINGS_THEME,           SETTINGS_OPTION_TYPE_OPTIONS, NULL, NULL, 0, NULL, 0, NULL },
   
-  { VITASHELL_SETTINGS_USBDEVICE,      SETTINGS_OPTION_TYPE_OPTIONS, NULL, NULL, 0,
+  { VITASHELL_SETTINGS_USBDEVICE,       SETTINGS_OPTION_TYPE_OPTIONS, NULL, NULL, 0,
     usbdevice_options, sizeof(usbdevice_options) / sizeof(char **), &vitashell_config.usbdevice },
-  { VITASHELL_SETTINGS_SELECT_BUTTON,  SETTINGS_OPTION_TYPE_OPTIONS, NULL, NULL, 0,
+  { VITASHELL_SETTINGS_SELECT_BUTTON,   SETTINGS_OPTION_TYPE_OPTIONS, NULL, NULL, 0,
     select_button_options, sizeof(select_button_options) / sizeof(char **), &vitashell_config.select_button },
-  { VITASHELL_SETTINGS_NO_AUTO_UPDATE, SETTINGS_OPTION_TYPE_BOOLEAN, NULL, NULL, 0, NULL, 0, &vitashell_config.disable_autoupdate },
-  
-  { VITASHELL_SETTINGS_RESTART_SHELL,  SETTINGS_OPTION_TYPE_CALLBACK, (void *)restartShell, NULL, 0, NULL, 0, NULL },
+  { VITASHELL_SETTINGS_NO_AUTO_UPDATE,  SETTINGS_OPTION_TYPE_BOOLEAN, NULL, NULL, 0, NULL, 0, &vitashell_config.disable_autoupdate },
+  { VITASHELL_SETTINGS_WARNING_MESSAGE, SETTINGS_OPTION_TYPE_BOOLEAN, NULL, NULL, 0, NULL, 0, &vitashell_config.disable_warning },
+
+  { VITASHELL_SETTINGS_RESTART_SHELL,   SETTINGS_OPTION_TYPE_CALLBACK, (void *)restartShell, NULL, 0, NULL, 0, NULL },
 };
 
 SettingsMenuOption power_settings[] = {

vitashell_config.h

@@ -35,6 +35,7 @@ typedef struct {
   int usbdevice;
   int select_button;
   int disable_autoupdate;
+  int disable_warning;
 } VitaShellConfig;
 
 #endif