demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

oppo: add AncConfigValue.toMask() method

Browse Source
This commit is contained in:
NTeditor
2026-06-20 03:21:56 +03:00
parent b2f7fdec94
commit be73323222
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/oppo/OppoHeadphonesProtocol.java
+1 -4
View File
@@ -606,10 +606,7 @@ public class OppoHeadphonesProtocol extends GBDeviceProtocol {
}
public byte[] encodeAncTouchCycleModesSet(final EnumSet<AncConfigValue> modes) {
int mask = 0;
for (AncConfigValue mode : modes) {
mask |= mode.getCode();
}
final int mask = AncConfigValue.toMask(modes);
final byte[] payload = new byte[] {
(byte) AncConfigType.TOUCH_CYCLE_MODES.getCode(),
(byte) 0x01,
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/oppo/commands/AncConfigValue.java
+19 -11
View File
@@ -56,17 +56,6 @@ public enum AncConfigValue {
return prefId;
}
public static EnumSet<AncConfigValue> fromMask(int mask) {
EnumSet<AncConfigValue> modes = EnumSet.noneOf(AncConfigValue.class);
for (AncConfigValue mode : AncConfigValue.values()) {
if ((mask & mode.getCode()) == mode.getCode()) {
modes.add(mode);
}
}
return modes;
}
@Nullable
public static AncConfigValue fromPrefId(final String prefId) {
for (final AncConfigValue param : AncConfigValue.values()) {
@@ -78,6 +67,25 @@ public enum AncConfigValue {
return null;
}
public static int toMask(Iterable<AncConfigValue> modes) {
int mask = 0;
for (AncConfigValue mode : modes) {
mask |= mode.getCode();
}
return mask;
}
public static EnumSet<AncConfigValue> fromMask(int mask) {
EnumSet<AncConfigValue> modes = EnumSet.noneOf(AncConfigValue.class);
for (AncConfigValue mode : AncConfigValue.values()) {
if ((mask & mode.getCode()) == mode.getCode()) {
modes.add(mode);
}
}
return modes;
}
public static Set<String> toPrefIds(Iterable<AncConfigValue> modes) {
Set<String> prefIds = new HashSet<>();
for (AncConfigValue mode : modes) {