Add L toggle, libnx 3.0.0

Author: 3096

Makefile

@@ -46,7 +46,7 @@ INCLUDES	:=	include
 
 VERSION_MAJOR := 0
 VERSION_MINOR := 1
-VERSION_MICRO := 0
+VERSION_MICRO := 1
 
 APP_TITLE   := SwitchTime
 APP_AUTHOR  := 3096, thedax

source/main.c

@@ -30,7 +30,7 @@ bool setsysInternetTimeSyncIsOn() {
     }
 
     bool internetTimeSyncIsOn;
-    rs = setsysGetFlag(60, &internetTimeSyncIsOn);
+    rs = setsysIsUserSystemClockAutomaticCorrectionEnabled(&internetTimeSyncIsOn);
     setsysExit();
     if (R_FAILED(rs)) {
         printf("Unable to detect if Internet time sync is enabled, %x\n", rs);
@@ -40,6 +40,40 @@ bool setsysInternetTimeSyncIsOn() {
     return internetTimeSyncIsOn;
 }
 
+Result enableSetsysInternetTimeSync() {
+    Result rs = setsysInitialize();
+    if (R_FAILED(rs)) {
+        printf("setsysInitialize failed, %x\n", rs);
+        return rs;
+    }
+
+    rs = setsysSetUserSystemClockAutomaticCorrectionEnabled(true);
+    setsysExit();
+    if (R_FAILED(rs)) {
+        printf("Unable to enable Internet time sync: %x\n", rs);
+    }
+
+    return rs;
+}
+
+/*
+
+Type   | SYNC | User | Local | Network
+=======|======|======|=======|========
+User   |      |      |       |
+-------+------+------+-------+--------
+Menu   |      |  *   |   X   |
+-------+------+------+-------+--------
+System |      |      |       |   X
+-------+------+------+-------+--------
+User   |  ON  |      |       |
+-------+------+------+-------+--------
+Menu   |  ON  |      |       |
+-------+------+------+-------+--------
+System |  ON  |  *   |   *   |   X
+
+*/
+TimeServiceType __nx_time_service_type = TimeServiceType_System;
 bool setNetworkSystemClock(time_t time) {
     Result rs = timeSetCurrentTime(TimeType_NetworkSystemClock, (uint64_t)time);
     if (R_FAILED(rs)) {
@@ -68,11 +102,67 @@ int consoleExitWithMsg(char* msg) {
     return 0;
 }
 
+bool toggleHBMenuPath(char* curPath) {
+    const char* HB_MENU_NRO_PATH = "sdmc:/hbmenu.nro";
+    const char* HB_MENU_BAK_PATH = "sdmc:/hbmenu.nro.bak";
+    const char* DEFAULT_RESTORE_PATH = "sdmc:/switch/switch-time.nro";
+
+    printf("\n\n");
+
+    Result rs;
+    if (strcmp(curPath, HB_MENU_NRO_PATH) == 0) {
+        // restore hbmenu
+        rs = access(HB_MENU_BAK_PATH, F_OK);
+        if (R_FAILED(rs)) {
+            printf("could not find %s to restore. failed: 0x%x", HB_MENU_BAK_PATH, rs);
+            consoleExitWithMsg("");
+            return false;
+        }
+
+        rs = rename(curPath, DEFAULT_RESTORE_PATH);
+        if (R_FAILED(rs)) {
+            printf("fsFsRenameFile(%s, %s) failed: 0x%x", curPath, DEFAULT_RESTORE_PATH, rs);
+            consoleExitWithMsg("");
+            return false;
+        }
+        rs = rename(HB_MENU_BAK_PATH, HB_MENU_NRO_PATH);
+        if (R_FAILED(rs)) {
+            printf("fsFsRenameFile(%s, %s) failed: 0x%x", HB_MENU_BAK_PATH, HB_MENU_NRO_PATH, rs);
+            consoleExitWithMsg("");
+            return false;
+        }
+    } else {
+        // replace hbmenu
+        rs = rename(HB_MENU_NRO_PATH, HB_MENU_BAK_PATH);
+        if (R_FAILED(rs)) {
+            printf("fsFsRenameFile(%s, %s) failed: 0x%x", HB_MENU_NRO_PATH, HB_MENU_BAK_PATH, rs);
+            consoleExitWithMsg("");
+            return false;
+        }
+        rs = rename(curPath, HB_MENU_NRO_PATH);
+        if (R_FAILED(rs)) {
+            printf("fsFsRenameFile(%s, %s) failed: 0x%x", curPath, HB_MENU_NRO_PATH, rs);
+            rename(HB_MENU_BAK_PATH, HB_MENU_NRO_PATH);  // hbmenu already moved, try to move it back
+            consoleExitWithMsg("");
+            return false;
+        }
+    }
+
+    printf("Quick launch toggled\n\n");
+
+    return true;
+}
+
 int main(int argc, char* argv[]) {
     consoleInit(NULL);
-    printf("SwitchTime v0.1.0\n\n");
+    printf("SwitchTime v0.1.1\n\n");
 
     if (!setsysInternetTimeSyncIsOn()) {
+        // printf("Trying setsysSetUserSystemClockAutomaticCorrectionEnabled...\n");
+        // if (R_FAILED(enableSetsysInternetTimeSync())) {
+        //     return consoleExitWithMsg("Internet time sync is not enabled. Please enable it in System Settings.");
+        // }
+        // doesn't work without rebooting? not worth it
         return consoleExitWithMsg("Internet time sync is not enabled. Please enable it in System Settings.");
     }
 
@@ -93,6 +183,11 @@ int main(int argc, char* argv[]) {
                 consoleExit(NULL);
                 return 0;  // return to hbmenu
             }
+            if (kDown & KEY_L) {
+                if (!toggleHBMenuPath(argv[0])) {
+                    return 0;
+                }
+            }
 
             time_t currentTime;
             Result rs = timeGetCurrentTime(TimeType_UserSystemClock, (u64*)&currentTime);

source/ntp.c

@@ -29,7 +29,7 @@ information. */
 #include "ntp.h"
 
 bool nifmInternetIsConnected() {
-    Result rs = nifmInitialize();
+    Result rs = nifmInitialize(NifmServiceType_User);
     if (R_FAILED(rs)) {
         printf("Failed to get Internet connection status. Error code %x\n", rs);
         return false;