v6.22: When set via the API, custom values are sent to the server

Author: vmayorow

app/build.gradle

@@ -35,8 +35,8 @@ android {
         applicationId "com.hmdm.launcher"
         minSdkVersion 16
         targetSdkVersion 34
-        versionCode 15210
-        versionName "6.21"
+        versionCode 15220
+        versionName "6.22"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         dataBinding {
             enabled = true

app/src/main/java/com/hmdm/launcher/helper/SettingsHelper.java

@@ -57,6 +57,9 @@ public class SettingsHelper {
     private static final String PREF_KEY_LAST_APP_UPDATE_STATE = ".helpers.LAST_APP_UPDATE_STATE";
     private static final String PREF_KEY_APP_START_TIME = ".helpers.APP_START_TIME";
     private static final String PREF_KEY_SATELLITE_COUNT = ".helpers.APP_SATELLITE_COUNT";
+    private static final String PREF_KEY_USER_CUSTOM_1 = ".helpers.USER_CUSTOM_1";
+    private static final String PREF_KEY_USER_CUSTOM_2 = ".helpers.USER_CUSTOM_2";
+    private static final String PREF_KEY_USER_CUSTOM_3 = ".helpers.USER_CUSTOM_3";
     // This prefix is for the compatibility with a legacy package name
     private static String PACKAGE_NAME;
 
@@ -265,6 +268,30 @@ public Set<String> getEnrollOptionGroup() {
         return sharedPreferences.getStringSet(PACKAGE_NAME + PREF_KEY_GROUP, null);
     }
 
+    public boolean setUserCustom1(String userCustom) {
+        return sharedPreferences.edit().putString(PACKAGE_NAME + PREF_KEY_USER_CUSTOM_1, userCustom).commit();
+    }
+
+    public String getUserCustom1() {
+        return sharedPreferences.getString(PACKAGE_NAME + PREF_KEY_USER_CUSTOM_1, null);
+    }
+
+    public boolean setUserCustom2(String userCustom) {
+        return sharedPreferences.edit().putString(PACKAGE_NAME + PREF_KEY_USER_CUSTOM_2, userCustom).commit();
+    }
+
+    public String getUserCustom2() {
+        return sharedPreferences.getString(PACKAGE_NAME + PREF_KEY_USER_CUSTOM_2, null);
+    }
+
+    public boolean setUserCustom3(String userCustom) {
+        return sharedPreferences.edit().putString(PACKAGE_NAME + PREF_KEY_USER_CUSTOM_3, userCustom).commit();
+    }
+
+    public String getUserCustom3() {
+        return sharedPreferences.getString(PACKAGE_NAME + PREF_KEY_USER_CUSTOM_3, null);
+    }
+
     public void updateConfig( ServerConfig config ) {
         try {
             ObjectMapper objectMapper = new ObjectMapper();

app/src/main/java/com/hmdm/launcher/service/PluginApiService.java

@@ -165,12 +165,15 @@ public void setCustom(int number, String value) {
             switch (number) {
                 case 1:
                     settingsHelper.getConfig().setCustom1(value);
+                    settingsHelper.setUserCustom1(value);
                     break;
                 case 2:
                     settingsHelper.getConfig().setCustom2(value);
+                    settingsHelper.setUserCustom2(value);
                     break;
                 case 3:
                     settingsHelper.getConfig().setCustom3(value);
+                    settingsHelper.setUserCustom3(value);
                     break;
             }
         }

app/src/main/java/com/hmdm/launcher/util/DeviceInfoProvider.java

@@ -183,6 +183,10 @@ public static DeviceInfo getDeviceInfo(Context context, boolean queryPermissions
         deviceInfo.setLauncherPackage(launcherPackage != null ? launcherPackage : "");
         deviceInfo.setDefaultLauncher(context.getPackageName().equals(launcherPackage));
 
+        deviceInfo.setCustom1(config.getUserCustom1());
+        deviceInfo.setCustom2(config.getUserCustom2());
+        deviceInfo.setCustom3(config.getUserCustom3());
+
         return deviceInfo;
     }