java/BatteryDetection.git

			@@ -227,16 +227,25 @@
			private Long[] parseDeleteIdentity(String value, String dataType)
			{
			String[] parts = value.split(":", -1);
			int expectedLength = "STEP".equals(dataType) ? 5 : "CYCLE".equals(dataType) ? 4 : 3;
			if (parts.length != expectedLength) return null;
			int expectedLength = "STEP".equals(dataType) ? 8 : "CYCLE".equals(dataType) ? 7 : 6;
			int legacyLength = "STEP".equals(dataType) ? 5 : "CYCLE".equals(dataType) ? 4 : 3;
			if (parts.length != expectedLength && parts.length != legacyLength) return null;
			int offset = "REALTIME".equals(dataType) ? 0 : 1;
			try
			{
			if (parts.length == legacyLength && "STEP".equals(dataType))
			return new Long[] { Long.valueOf(parts[1]), Long.valueOf(parts[2]),
			Long.valueOf(parts[3]), Long.valueOf(parts[4]) };
			if (parts.length == legacyLength)
			return new Long[] { Long.valueOf(parts[0]), Long.valueOf(parts[1]), Long.valueOf(parts[2]) };
			if ("STEP".equals(dataType))
			return new Long[] { Long.valueOf(parts[offset]), Long.valueOf(parts[offset + 1]),
			Long.valueOf(parts[offset + 2]), Long.valueOf(parts[offset + 3]) };
			Long.valueOf(parts[offset + 2]), Long.valueOf(parts[offset + 3]),
			Long.valueOf(parts[offset + 4]), Long.valueOf(parts[offset + 5]),
			Long.valueOf(parts[offset + 6]) };
			return new Long[] { Long.valueOf(parts[offset]), Long.valueOf(parts[offset + 1]),
			Long.valueOf(parts[offset + 2]) };
			Long.valueOf(parts[offset + 2]), Long.valueOf(parts[offset + 3]),
			Long.valueOf(parts[offset + 4]), Long.valueOf(parts[offset + 5]) };
			}
			catch (NumberFormatException exception) { return null; }
			}