Cleaner daemon handlers

native/jni/include/daemon.hpp

@@ -2,27 +2,34 @@
 
 #include <pthread.h>
 #include <string>
+#include <limits>
 
 #include <socket.hpp>
 
+// Daemon command code flags/masks
+enum : int {
+    SYNC_FLAG = (1 << 30),
+    DAEMON_CODE_MASK = std::numeric_limits<int>::max() >> 1
+};
+
 // Daemon command codes
-enum {
-    START_DAEMON,
-    SUPERUSER,
-    CHECK_VERSION,
-    CHECK_VERSION_CODE,
+enum : int {
+    START_DAEMON = SYNC_FLAG | 0,
+    CHECK_VERSION = SYNC_FLAG | 1,
+    CHECK_VERSION_CODE = SYNC_FLAG | 2,
+    GET_PATH = SYNC_FLAG | 3,
+    SUPERUSER = 4,
     POST_FS_DATA,
     LATE_START,
     BOOT_COMPLETE,
     MAGISKHIDE,
     SQLITE_CMD,
     REMOVE_MODULES,
-    GET_PATH,
     DAEMON_CODE_END,
 };
 
 // Return codes for daemon
-enum {
+enum : int {
     DAEMON_ERROR = -1,
     DAEMON_SUCCESS = 0,
     ROOT_REQUIRED,
@@ -30,7 +37,7 @@ enum {
 };
 
 // Daemon state
-enum {
+enum : int {
     STATE_NONE,
     STATE_POST_FS_DATA,
     STATE_POST_FS_DATA_DONE,