diff --git a/build.gradle b/build.gradle index e1e616c..614bf15 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,15 @@ */ buildscript { - ext.wireVersion = '1.6.1' + ext.wireVersion = '4.9.9' + + dependencies { + classpath "com.squareup.wire:wire-gradle-plugin:$wireVersion" + } + repositories { + mavenCentral() + google() + } } String gitDescribeVersion() { @@ -25,6 +33,7 @@ allprojects { subprojects { repositories { - jcenter() + mavenCentral() + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2993c8..68bd7ff 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,8 +1,6 @@ -# SPDX-FileCopyrightText: 2015, microG Project Team -# SPDX-License-Identifier: CC0-1.0 - +#Mon Dec 22 23:44:23 EET 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/wearable-tools/build.gradle b/wearable-tools/build.gradle index b4413ab..004e7be 100644 --- a/wearable-tools/build.gradle +++ b/wearable-tools/build.gradle @@ -7,6 +7,7 @@ apply plugin: 'java' dependencies { implementation project(':wearable') + implementation "com.squareup.wire:wire-runtime:$wireVersion" } if (file('user.gradle').exists()) { diff --git a/wearable/build.gradle b/wearable/build.gradle index e03474c..f0eefed 100644 --- a/wearable/build.gradle +++ b/wearable/build.gradle @@ -6,14 +6,32 @@ apply plugin: 'java' apply plugin: 'maven-publish' apply plugin: 'signing' +apply plugin: 'com.squareup.wire' dependencies { - compile "com.squareup.wire:wire-runtime:$wireVersion" + implementation "com.squareup.wire:wire-runtime:$wireVersion" +} + +wire { + sourcePath { + srcDir 'src/main/protos-repo' + } + + protoPath { + srcDir 'src/main/protos-repo' + } + + java { + out = file("$buildDir/generated/source/wire") + } } sourceSets { main { - java.srcDirs += 'src/main/protos-java' + java { + srcDirs += 'src/main/java' + srcDirs += "$buildDir/generated/source/wire" + } } } @@ -22,6 +40,10 @@ java { withSourcesJar() } +sourcesJar { + duplicatesStrategy(DuplicatesStrategy.EXCLUDE) +} + afterEvaluate { publishing { publications { diff --git a/wearable/src/main/java/org/microg/wearable/SocketWearableConnection.java b/wearable/src/main/java/org/microg/wearable/SocketWearableConnection.java index 48e4ec5..44cafdb 100644 --- a/wearable/src/main/java/org/microg/wearable/SocketWearableConnection.java +++ b/wearable/src/main/java/org/microg/wearable/SocketWearableConnection.java @@ -33,7 +33,7 @@ public SocketWearableConnection(Socket socket, Listener listener) throws IOExcep } protected void writeMessagePiece(MessagePiece piece) throws IOException { - byte[] bytes = piece.toByteArray(); + byte[] bytes = MessagePiece.ADAPTER.encode(piece); os.writeInt(bytes.length); os.write(bytes); } @@ -46,7 +46,7 @@ protected MessagePiece readMessagePiece() throws IOException { System.out.println("Reading piece of length " + len); byte[] bytes = new byte[len]; is.readFully(bytes); - return new Wire().parseFrom(bytes, MessagePiece.class); + return MessagePiece.ADAPTER.decode(bytes); } @Override diff --git a/wearable/src/main/java/org/microg/wearable/WearableConnection.java b/wearable/src/main/java/org/microg/wearable/WearableConnection.java index bfdf9b5..5491fac 100644 --- a/wearable/src/main/java/org/microg/wearable/WearableConnection.java +++ b/wearable/src/main/java/org/microg/wearable/WearableConnection.java @@ -23,7 +23,6 @@ public abstract class WearableConnection implements Runnable { private static String B64ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"; - protected static Wire wire = new Wire(); private HashMap> piecesQueues = new HashMap>(); private final Listener listener; @@ -54,7 +53,7 @@ public static String calculateDigest(byte[] bytes) { } public void writeMessage(RootMessage message) throws IOException { - byte[] bytes = message.toByteArray(); + byte[] bytes = RootMessage.ADAPTER.encode(message); // TODO: cut in pieces writeMessagePiece(new MessagePiece.Builder() .data(ByteString.of(bytes)) @@ -70,7 +69,7 @@ protected RootMessage readMessage() throws IOException { System.out.println("Waiting for new message..."); MessagePiece piece = readMessagePiece(); if (piece.totalPieces == 1) { - return wire.parseFrom(piece.data.toByteArray(), RootMessage.class); + return RootMessage.ADAPTER.decode(piece.data); } else { if (piece.thisPiece == 1) { List queue = piecesQueues.get(piece.queueId); @@ -93,7 +92,7 @@ protected RootMessage readMessage() throws IOException { throw new IOException("Received " + piece.thisPiece + " but expected piece" + queue.size() + 1); } queue.add(piece); - if (piece.thisPiece.equals(piece.totalPieces)) { + if (piece.thisPiece == piece.totalPieces) { piecesQueues.remove(piece.queueId); ByteArrayOutputStream bos = new ByteArrayOutputStream(); for (MessagePiece messagePiece : queue) { @@ -103,7 +102,7 @@ protected RootMessage readMessage() throws IOException { if (!calculateDigest(bytes).equals(piece.digest)) { throw new IOException("Merged pieces have digest " + calculateDigest(bytes) + ", but should be " + piece.digest); } - return wire.parseFrom(bytes, RootMessage.class); + return RootMessage.ADAPTER.decode(bytes); } } } diff --git a/wearable/src/main/protos-java/org/microg/wearable/proto/AckAsset.java b/wearable/src/main/protos-java/org/microg/wearable/proto/AckAsset.java deleted file mode 100644 index c789baa..0000000 --- a/wearable/src/main/protos-java/org/microg/wearable/proto/AckAsset.java +++ /dev/null @@ -1,62 +0,0 @@ -// Code generated by Wire protocol buffer compiler, do not edit. -// Source file: protos-repo/wearable.proto -package org.microg.wearable.proto; - -import com.squareup.wire.Message; -import com.squareup.wire.ProtoField; - -import static com.squareup.wire.Message.Datatype.STRING; - -public final class AckAsset extends Message { - - public static final String DEFAULT_DIGEST = ""; - - @ProtoField(tag = 1, type = STRING) - public final String digest; - - public AckAsset(String digest) { - this.digest = digest; - } - - private AckAsset(Builder builder) { - this(builder.digest); - setBuilder(builder); - } - - @Override - public boolean equals(Object other) { - if (other == this) return true; - if (!(other instanceof AckAsset)) return false; - return equals(digest, ((AckAsset) other).digest); - } - - @Override - public int hashCode() { - int result = hashCode; - return result != 0 ? result : (hashCode = digest != null ? digest.hashCode() : 0); - } - - public static final class Builder extends Message.Builder { - - public String digest; - - public Builder() { - } - - public Builder(AckAsset message) { - super(message); - if (message == null) return; - this.digest = message.digest; - } - - public Builder digest(String digest) { - this.digest = digest; - return this; - } - - @Override - public AckAsset build() { - return new AckAsset(this); - } - } -} diff --git a/wearable/src/main/protos-java/org/microg/wearable/proto/AppKey.java b/wearable/src/main/protos-java/org/microg/wearable/proto/AppKey.java deleted file mode 100644 index 2e566a6..0000000 --- a/wearable/src/main/protos-java/org/microg/wearable/proto/AppKey.java +++ /dev/null @@ -1,81 +0,0 @@ -// Code generated by Wire protocol buffer compiler, do not edit. -// Source file: protos-repo/wearable.proto -package org.microg.wearable.proto; - -import com.squareup.wire.Message; -import com.squareup.wire.ProtoField; - -import static com.squareup.wire.Message.Datatype.STRING; - -public final class AppKey extends Message { - - public static final String DEFAULT_PACKAGENAME = ""; - public static final String DEFAULT_SIGNATUREDIGEST = ""; - - @ProtoField(tag = 1, type = STRING) - public final String packageName; - - @ProtoField(tag = 2, type = STRING) - public final String signatureDigest; - - public AppKey(String packageName, String signatureDigest) { - this.packageName = packageName; - this.signatureDigest = signatureDigest; - } - - private AppKey(Builder builder) { - this(builder.packageName, builder.signatureDigest); - setBuilder(builder); - } - - @Override - public boolean equals(Object other) { - if (other == this) return true; - if (!(other instanceof AppKey)) return false; - AppKey o = (AppKey) other; - return equals(packageName, o.packageName) - && equals(signatureDigest, o.signatureDigest); - } - - @Override - public int hashCode() { - int result = hashCode; - if (result == 0) { - result = packageName != null ? packageName.hashCode() : 0; - result = result * 37 + (signatureDigest != null ? signatureDigest.hashCode() : 0); - hashCode = result; - } - return result; - } - - public static final class Builder extends Message.Builder { - - public String packageName; - public String signatureDigest; - - public Builder() { - } - - public Builder(AppKey message) { - super(message); - if (message == null) return; - this.packageName = message.packageName; - this.signatureDigest = message.signatureDigest; - } - - public Builder packageName(String packageName) { - this.packageName = packageName; - return this; - } - - public Builder signatureDigest(String signatureDigest) { - this.signatureDigest = signatureDigest; - return this; - } - - @Override - public AppKey build() { - return new AppKey(this); - } - } -} diff --git a/wearable/src/main/protos-java/org/microg/wearable/proto/AppKeys.java b/wearable/src/main/protos-java/org/microg/wearable/proto/AppKeys.java deleted file mode 100644 index 9f6871a..0000000 --- a/wearable/src/main/protos-java/org/microg/wearable/proto/AppKeys.java +++ /dev/null @@ -1,64 +0,0 @@ -// Code generated by Wire protocol buffer compiler, do not edit. -// Source file: protos-repo/wearable.proto -package org.microg.wearable.proto; - -import com.squareup.wire.Message; -import com.squareup.wire.ProtoField; -import java.util.Collections; -import java.util.List; - -import static com.squareup.wire.Message.Label.REPEATED; - -public final class AppKeys extends Message { - - public static final List DEFAULT_APPKEYS = Collections.emptyList(); - - @ProtoField(tag = 1, label = REPEATED, messageType = AppKey.class) - public final List appKeys; - - public AppKeys(List appKeys) { - this.appKeys = immutableCopyOf(appKeys); - } - - private AppKeys(Builder builder) { - this(builder.appKeys); - setBuilder(builder); - } - - @Override - public boolean equals(Object other) { - if (other == this) return true; - if (!(other instanceof AppKeys)) return false; - return equals(appKeys, ((AppKeys) other).appKeys); - } - - @Override - public int hashCode() { - int result = hashCode; - return result != 0 ? result : (hashCode = appKeys != null ? appKeys.hashCode() : 1); - } - - public static final class Builder extends Message.Builder { - - public List appKeys; - - public Builder() { - } - - public Builder(AppKeys message) { - super(message); - if (message == null) return; - this.appKeys = copyOf(message.appKeys); - } - - public Builder appKeys(List appKeys) { - this.appKeys = checkForNulls(appKeys); - return this; - } - - @Override - public AppKeys build() { - return new AppKeys(this); - } - } -} diff --git a/wearable/src/main/protos-java/org/microg/wearable/proto/Asset.java b/wearable/src/main/protos-java/org/microg/wearable/proto/Asset.java deleted file mode 100644 index 084990f..0000000 --- a/wearable/src/main/protos-java/org/microg/wearable/proto/Asset.java +++ /dev/null @@ -1,68 +0,0 @@ -// Code generated by Wire protocol buffer compiler, do not edit. -// Source file: protos-repo/wearable.proto -package org.microg.wearable.proto; - -import com.squareup.wire.Message; -import com.squareup.wire.ProtoField; - -import static com.squareup.wire.Message.Datatype.STRING; - -public final class Asset extends Message { - - public static final String DEFAULT_DIGEST = ""; - - /** - * TODO - */ - @ProtoField(tag = 4, type = STRING) - public final String digest; - - public Asset(String digest) { - this.digest = digest; - } - - private Asset(Builder builder) { - this(builder.digest); - setBuilder(builder); - } - - @Override - public boolean equals(Object other) { - if (other == this) return true; - if (!(other instanceof Asset)) return false; - return equals(digest, ((Asset) other).digest); - } - - @Override - public int hashCode() { - int result = hashCode; - return result != 0 ? result : (hashCode = digest != null ? digest.hashCode() : 0); - } - - public static final class Builder extends Message.Builder { - - public String digest; - - public Builder() { - } - - public Builder(Asset message) { - super(message); - if (message == null) return; - this.digest = message.digest; - } - - /** - * TODO - */ - public Builder digest(String digest) { - this.digest = digest; - return this; - } - - @Override - public Asset build() { - return new Asset(this); - } - } -} diff --git a/wearable/src/main/protos-java/org/microg/wearable/proto/AssetEntry.java b/wearable/src/main/protos-java/org/microg/wearable/proto/AssetEntry.java deleted file mode 100644 index 1843941..0000000 --- a/wearable/src/main/protos-java/org/microg/wearable/proto/AssetEntry.java +++ /dev/null @@ -1,95 +0,0 @@ -// Code generated by Wire protocol buffer compiler, do not edit. -// Source file: protos-repo/wearable.proto -package org.microg.wearable.proto; - -import com.squareup.wire.Message; -import com.squareup.wire.ProtoField; - -import static com.squareup.wire.Message.Datatype.INT32; -import static com.squareup.wire.Message.Datatype.STRING; - -public final class AssetEntry extends Message { - - public static final String DEFAULT_KEY = ""; - public static final Integer DEFAULT_UNKNOWN3 = 0; - - @ProtoField(tag = 1, type = STRING) - public final String key; - - @ProtoField(tag = 2) - public final Asset value; - - @ProtoField(tag = 3, type = INT32) - public final Integer unknown3; - - public AssetEntry(String key, Asset value, Integer unknown3) { - this.key = key; - this.value = value; - this.unknown3 = unknown3; - } - - private AssetEntry(Builder builder) { - this(builder.key, builder.value, builder.unknown3); - setBuilder(builder); - } - - @Override - public boolean equals(Object other) { - if (other == this) return true; - if (!(other instanceof AssetEntry)) return false; - AssetEntry o = (AssetEntry) other; - return equals(key, o.key) - && equals(value, o.value) - && equals(unknown3, o.unknown3); - } - - @Override - public int hashCode() { - int result = hashCode; - if (result == 0) { - result = key != null ? key.hashCode() : 0; - result = result * 37 + (value != null ? value.hashCode() : 0); - result = result * 37 + (unknown3 != null ? unknown3.hashCode() : 0); - hashCode = result; - } - return result; - } - - public static final class Builder extends Message.Builder { - - public String key; - public Asset value; - public Integer unknown3; - - public Builder() { - } - - public Builder(AssetEntry message) { - super(message); - if (message == null) return; - this.key = message.key; - this.value = message.value; - this.unknown3 = message.unknown3; - } - - public Builder key(String key) { - this.key = key; - return this; - } - - public Builder value(Asset value) { - this.value = value; - return this; - } - - public Builder unknown3(Integer unknown3) { - this.unknown3 = unknown3; - return this; - } - - @Override - public AssetEntry build() { - return new AssetEntry(this); - } - } -} diff --git a/wearable/src/main/protos-java/org/microg/wearable/proto/ChannelControlRequest.java b/wearable/src/main/protos-java/org/microg/wearable/proto/ChannelControlRequest.java deleted file mode 100644 index 067bffe..0000000 --- a/wearable/src/main/protos-java/org/microg/wearable/proto/ChannelControlRequest.java +++ /dev/null @@ -1,154 +0,0 @@ -// Code generated by Wire protocol buffer compiler, do not edit. -// Source file: protos-repo/wearable.proto -package org.microg.wearable.proto; - -import com.squareup.wire.Message; -import com.squareup.wire.ProtoField; - -import static com.squareup.wire.Message.Datatype.BOOL; -import static com.squareup.wire.Message.Datatype.INT32; -import static com.squareup.wire.Message.Datatype.INT64; -import static com.squareup.wire.Message.Datatype.STRING; - -public final class ChannelControlRequest extends Message { - - public static final Integer DEFAULT_TYPE = 0; - public static final Long DEFAULT_CHANNELID = 0L; - public static final Boolean DEFAULT_FROMCHANNELOPERATOR = false; - public static final String DEFAULT_PACKAGENAME = ""; - public static final String DEFAULT_SIGNATUREDIGEST = ""; - public static final String DEFAULT_PATH = ""; - public static final Integer DEFAULT_CLOSEERRORCODE = 0; - - @ProtoField(tag = 1, type = INT32) - public final Integer type; - - @ProtoField(tag = 2, type = INT64) - public final Long channelId; - - @ProtoField(tag = 3, type = BOOL) - public final Boolean fromChannelOperator; - - @ProtoField(tag = 4, type = STRING) - public final String packageName; - - @ProtoField(tag = 5, type = STRING) - public final String signatureDigest; - - @ProtoField(tag = 6, type = STRING) - public final String path; - - @ProtoField(tag = 7, type = INT32) - public final Integer closeErrorCode; - - public ChannelControlRequest(Integer type, Long channelId, Boolean fromChannelOperator, String packageName, String signatureDigest, String path, Integer closeErrorCode) { - this.type = type; - this.channelId = channelId; - this.fromChannelOperator = fromChannelOperator; - this.packageName = packageName; - this.signatureDigest = signatureDigest; - this.path = path; - this.closeErrorCode = closeErrorCode; - } - - private ChannelControlRequest(Builder builder) { - this(builder.type, builder.channelId, builder.fromChannelOperator, builder.packageName, builder.signatureDigest, builder.path, builder.closeErrorCode); - setBuilder(builder); - } - - @Override - public boolean equals(Object other) { - if (other == this) return true; - if (!(other instanceof ChannelControlRequest)) return false; - ChannelControlRequest o = (ChannelControlRequest) other; - return equals(type, o.type) - && equals(channelId, o.channelId) - && equals(fromChannelOperator, o.fromChannelOperator) - && equals(packageName, o.packageName) - && equals(signatureDigest, o.signatureDigest) - && equals(path, o.path) - && equals(closeErrorCode, o.closeErrorCode); - } - - @Override - public int hashCode() { - int result = hashCode; - if (result == 0) { - result = type != null ? type.hashCode() : 0; - result = result * 37 + (channelId != null ? channelId.hashCode() : 0); - result = result * 37 + (fromChannelOperator != null ? fromChannelOperator.hashCode() : 0); - result = result * 37 + (packageName != null ? packageName.hashCode() : 0); - result = result * 37 + (signatureDigest != null ? signatureDigest.hashCode() : 0); - result = result * 37 + (path != null ? path.hashCode() : 0); - result = result * 37 + (closeErrorCode != null ? closeErrorCode.hashCode() : 0); - hashCode = result; - } - return result; - } - - public static final class Builder extends Message.Builder { - - public Integer type; - public Long channelId; - public Boolean fromChannelOperator; - public String packageName; - public String signatureDigest; - public String path; - public Integer closeErrorCode; - - public Builder() { - } - - public Builder(ChannelControlRequest message) { - super(message); - if (message == null) return; - this.type = message.type; - this.channelId = message.channelId; - this.fromChannelOperator = message.fromChannelOperator; - this.packageName = message.packageName; - this.signatureDigest = message.signatureDigest; - this.path = message.path; - this.closeErrorCode = message.closeErrorCode; - } - - public Builder type(Integer type) { - this.type = type; - return this; - } - - public Builder channelId(Long channelId) { - this.channelId = channelId; - return this; - } - - public Builder fromChannelOperator(Boolean fromChannelOperator) { - this.fromChannelOperator = fromChannelOperator; - return this; - } - - public Builder packageName(String packageName) { - this.packageName = packageName; - return this; - } - - public Builder signatureDigest(String signatureDigest) { - this.signatureDigest = signatureDigest; - return this; - } - - public Builder path(String path) { - this.path = path; - return this; - } - - public Builder closeErrorCode(Integer closeErrorCode) { - this.closeErrorCode = closeErrorCode; - return this; - } - - @Override - public ChannelControlRequest build() { - return new ChannelControlRequest(this); - } - } -} diff --git a/wearable/src/main/protos-java/org/microg/wearable/proto/ChannelDataAckRequest.java b/wearable/src/main/protos-java/org/microg/wearable/proto/ChannelDataAckRequest.java deleted file mode 100644 index 99c6ae1..0000000 --- a/wearable/src/main/protos-java/org/microg/wearable/proto/ChannelDataAckRequest.java +++ /dev/null @@ -1,80 +0,0 @@ -// Code generated by Wire protocol buffer compiler, do not edit. -// Source file: protos-repo/wearable.proto -package org.microg.wearable.proto; - -import com.squareup.wire.Message; -import com.squareup.wire.ProtoField; - -import static com.squareup.wire.Message.Datatype.BOOL; - -public final class ChannelDataAckRequest extends Message { - - public static final Boolean DEFAULT_FINALMESSAGE = false; - - @ProtoField(tag = 1) - public final ChannelDataHeader header; - - @ProtoField(tag = 2, type = BOOL) - public final Boolean finalMessage; - - public ChannelDataAckRequest(ChannelDataHeader header, Boolean finalMessage) { - this.header = header; - this.finalMessage = finalMessage; - } - - private ChannelDataAckRequest(Builder builder) { - this(builder.header, builder.finalMessage); - setBuilder(builder); - } - - @Override - public boolean equals(Object other) { - if (other == this) return true; - if (!(other instanceof ChannelDataAckRequest)) return false; - ChannelDataAckRequest o = (ChannelDataAckRequest) other; - return equals(header, o.header) - && equals(finalMessage, o.finalMessage); - } - - @Override - public int hashCode() { - int result = hashCode; - if (result == 0) { - result = header != null ? header.hashCode() : 0; - result = result * 37 + (finalMessage != null ? finalMessage.hashCode() : 0); - hashCode = result; - } - return result; - } - - public static final class Builder extends Message.Builder { - - public ChannelDataHeader header; - public Boolean finalMessage; - - public Builder() { - } - - public Builder(ChannelDataAckRequest message) { - super(message); - if (message == null) return; - this.header = message.header; - this.finalMessage = message.finalMessage; - } - - public Builder header(ChannelDataHeader header) { - this.header = header; - return this; - } - - public Builder finalMessage(Boolean finalMessage) { - this.finalMessage = finalMessage; - return this; - } - - @Override - public ChannelDataAckRequest build() { - return new ChannelDataAckRequest(this); - } - } -} diff --git a/wearable/src/main/protos-java/org/microg/wearable/proto/ChannelDataHeader.java b/wearable/src/main/protos-java/org/microg/wearable/proto/ChannelDataHeader.java deleted file mode 100644 index 30ab61e..0000000 --- a/wearable/src/main/protos-java/org/microg/wearable/proto/ChannelDataHeader.java +++ /dev/null @@ -1,96 +0,0 @@ -// Code generated by Wire protocol buffer compiler, do not edit. -// Source file: protos-repo/wearable.proto -package org.microg.wearable.proto; - -import com.squareup.wire.Message; -import com.squareup.wire.ProtoField; - -import static com.squareup.wire.Message.Datatype.BOOL; -import static com.squareup.wire.Message.Datatype.INT64; - -public final class ChannelDataHeader extends Message { - - public static final Long DEFAULT_CHANNELID = 0L; - public static final Boolean DEFAULT_FROMCHANNELOPERATOR = false; - public static final Long DEFAULT_REQUESTID = 0L; - - @ProtoField(tag = 1, type = INT64) - public final Long channelId; - - @ProtoField(tag = 2, type = BOOL) - public final Boolean fromChannelOperator; - - @ProtoField(tag = 3, type = INT64) - public final Long requestId; - - public ChannelDataHeader(Long channelId, Boolean fromChannelOperator, Long requestId) { - this.channelId = channelId; - this.fromChannelOperator = fromChannelOperator; - this.requestId = requestId; - } - - private ChannelDataHeader(Builder builder) { - this(builder.channelId, builder.fromChannelOperator, builder.requestId); - setBuilder(builder); - } - - @Override - public boolean equals(Object other) { - if (other == this) return true; - if (!(other instanceof ChannelDataHeader)) return false; - ChannelDataHeader o = (ChannelDataHeader) other; - return equals(channelId, o.channelId) - && equals(fromChannelOperator, o.fromChannelOperator) - && equals(requestId, o.requestId); - } - - @Override - public int hashCode() { - int result = hashCode; - if (result == 0) { - result = channelId != null ? channelId.hashCode() : 0; - result = result * 37 + (fromChannelOperator != null ? fromChannelOperator.hashCode() : 0); - result = result * 37 + (requestId != null ? requestId.hashCode() : 0); - hashCode = result; - } - return result; - } - - public static final class Builder extends Message.Builder { - - public Long channelId; - public Boolean fromChannelOperator; - public Long requestId; - - public Builder() { - } - - public Builder(ChannelDataHeader message) { - super(message); - if (message == null) return; - this.channelId = message.channelId; - this.fromChannelOperator = message.fromChannelOperator; - this.requestId = message.requestId; - } - - public Builder channelId(Long channelId) { - this.channelId = channelId; - return this; - } - - public Builder fromChannelOperator(Boolean fromChannelOperator) { - this.fromChannelOperator = fromChannelOperator; - return this; - } - - public Builder requestId(Long requestId) { - this.requestId = requestId; - return this; - } - - @Override - public ChannelDataHeader build() { - return new ChannelDataHeader(this); - } - } -} diff --git a/wearable/src/main/protos-java/org/microg/wearable/proto/ChannelDataRequest.java b/wearable/src/main/protos-java/org/microg/wearable/proto/ChannelDataRequest.java deleted file mode 100644 index a2a120c..0000000 --- a/wearable/src/main/protos-java/org/microg/wearable/proto/ChannelDataRequest.java +++ /dev/null @@ -1,96 +0,0 @@ -// Code generated by Wire protocol buffer compiler, do not edit. -// Source file: protos-repo/wearable.proto -package org.microg.wearable.proto; - -import com.squareup.wire.Message; -import com.squareup.wire.ProtoField; -import okio.ByteString; - -import static com.squareup.wire.Message.Datatype.BOOL; -import static com.squareup.wire.Message.Datatype.BYTES; - -public final class ChannelDataRequest extends Message { - - public static final ByteString DEFAULT_PAYLOAD = ByteString.EMPTY; - public static final Boolean DEFAULT_FINALMESSAGE = false; - - @ProtoField(tag = 1) - public final ChannelDataHeader header; - - @ProtoField(tag = 2, type = BYTES) - public final ByteString payload; - - @ProtoField(tag = 3, type = BOOL) - public final Boolean finalMessage; - - public ChannelDataRequest(ChannelDataHeader header, ByteString payload, Boolean finalMessage) { - this.header = header; - this.payload = payload; - this.finalMessage = finalMessage; - } - - private ChannelDataRequest(Builder builder) { - this(builder.header, builder.payload, builder.finalMessage); - setBuilder(builder); - } - - @Override - public boolean equals(Object other) { - if (other == this) return true; - if (!(other instanceof ChannelDataRequest)) return false; - ChannelDataRequest o = (ChannelDataRequest) other; - return equals(header, o.header) - && equals(payload, o.payload) - && equals(finalMessage, o.finalMessage); - } - - @Override - public int hashCode() { - int result = hashCode; - if (result == 0) { - result = header != null ? header.hashCode() : 0; - result = result * 37 + (payload != null ? payload.hashCode() : 0); - result = result * 37 + (finalMessage != null ? finalMessage.hashCode() : 0); - hashCode = result; - } - return result; - } - - public static final class Builder extends Message.Builder { - - public ChannelDataHeader header; - public ByteString payload; - public Boolean finalMessage; - - public Builder() { - } - - public Builder(ChannelDataRequest message) { - super(message); - if (message == null) return; - this.header = message.header; - this.payload = message.payload; - this.finalMessage = message.finalMessage; - } - - public Builder header(ChannelDataHeader header) { - this.header = header; - return this; - } - - public Builder payload(ByteString payload) { - this.payload = payload; - return this; - } - - public Builder finalMessage(Boolean finalMessage) { - this.finalMessage = finalMessage; - return this; - } - - @Override - public ChannelDataRequest build() { - return new ChannelDataRequest(this); - } - } -} diff --git a/wearable/src/main/protos-java/org/microg/wearable/proto/ChannelRequest.java b/wearable/src/main/protos-java/org/microg/wearable/proto/ChannelRequest.java deleted file mode 100644 index bf07890..0000000 --- a/wearable/src/main/protos-java/org/microg/wearable/proto/ChannelRequest.java +++ /dev/null @@ -1,120 +0,0 @@ -// Code generated by Wire protocol buffer compiler, do not edit. -// Source file: protos-repo/wearable.proto -package org.microg.wearable.proto; - -import com.squareup.wire.Message; -import com.squareup.wire.ProtoField; - -import static com.squareup.wire.Message.Datatype.INT32; - -public final class ChannelRequest extends Message { - - public static final Integer DEFAULT_VERSION = 0; - public static final Integer DEFAULT_ORIGIN = 0; - - @ProtoField(tag = 2) - public final ChannelControlRequest channelControlRequest; - - @ProtoField(tag = 3) - public final ChannelDataRequest channelDataRequest; - - @ProtoField(tag = 4) - public final ChannelDataAckRequest channelDataAckRequest; - - @ProtoField(tag = 6, type = INT32) - public final Integer version; - - @ProtoField(tag = 7, type = INT32) - public final Integer origin; - - public ChannelRequest(ChannelControlRequest channelControlRequest, ChannelDataRequest channelDataRequest, ChannelDataAckRequest channelDataAckRequest, Integer version, Integer origin) { - this.channelControlRequest = channelControlRequest; - this.channelDataRequest = channelDataRequest; - this.channelDataAckRequest = channelDataAckRequest; - this.version = version; - this.origin = origin; - } - - private ChannelRequest(Builder builder) { - this(builder.channelControlRequest, builder.channelDataRequest, builder.channelDataAckRequest, builder.version, builder.origin); - setBuilder(builder); - } - - @Override - public boolean equals(Object other) { - if (other == this) return true; - if (!(other instanceof ChannelRequest)) return false; - ChannelRequest o = (ChannelRequest) other; - return equals(channelControlRequest, o.channelControlRequest) - && equals(channelDataRequest, o.channelDataRequest) - && equals(channelDataAckRequest, o.channelDataAckRequest) - && equals(version, o.version) - && equals(origin, o.origin); - } - - @Override - public int hashCode() { - int result = hashCode; - if (result == 0) { - result = channelControlRequest != null ? channelControlRequest.hashCode() : 0; - result = result * 37 + (channelDataRequest != null ? channelDataRequest.hashCode() : 0); - result = result * 37 + (channelDataAckRequest != null ? channelDataAckRequest.hashCode() : 0); - result = result * 37 + (version != null ? version.hashCode() : 0); - result = result * 37 + (origin != null ? origin.hashCode() : 0); - hashCode = result; - } - return result; - } - - public static final class Builder extends Message.Builder { - - public ChannelControlRequest channelControlRequest; - public ChannelDataRequest channelDataRequest; - public ChannelDataAckRequest channelDataAckRequest; - public Integer version; - public Integer origin; - - public Builder() { - } - - public Builder(ChannelRequest message) { - super(message); - if (message == null) return; - this.channelControlRequest = message.channelControlRequest; - this.channelDataRequest = message.channelDataRequest; - this.channelDataAckRequest = message.channelDataAckRequest; - this.version = message.version; - this.origin = message.origin; - } - - public Builder channelControlRequest(ChannelControlRequest channelControlRequest) { - this.channelControlRequest = channelControlRequest; - return this; - } - - public Builder channelDataRequest(ChannelDataRequest channelDataRequest) { - this.channelDataRequest = channelDataRequest; - return this; - } - - public Builder channelDataAckRequest(ChannelDataAckRequest channelDataAckRequest) { - this.channelDataAckRequest = channelDataAckRequest; - return this; - } - - public Builder version(Integer version) { - this.version = version; - return this; - } - - public Builder origin(Integer origin) { - this.origin = origin; - return this; - } - - @Override - public ChannelRequest build() { - return new ChannelRequest(this); - } - } -} diff --git a/wearable/src/main/protos-java/org/microg/wearable/proto/Connect.java b/wearable/src/main/protos-java/org/microg/wearable/proto/Connect.java deleted file mode 100644 index 2c7ea31..0000000 --- a/wearable/src/main/protos-java/org/microg/wearable/proto/Connect.java +++ /dev/null @@ -1,153 +0,0 @@ -// Code generated by Wire protocol buffer compiler, do not edit. -// Source file: protos-repo/wearable.proto -package org.microg.wearable.proto; - -import com.squareup.wire.Message; -import com.squareup.wire.ProtoField; - -import static com.squareup.wire.Message.Datatype.INT32; -import static com.squareup.wire.Message.Datatype.INT64; -import static com.squareup.wire.Message.Datatype.STRING; - -public final class Connect extends Message { - - public static final String DEFAULT_ID = ""; - public static final String DEFAULT_NAME = ""; - public static final Long DEFAULT_PEERANDROIDID = 0L; - public static final Integer DEFAULT_UNKNOWN4 = 0; - public static final Integer DEFAULT_PEERVERSION = 0; - public static final Integer DEFAULT_PEERMINIMUMVERSION = 0; - public static final String DEFAULT_NETWORKID = ""; - - @ProtoField(tag = 1, type = STRING) - public final String id; - - @ProtoField(tag = 2, type = STRING) - public final String name; - - @ProtoField(tag = 3, type = INT64) - public final Long peerAndroidId; - - @ProtoField(tag = 4, type = INT32) - public final Integer unknown4; - - @ProtoField(tag = 5, type = INT32) - public final Integer peerVersion; - - @ProtoField(tag = 6, type = INT32) - public final Integer peerMinimumVersion; - - @ProtoField(tag = 7, type = STRING) - public final String networkId; - - public Connect(String id, String name, Long peerAndroidId, Integer unknown4, Integer peerVersion, Integer peerMinimumVersion, String networkId) { - this.id = id; - this.name = name; - this.peerAndroidId = peerAndroidId; - this.unknown4 = unknown4; - this.peerVersion = peerVersion; - this.peerMinimumVersion = peerMinimumVersion; - this.networkId = networkId; - } - - private Connect(Builder builder) { - this(builder.id, builder.name, builder.peerAndroidId, builder.unknown4, builder.peerVersion, builder.peerMinimumVersion, builder.networkId); - setBuilder(builder); - } - - @Override - public boolean equals(Object other) { - if (other == this) return true; - if (!(other instanceof Connect)) return false; - Connect o = (Connect) other; - return equals(id, o.id) - && equals(name, o.name) - && equals(peerAndroidId, o.peerAndroidId) - && equals(unknown4, o.unknown4) - && equals(peerVersion, o.peerVersion) - && equals(peerMinimumVersion, o.peerMinimumVersion) - && equals(networkId, o.networkId); - } - - @Override - public int hashCode() { - int result = hashCode; - if (result == 0) { - result = id != null ? id.hashCode() : 0; - result = result * 37 + (name != null ? name.hashCode() : 0); - result = result * 37 + (peerAndroidId != null ? peerAndroidId.hashCode() : 0); - result = result * 37 + (unknown4 != null ? unknown4.hashCode() : 0); - result = result * 37 + (peerVersion != null ? peerVersion.hashCode() : 0); - result = result * 37 + (peerMinimumVersion != null ? peerMinimumVersion.hashCode() : 0); - result = result * 37 + (networkId != null ? networkId.hashCode() : 0); - hashCode = result; - } - return result; - } - - public static final class Builder extends Message.Builder { - - public String id; - public String name; - public Long peerAndroidId; - public Integer unknown4; - public Integer peerVersion; - public Integer peerMinimumVersion; - public String networkId; - - public Builder() { - } - - public Builder(Connect message) { - super(message); - if (message == null) return; - this.id = message.id; - this.name = message.name; - this.peerAndroidId = message.peerAndroidId; - this.unknown4 = message.unknown4; - this.peerVersion = message.peerVersion; - this.peerMinimumVersion = message.peerMinimumVersion; - this.networkId = message.networkId; - } - - public Builder id(String id) { - this.id = id; - return this; - } - - public Builder name(String name) { - this.name = name; - return this; - } - - public Builder peerAndroidId(Long peerAndroidId) { - this.peerAndroidId = peerAndroidId; - return this; - } - - public Builder unknown4(Integer unknown4) { - this.unknown4 = unknown4; - return this; - } - - public Builder peerVersion(Integer peerVersion) { - this.peerVersion = peerVersion; - return this; - } - - public Builder peerMinimumVersion(Integer peerMinimumVersion) { - this.peerMinimumVersion = peerMinimumVersion; - return this; - } - - public Builder networkId(String networkId) { - this.networkId = networkId; - return this; - } - - @Override - public Connect build() { - return new Connect(this); - } - } -} diff --git a/wearable/src/main/protos-java/org/microg/wearable/proto/FetchAsset.java b/wearable/src/main/protos-java/org/microg/wearable/proto/FetchAsset.java deleted file mode 100644 index 1835b46..0000000 --- a/wearable/src/main/protos-java/org/microg/wearable/proto/FetchAsset.java +++ /dev/null @@ -1,110 +0,0 @@ -// Code generated by Wire protocol buffer compiler, do not edit. -// Source file: protos-repo/wearable.proto -package org.microg.wearable.proto; - -import com.squareup.wire.Message; -import com.squareup.wire.ProtoField; - -import static com.squareup.wire.Message.Datatype.BOOL; -import static com.squareup.wire.Message.Datatype.STRING; - -public final class FetchAsset extends Message { - - public static final String DEFAULT_PACKAGENAME = ""; - public static final String DEFAULT_ASSETNAME = ""; - public static final Boolean DEFAULT_PERMISSION = false; - public static final String DEFAULT_SIGNATUREDIGEST = ""; - - @ProtoField(tag = 1, type = STRING) - public final String packageName; - - @ProtoField(tag = 2, type = STRING) - public final String assetName; - - @ProtoField(tag = 3, type = BOOL) - public final Boolean permission; - - @ProtoField(tag = 4, type = STRING) - public final String signatureDigest; - - public FetchAsset(String packageName, String assetName, Boolean permission, String signatureDigest) { - this.packageName = packageName; - this.assetName = assetName; - this.permission = permission; - this.signatureDigest = signatureDigest; - } - - private FetchAsset(Builder builder) { - this(builder.packageName, builder.assetName, builder.permission, builder.signatureDigest); - setBuilder(builder); - } - - @Override - public boolean equals(Object other) { - if (other == this) return true; - if (!(other instanceof FetchAsset)) return false; - FetchAsset o = (FetchAsset) other; - return equals(packageName, o.packageName) - && equals(assetName, o.assetName) - && equals(permission, o.permission) - && equals(signatureDigest, o.signatureDigest); - } - - @Override - public int hashCode() { - int result = hashCode; - if (result == 0) { - result = packageName != null ? packageName.hashCode() : 0; - result = result * 37 + (assetName != null ? assetName.hashCode() : 0); - result = result * 37 + (permission != null ? permission.hashCode() : 0); - result = result * 37 + (signatureDigest != null ? signatureDigest.hashCode() : 0); - hashCode = result; - } - return result; - } - - public static final class Builder extends Message.Builder { - - public String packageName; - public String assetName; - public Boolean permission; - public String signatureDigest; - - public Builder() { - } - - public Builder(FetchAsset message) { - super(message); - if (message == null) return; - this.packageName = message.packageName; - this.assetName = message.assetName; - this.permission = message.permission; - this.signatureDigest = message.signatureDigest; - } - - public Builder packageName(String packageName) { - this.packageName = packageName; - return this; - } - - public Builder assetName(String assetName) { - this.assetName = assetName; - return this; - } - - public Builder permission(Boolean permission) { - this.permission = permission; - return this; - } - - public Builder signatureDigest(String signatureDigest) { - this.signatureDigest = signatureDigest; - return this; - } - - @Override - public FetchAsset build() { - return new FetchAsset(this); - } - } -} diff --git a/wearable/src/main/protos-java/org/microg/wearable/proto/FilePiece.java b/wearable/src/main/protos-java/org/microg/wearable/proto/FilePiece.java deleted file mode 100644 index c60f4c1..0000000 --- a/wearable/src/main/protos-java/org/microg/wearable/proto/FilePiece.java +++ /dev/null @@ -1,112 +0,0 @@ -// Code generated by Wire protocol buffer compiler, do not edit. -// Source file: protos-repo/wearable.proto -package org.microg.wearable.proto; - -import com.squareup.wire.Message; -import com.squareup.wire.ProtoField; -import okio.ByteString; - -import static com.squareup.wire.Message.Datatype.BOOL; -import static com.squareup.wire.Message.Datatype.BYTES; -import static com.squareup.wire.Message.Datatype.STRING; - -public final class FilePiece extends Message { - - public static final String DEFAULT_FILENAME = ""; - public static final Boolean DEFAULT_FINALPIECE = false; - public static final ByteString DEFAULT_PIECE = ByteString.EMPTY; - public static final String DEFAULT_DIGEST = ""; - - @ProtoField(tag = 1, type = STRING) - public final String fileName; - - @ProtoField(tag = 2, type = BOOL) - public final Boolean finalPiece; - - @ProtoField(tag = 3, type = BYTES) - public final ByteString piece; - - @ProtoField(tag = 4, type = STRING) - public final String digest; - - public FilePiece(String fileName, Boolean finalPiece, ByteString piece, String digest) { - this.fileName = fileName; - this.finalPiece = finalPiece; - this.piece = piece; - this.digest = digest; - } - - private FilePiece(Builder builder) { - this(builder.fileName, builder.finalPiece, builder.piece, builder.digest); - setBuilder(builder); - } - - @Override - public boolean equals(Object other) { - if (other == this) return true; - if (!(other instanceof FilePiece)) return false; - FilePiece o = (FilePiece) other; - return equals(fileName, o.fileName) - && equals(finalPiece, o.finalPiece) - && equals(piece, o.piece) - && equals(digest, o.digest); - } - - @Override - public int hashCode() { - int result = hashCode; - if (result == 0) { - result = fileName != null ? fileName.hashCode() : 0; - result = result * 37 + (finalPiece != null ? finalPiece.hashCode() : 0); - result = result * 37 + (piece != null ? piece.hashCode() : 0); - result = result * 37 + (digest != null ? digest.hashCode() : 0); - hashCode = result; - } - return result; - } - - public static final class Builder extends Message.Builder { - - public String fileName; - public Boolean finalPiece; - public ByteString piece; - public String digest; - - public Builder() { - } - - public Builder(FilePiece message) { - super(message); - if (message == null) return; - this.fileName = message.fileName; - this.finalPiece = message.finalPiece; - this.piece = message.piece; - this.digest = message.digest; - } - - public Builder fileName(String fileName) { - this.fileName = fileName; - return this; - } - - public Builder finalPiece(Boolean finalPiece) { - this.finalPiece = finalPiece; - return this; - } - - public Builder piece(ByteString piece) { - this.piece = piece; - return this; - } - - public Builder digest(String digest) { - this.digest = digest; - return this; - } - - @Override - public FilePiece build() { - return new FilePiece(this); - } - } -} diff --git a/wearable/src/main/protos-java/org/microg/wearable/proto/Heartbeat.java b/wearable/src/main/protos-java/org/microg/wearable/proto/Heartbeat.java deleted file mode 100644 index 15667fa..0000000 --- a/wearable/src/main/protos-java/org/microg/wearable/proto/Heartbeat.java +++ /dev/null @@ -1,40 +0,0 @@ -// Code generated by Wire protocol buffer compiler, do not edit. -// Source file: protos-repo/wearable.proto -package org.microg.wearable.proto; - -import com.squareup.wire.Message; - -public final class Heartbeat extends Message { - - public Heartbeat() { - } - - private Heartbeat(Builder builder) { - setBuilder(builder); - } - - @Override - public boolean equals(Object other) { - return other instanceof Heartbeat; - } - - @Override - public int hashCode() { - return 0; - } - - public static final class Builder extends Message.Builder { - - public Builder() { - } - - public Builder(Heartbeat message) { - super(message); - } - - @Override - public Heartbeat build() { - return new Heartbeat(this); - } - } -} diff --git a/wearable/src/main/protos-java/org/microg/wearable/proto/MessagePiece.java b/wearable/src/main/protos-java/org/microg/wearable/proto/MessagePiece.java deleted file mode 100644 index a5a57d3..0000000 --- a/wearable/src/main/protos-java/org/microg/wearable/proto/MessagePiece.java +++ /dev/null @@ -1,126 +0,0 @@ -// Code generated by Wire protocol buffer compiler, do not edit. -// Source file: protos-repo/wearable.proto -package org.microg.wearable.proto; - -import com.squareup.wire.Message; -import com.squareup.wire.ProtoField; -import okio.ByteString; - -import static com.squareup.wire.Message.Datatype.BYTES; -import static com.squareup.wire.Message.Datatype.INT32; -import static com.squareup.wire.Message.Datatype.STRING; - -public final class MessagePiece extends Message { - - public static final ByteString DEFAULT_DATA = ByteString.EMPTY; - public static final String DEFAULT_DIGEST = ""; - public static final Integer DEFAULT_THISPIECE = 0; - public static final Integer DEFAULT_TOTALPIECES = 0; - public static final Integer DEFAULT_QUEUEID = 0; - - @ProtoField(tag = 1, type = BYTES) - public final ByteString data; - - @ProtoField(tag = 2, type = STRING) - public final String digest; - - @ProtoField(tag = 3, type = INT32) - public final Integer thisPiece; - - @ProtoField(tag = 4, type = INT32) - public final Integer totalPieces; - - @ProtoField(tag = 5, type = INT32) - public final Integer queueId; - - public MessagePiece(ByteString data, String digest, Integer thisPiece, Integer totalPieces, Integer queueId) { - this.data = data; - this.digest = digest; - this.thisPiece = thisPiece; - this.totalPieces = totalPieces; - this.queueId = queueId; - } - - private MessagePiece(Builder builder) { - this(builder.data, builder.digest, builder.thisPiece, builder.totalPieces, builder.queueId); - setBuilder(builder); - } - - @Override - public boolean equals(Object other) { - if (other == this) return true; - if (!(other instanceof MessagePiece)) return false; - MessagePiece o = (MessagePiece) other; - return equals(data, o.data) - && equals(digest, o.digest) - && equals(thisPiece, o.thisPiece) - && equals(totalPieces, o.totalPieces) - && equals(queueId, o.queueId); - } - - @Override - public int hashCode() { - int result = hashCode; - if (result == 0) { - result = data != null ? data.hashCode() : 0; - result = result * 37 + (digest != null ? digest.hashCode() : 0); - result = result * 37 + (thisPiece != null ? thisPiece.hashCode() : 0); - result = result * 37 + (totalPieces != null ? totalPieces.hashCode() : 0); - result = result * 37 + (queueId != null ? queueId.hashCode() : 0); - hashCode = result; - } - return result; - } - - public static final class Builder extends Message.Builder { - - public ByteString data; - public String digest; - public Integer thisPiece; - public Integer totalPieces; - public Integer queueId; - - public Builder() { - } - - public Builder(MessagePiece message) { - super(message); - if (message == null) return; - this.data = message.data; - this.digest = message.digest; - this.thisPiece = message.thisPiece; - this.totalPieces = message.totalPieces; - this.queueId = message.queueId; - } - - public Builder data(ByteString data) { - this.data = data; - return this; - } - - public Builder digest(String digest) { - this.digest = digest; - return this; - } - - public Builder thisPiece(Integer thisPiece) { - this.thisPiece = thisPiece; - return this; - } - - public Builder totalPieces(Integer totalPieces) { - this.totalPieces = totalPieces; - return this; - } - - public Builder queueId(Integer queueId) { - this.queueId = queueId; - return this; - } - - @Override - public MessagePiece build() { - return new MessagePiece(this); - } - } -} diff --git a/wearable/src/main/protos-java/org/microg/wearable/proto/Request.java b/wearable/src/main/protos-java/org/microg/wearable/proto/Request.java deleted file mode 100644 index 6b22200..0000000 --- a/wearable/src/main/protos-java/org/microg/wearable/proto/Request.java +++ /dev/null @@ -1,195 +0,0 @@ -// Code generated by Wire protocol buffer compiler, do not edit. -// Source file: protos-repo/wearable.proto -package org.microg.wearable.proto; - -import com.squareup.wire.Message; -import com.squareup.wire.ProtoField; -import okio.ByteString; - -import static com.squareup.wire.Message.Datatype.BYTES; -import static com.squareup.wire.Message.Datatype.INT32; -import static com.squareup.wire.Message.Datatype.STRING; - -public final class Request extends Message { - - public static final Integer DEFAULT_REQUESTID = 0; - public static final String DEFAULT_PACKAGENAME = ""; - public static final String DEFAULT_SIGNATUREDIGEST = ""; - public static final String DEFAULT_TARGETNODEID = ""; - public static final Integer DEFAULT_UNKNOWN5 = 0; - public static final String DEFAULT_PATH = ""; - public static final ByteString DEFAULT_RAWDATA = ByteString.EMPTY; - public static final String DEFAULT_SOURCENODEID = ""; - public static final Integer DEFAULT_GENERATION = 0; - - @ProtoField(tag = 1, type = INT32) - public final Integer requestId; - - @ProtoField(tag = 2, type = STRING) - public final String packageName; - - @ProtoField(tag = 3, type = STRING) - public final String signatureDigest; - - @ProtoField(tag = 4, type = STRING) - public final String targetNodeId; - - @ProtoField(tag = 5, type = INT32) - public final Integer unknown5; - - @ProtoField(tag = 6, type = STRING) - public final String path; - - @ProtoField(tag = 7, type = BYTES) - public final ByteString rawData; - - @ProtoField(tag = 8, type = STRING) - public final String sourceNodeId; - - @ProtoField(tag = 9) - public final ChannelRequest request; - - @ProtoField(tag = 10, type = INT32) - public final Integer generation; - - public Request(Integer requestId, String packageName, String signatureDigest, String targetNodeId, Integer unknown5, String path, ByteString rawData, String sourceNodeId, ChannelRequest request, Integer generation) { - this.requestId = requestId; - this.packageName = packageName; - this.signatureDigest = signatureDigest; - this.targetNodeId = targetNodeId; - this.unknown5 = unknown5; - this.path = path; - this.rawData = rawData; - this.sourceNodeId = sourceNodeId; - this.request = request; - this.generation = generation; - } - - private Request(Builder builder) { - this(builder.requestId, builder.packageName, builder.signatureDigest, builder.targetNodeId, builder.unknown5, builder.path, builder.rawData, builder.sourceNodeId, builder.request, builder.generation); - setBuilder(builder); - } - - @Override - public boolean equals(Object other) { - if (other == this) return true; - if (!(other instanceof Request)) return false; - Request o = (Request) other; - return equals(requestId, o.requestId) - && equals(packageName, o.packageName) - && equals(signatureDigest, o.signatureDigest) - && equals(targetNodeId, o.targetNodeId) - && equals(unknown5, o.unknown5) - && equals(path, o.path) - && equals(rawData, o.rawData) - && equals(sourceNodeId, o.sourceNodeId) - && equals(request, o.request) - && equals(generation, o.generation); - } - - @Override - public int hashCode() { - int result = hashCode; - if (result == 0) { - result = requestId != null ? requestId.hashCode() : 0; - result = result * 37 + (packageName != null ? packageName.hashCode() : 0); - result = result * 37 + (signatureDigest != null ? signatureDigest.hashCode() : 0); - result = result * 37 + (targetNodeId != null ? targetNodeId.hashCode() : 0); - result = result * 37 + (unknown5 != null ? unknown5.hashCode() : 0); - result = result * 37 + (path != null ? path.hashCode() : 0); - result = result * 37 + (rawData != null ? rawData.hashCode() : 0); - result = result * 37 + (sourceNodeId != null ? sourceNodeId.hashCode() : 0); - result = result * 37 + (request != null ? request.hashCode() : 0); - result = result * 37 + (generation != null ? generation.hashCode() : 0); - hashCode = result; - } - return result; - } - - public static final class Builder extends Message.Builder { - - public Integer requestId; - public String packageName; - public String signatureDigest; - public String targetNodeId; - public Integer unknown5; - public String path; - public ByteString rawData; - public String sourceNodeId; - public ChannelRequest request; - public Integer generation; - - public Builder() { - } - - public Builder(Request message) { - super(message); - if (message == null) return; - this.requestId = message.requestId; - this.packageName = message.packageName; - this.signatureDigest = message.signatureDigest; - this.targetNodeId = message.targetNodeId; - this.unknown5 = message.unknown5; - this.path = message.path; - this.rawData = message.rawData; - this.sourceNodeId = message.sourceNodeId; - this.request = message.request; - this.generation = message.generation; - } - - public Builder requestId(Integer requestId) { - this.requestId = requestId; - return this; - } - - public Builder packageName(String packageName) { - this.packageName = packageName; - return this; - } - - public Builder signatureDigest(String signatureDigest) { - this.signatureDigest = signatureDigest; - return this; - } - - public Builder targetNodeId(String targetNodeId) { - this.targetNodeId = targetNodeId; - return this; - } - - public Builder unknown5(Integer unknown5) { - this.unknown5 = unknown5; - return this; - } - - public Builder path(String path) { - this.path = path; - return this; - } - - public Builder rawData(ByteString rawData) { - this.rawData = rawData; - return this; - } - - public Builder sourceNodeId(String sourceNodeId) { - this.sourceNodeId = sourceNodeId; - return this; - } - - public Builder request(ChannelRequest request) { - this.request = request; - return this; - } - - public Builder generation(Integer generation) { - this.generation = generation; - return this; - } - - @Override - public Request build() { - return new Request(this); - } - } -} diff --git a/wearable/src/main/protos-java/org/microg/wearable/proto/RootMessage.java b/wearable/src/main/protos-java/org/microg/wearable/proto/RootMessage.java deleted file mode 100644 index fee8605..0000000 --- a/wearable/src/main/protos-java/org/microg/wearable/proto/RootMessage.java +++ /dev/null @@ -1,197 +0,0 @@ -// Code generated by Wire protocol buffer compiler, do not edit. -// Source file: protos-repo/wearable.proto -package org.microg.wearable.proto; - -import com.squareup.wire.Message; -import com.squareup.wire.ProtoField; - -import static com.squareup.wire.Message.Datatype.BOOL; - -public final class RootMessage extends Message { - - public static final Boolean DEFAULT_HASASSET = false; - - @ProtoField(tag = 4) - public final SetAsset setAsset; - - @ProtoField(tag = 5) - public final AckAsset ackAsset; - - @ProtoField(tag = 6) - public final FetchAsset fetchAsset; - - @ProtoField(tag = 7) - public final Connect connect; - - @ProtoField(tag = 8) - public final SyncStart syncStart; - - @ProtoField(tag = 9) - public final SetDataItem setDataItem; - - @ProtoField(tag = 10) - public final Request rpcRequest; - - @ProtoField(tag = 11) - public final Heartbeat heartbeat; - - @ProtoField(tag = 12) - public final FilePiece filePiece; - - @ProtoField(tag = 13, type = BOOL) - public final Boolean hasAsset; - - @ProtoField(tag = 16) - public final Request channelRequest; - - public RootMessage(SetAsset setAsset, AckAsset ackAsset, FetchAsset fetchAsset, Connect connect, SyncStart syncStart, SetDataItem setDataItem, Request rpcRequest, Heartbeat heartbeat, FilePiece filePiece, Boolean hasAsset, Request channelRequest) { - this.setAsset = setAsset; - this.ackAsset = ackAsset; - this.fetchAsset = fetchAsset; - this.connect = connect; - this.syncStart = syncStart; - this.setDataItem = setDataItem; - this.rpcRequest = rpcRequest; - this.heartbeat = heartbeat; - this.filePiece = filePiece; - this.hasAsset = hasAsset; - this.channelRequest = channelRequest; - } - - private RootMessage(Builder builder) { - this(builder.setAsset, builder.ackAsset, builder.fetchAsset, builder.connect, builder.syncStart, builder.setDataItem, builder.rpcRequest, builder.heartbeat, builder.filePiece, builder.hasAsset, builder.channelRequest); - setBuilder(builder); - } - - @Override - public boolean equals(Object other) { - if (other == this) return true; - if (!(other instanceof RootMessage)) return false; - RootMessage o = (RootMessage) other; - return equals(setAsset, o.setAsset) - && equals(ackAsset, o.ackAsset) - && equals(fetchAsset, o.fetchAsset) - && equals(connect, o.connect) - && equals(syncStart, o.syncStart) - && equals(setDataItem, o.setDataItem) - && equals(rpcRequest, o.rpcRequest) - && equals(heartbeat, o.heartbeat) - && equals(filePiece, o.filePiece) - && equals(hasAsset, o.hasAsset) - && equals(channelRequest, o.channelRequest); - } - - @Override - public int hashCode() { - int result = hashCode; - if (result == 0) { - result = setAsset != null ? setAsset.hashCode() : 0; - result = result * 37 + (ackAsset != null ? ackAsset.hashCode() : 0); - result = result * 37 + (fetchAsset != null ? fetchAsset.hashCode() : 0); - result = result * 37 + (connect != null ? connect.hashCode() : 0); - result = result * 37 + (syncStart != null ? syncStart.hashCode() : 0); - result = result * 37 + (setDataItem != null ? setDataItem.hashCode() : 0); - result = result * 37 + (rpcRequest != null ? rpcRequest.hashCode() : 0); - result = result * 37 + (heartbeat != null ? heartbeat.hashCode() : 0); - result = result * 37 + (filePiece != null ? filePiece.hashCode() : 0); - result = result * 37 + (hasAsset != null ? hasAsset.hashCode() : 0); - result = result * 37 + (channelRequest != null ? channelRequest.hashCode() : 0); - hashCode = result; - } - return result; - } - - public static final class Builder extends Message.Builder { - - public SetAsset setAsset; - public AckAsset ackAsset; - public FetchAsset fetchAsset; - public Connect connect; - public SyncStart syncStart; - public SetDataItem setDataItem; - public Request rpcRequest; - public Heartbeat heartbeat; - public FilePiece filePiece; - public Boolean hasAsset; - public Request channelRequest; - - public Builder() { - } - - public Builder(RootMessage message) { - super(message); - if (message == null) return; - this.setAsset = message.setAsset; - this.ackAsset = message.ackAsset; - this.fetchAsset = message.fetchAsset; - this.connect = message.connect; - this.syncStart = message.syncStart; - this.setDataItem = message.setDataItem; - this.rpcRequest = message.rpcRequest; - this.heartbeat = message.heartbeat; - this.filePiece = message.filePiece; - this.hasAsset = message.hasAsset; - this.channelRequest = message.channelRequest; - } - - public Builder setAsset(SetAsset setAsset) { - this.setAsset = setAsset; - return this; - } - - public Builder ackAsset(AckAsset ackAsset) { - this.ackAsset = ackAsset; - return this; - } - - public Builder fetchAsset(FetchAsset fetchAsset) { - this.fetchAsset = fetchAsset; - return this; - } - - public Builder connect(Connect connect) { - this.connect = connect; - return this; - } - - public Builder syncStart(SyncStart syncStart) { - this.syncStart = syncStart; - return this; - } - - public Builder setDataItem(SetDataItem setDataItem) { - this.setDataItem = setDataItem; - return this; - } - - public Builder rpcRequest(Request rpcRequest) { - this.rpcRequest = rpcRequest; - return this; - } - - public Builder heartbeat(Heartbeat heartbeat) { - this.heartbeat = heartbeat; - return this; - } - - public Builder filePiece(FilePiece filePiece) { - this.filePiece = filePiece; - return this; - } - - public Builder hasAsset(Boolean hasAsset) { - this.hasAsset = hasAsset; - return this; - } - - public Builder channelRequest(Request channelRequest) { - this.channelRequest = channelRequest; - return this; - } - - @Override - public RootMessage build() { - return new RootMessage(this); - } - } -} diff --git a/wearable/src/main/protos-java/org/microg/wearable/proto/SetAsset.java b/wearable/src/main/protos-java/org/microg/wearable/proto/SetAsset.java deleted file mode 100644 index ec7f13e..0000000 --- a/wearable/src/main/protos-java/org/microg/wearable/proto/SetAsset.java +++ /dev/null @@ -1,96 +0,0 @@ -// Code generated by Wire protocol buffer compiler, do not edit. -// Source file: protos-repo/wearable.proto -package org.microg.wearable.proto; - -import com.squareup.wire.Message; -import com.squareup.wire.ProtoField; -import okio.ByteString; - -import static com.squareup.wire.Message.Datatype.BYTES; -import static com.squareup.wire.Message.Datatype.STRING; - -public final class SetAsset extends Message { - - public static final String DEFAULT_DIGEST = ""; - public static final ByteString DEFAULT_DATA = ByteString.EMPTY; - - @ProtoField(tag = 1, type = STRING) - public final String digest; - - @ProtoField(tag = 2, type = BYTES) - public final ByteString data; - - @ProtoField(tag = 3) - public final AppKeys appkeys; - - public SetAsset(String digest, ByteString data, AppKeys appkeys) { - this.digest = digest; - this.data = data; - this.appkeys = appkeys; - } - - private SetAsset(Builder builder) { - this(builder.digest, builder.data, builder.appkeys); - setBuilder(builder); - } - - @Override - public boolean equals(Object other) { - if (other == this) return true; - if (!(other instanceof SetAsset)) return false; - SetAsset o = (SetAsset) other; - return equals(digest, o.digest) - && equals(data, o.data) - && equals(appkeys, o.appkeys); - } - - @Override - public int hashCode() { - int result = hashCode; - if (result == 0) { - result = digest != null ? digest.hashCode() : 0; - result = result * 37 + (data != null ? data.hashCode() : 0); - result = result * 37 + (appkeys != null ? appkeys.hashCode() : 0); - hashCode = result; - } - return result; - } - - public static final class Builder extends Message.Builder { - - public String digest; - public ByteString data; - public AppKeys appkeys; - - public Builder() { - } - - public Builder(SetAsset message) { - super(message); - if (message == null) return; - this.digest = message.digest; - this.data = message.data; - this.appkeys = message.appkeys; - } - - public Builder digest(String digest) { - this.digest = digest; - return this; - } - - public Builder data(ByteString data) { - this.data = data; - return this; - } - - public Builder appkeys(AppKeys appkeys) { - this.appkeys = appkeys; - return this; - } - - @Override - public SetAsset build() { - return new SetAsset(this); - } - } -} diff --git a/wearable/src/main/protos-java/org/microg/wearable/proto/SetDataItem.java b/wearable/src/main/protos-java/org/microg/wearable/proto/SetDataItem.java deleted file mode 100644 index a29542d..0000000 --- a/wearable/src/main/protos-java/org/microg/wearable/proto/SetDataItem.java +++ /dev/null @@ -1,200 +0,0 @@ -// Code generated by Wire protocol buffer compiler, do not edit. -// Source file: protos-repo/wearable.proto -package org.microg.wearable.proto; - -import com.squareup.wire.Message; -import com.squareup.wire.ProtoField; -import java.util.Collections; -import java.util.List; -import okio.ByteString; - -import static com.squareup.wire.Message.Datatype.BOOL; -import static com.squareup.wire.Message.Datatype.BYTES; -import static com.squareup.wire.Message.Datatype.INT64; -import static com.squareup.wire.Message.Datatype.STRING; -import static com.squareup.wire.Message.Label.REPEATED; - -public final class SetDataItem extends Message { - - public static final String DEFAULT_PACKAGENAME = ""; - public static final String DEFAULT_URI = ""; - public static final List DEFAULT_UNKNOWN3 = Collections.emptyList(); - public static final ByteString DEFAULT_DATA = ByteString.EMPTY; - public static final Long DEFAULT_SEQID = 0L; - public static final Boolean DEFAULT_DELETED = false; - public static final String DEFAULT_SOURCE = ""; - public static final List DEFAULT_ASSETS = Collections.emptyList(); - public static final String DEFAULT_SIGNATUREDIGEST = ""; - public static final Long DEFAULT_LASTMODIFIED = 0L; - - @ProtoField(tag = 1, type = STRING) - public final String packageName; - - @ProtoField(tag = 2, type = STRING) - public final String uri; - - @ProtoField(tag = 3, type = STRING, label = REPEATED) - public final List unknown3; - - @ProtoField(tag = 4, type = BYTES) - public final ByteString data; - - @ProtoField(tag = 5, type = INT64) - public final Long seqId; - - @ProtoField(tag = 6, type = BOOL) - public final Boolean deleted; - - @ProtoField(tag = 7, type = STRING) - public final String source; - - @ProtoField(tag = 8, label = REPEATED, messageType = AssetEntry.class) - public final List assets; - - @ProtoField(tag = 9, type = STRING) - public final String signatureDigest; - - @ProtoField(tag = 10, type = INT64) - public final Long lastModified; - - public SetDataItem(String packageName, String uri, List unknown3, ByteString data, Long seqId, Boolean deleted, String source, List assets, String signatureDigest, Long lastModified) { - this.packageName = packageName; - this.uri = uri; - this.unknown3 = immutableCopyOf(unknown3); - this.data = data; - this.seqId = seqId; - this.deleted = deleted; - this.source = source; - this.assets = immutableCopyOf(assets); - this.signatureDigest = signatureDigest; - this.lastModified = lastModified; - } - - private SetDataItem(Builder builder) { - this(builder.packageName, builder.uri, builder.unknown3, builder.data, builder.seqId, builder.deleted, builder.source, builder.assets, builder.signatureDigest, builder.lastModified); - setBuilder(builder); - } - - @Override - public boolean equals(Object other) { - if (other == this) return true; - if (!(other instanceof SetDataItem)) return false; - SetDataItem o = (SetDataItem) other; - return equals(packageName, o.packageName) - && equals(uri, o.uri) - && equals(unknown3, o.unknown3) - && equals(data, o.data) - && equals(seqId, o.seqId) - && equals(deleted, o.deleted) - && equals(source, o.source) - && equals(assets, o.assets) - && equals(signatureDigest, o.signatureDigest) - && equals(lastModified, o.lastModified); - } - - @Override - public int hashCode() { - int result = hashCode; - if (result == 0) { - result = packageName != null ? packageName.hashCode() : 0; - result = result * 37 + (uri != null ? uri.hashCode() : 0); - result = result * 37 + (unknown3 != null ? unknown3.hashCode() : 1); - result = result * 37 + (data != null ? data.hashCode() : 0); - result = result * 37 + (seqId != null ? seqId.hashCode() : 0); - result = result * 37 + (deleted != null ? deleted.hashCode() : 0); - result = result * 37 + (source != null ? source.hashCode() : 0); - result = result * 37 + (assets != null ? assets.hashCode() : 1); - result = result * 37 + (signatureDigest != null ? signatureDigest.hashCode() : 0); - result = result * 37 + (lastModified != null ? lastModified.hashCode() : 0); - hashCode = result; - } - return result; - } - - public static final class Builder extends Message.Builder { - - public String packageName; - public String uri; - public List unknown3; - public ByteString data; - public Long seqId; - public Boolean deleted; - public String source; - public List assets; - public String signatureDigest; - public Long lastModified; - - public Builder() { - } - - public Builder(SetDataItem message) { - super(message); - if (message == null) return; - this.packageName = message.packageName; - this.uri = message.uri; - this.unknown3 = copyOf(message.unknown3); - this.data = message.data; - this.seqId = message.seqId; - this.deleted = message.deleted; - this.source = message.source; - this.assets = copyOf(message.assets); - this.signatureDigest = message.signatureDigest; - this.lastModified = message.lastModified; - } - - public Builder packageName(String packageName) { - this.packageName = packageName; - return this; - } - - public Builder uri(String uri) { - this.uri = uri; - return this; - } - - public Builder unknown3(List unknown3) { - this.unknown3 = checkForNulls(unknown3); - return this; - } - - public Builder data(ByteString data) { - this.data = data; - return this; - } - - public Builder seqId(Long seqId) { - this.seqId = seqId; - return this; - } - - public Builder deleted(Boolean deleted) { - this.deleted = deleted; - return this; - } - - public Builder source(String source) { - this.source = source; - return this; - } - - public Builder assets(List assets) { - this.assets = checkForNulls(assets); - return this; - } - - public Builder signatureDigest(String signatureDigest) { - this.signatureDigest = signatureDigest; - return this; - } - - public Builder lastModified(Long lastModified) { - this.lastModified = lastModified; - return this; - } - - @Override - public SetDataItem build() { - return new SetDataItem(this); - } - } -} diff --git a/wearable/src/main/protos-java/org/microg/wearable/proto/SyncStart.java b/wearable/src/main/protos-java/org/microg/wearable/proto/SyncStart.java deleted file mode 100644 index 15b22c6..0000000 --- a/wearable/src/main/protos-java/org/microg/wearable/proto/SyncStart.java +++ /dev/null @@ -1,99 +0,0 @@ -// Code generated by Wire protocol buffer compiler, do not edit. -// Source file: protos-repo/wearable.proto -package org.microg.wearable.proto; - -import com.squareup.wire.Message; -import com.squareup.wire.ProtoField; -import java.util.Collections; -import java.util.List; - -import static com.squareup.wire.Message.Datatype.INT32; -import static com.squareup.wire.Message.Datatype.INT64; -import static com.squareup.wire.Message.Label.REPEATED; - -public final class SyncStart extends Message { - - public static final Long DEFAULT_RECEIVEDSEQID = 0L; - public static final List DEFAULT_SYNCTABLE = Collections.emptyList(); - public static final Integer DEFAULT_VERSION = 0; - - @ProtoField(tag = 1, type = INT64) - public final Long receivedSeqId; - - @ProtoField(tag = 2, label = REPEATED, messageType = SyncTableEntry.class) - public final List syncTable; - - @ProtoField(tag = 3, type = INT32) - public final Integer version; - - public SyncStart(Long receivedSeqId, List syncTable, Integer version) { - this.receivedSeqId = receivedSeqId; - this.syncTable = immutableCopyOf(syncTable); - this.version = version; - } - - private SyncStart(Builder builder) { - this(builder.receivedSeqId, builder.syncTable, builder.version); - setBuilder(builder); - } - - @Override - public boolean equals(Object other) { - if (other == this) return true; - if (!(other instanceof SyncStart)) return false; - SyncStart o = (SyncStart) other; - return equals(receivedSeqId, o.receivedSeqId) - && equals(syncTable, o.syncTable) - && equals(version, o.version); - } - - @Override - public int hashCode() { - int result = hashCode; - if (result == 0) { - result = receivedSeqId != null ? receivedSeqId.hashCode() : 0; - result = result * 37 + (syncTable != null ? syncTable.hashCode() : 1); - result = result * 37 + (version != null ? version.hashCode() : 0); - hashCode = result; - } - return result; - } - - public static final class Builder extends Message.Builder { - - public Long receivedSeqId; - public List syncTable; - public Integer version; - - public Builder() { - } - - public Builder(SyncStart message) { - super(message); - if (message == null) return; - this.receivedSeqId = message.receivedSeqId; - this.syncTable = copyOf(message.syncTable); - this.version = message.version; - } - - public Builder receivedSeqId(Long receivedSeqId) { - this.receivedSeqId = receivedSeqId; - return this; - } - - public Builder syncTable(List syncTable) { - this.syncTable = checkForNulls(syncTable); - return this; - } - - public Builder version(Integer version) { - this.version = version; - return this; - } - - @Override - public SyncStart build() { - return new SyncStart(this); - } - } -} diff --git a/wearable/src/main/protos-java/org/microg/wearable/proto/SyncTableEntry.java b/wearable/src/main/protos-java/org/microg/wearable/proto/SyncTableEntry.java deleted file mode 100644 index 8d51576..0000000 --- a/wearable/src/main/protos-java/org/microg/wearable/proto/SyncTableEntry.java +++ /dev/null @@ -1,82 +0,0 @@ -// Code generated by Wire protocol buffer compiler, do not edit. -// Source file: protos-repo/wearable.proto -package org.microg.wearable.proto; - -import com.squareup.wire.Message; -import com.squareup.wire.ProtoField; - -import static com.squareup.wire.Message.Datatype.INT64; -import static com.squareup.wire.Message.Datatype.STRING; - -public final class SyncTableEntry extends Message { - - public static final String DEFAULT_KEY = ""; - public static final Long DEFAULT_VALUE = 0L; - - @ProtoField(tag = 1, type = STRING) - public final String key; - - @ProtoField(tag = 2, type = INT64) - public final Long value; - - public SyncTableEntry(String key, Long value) { - this.key = key; - this.value = value; - } - - private SyncTableEntry(Builder builder) { - this(builder.key, builder.value); - setBuilder(builder); - } - - @Override - public boolean equals(Object other) { - if (other == this) return true; - if (!(other instanceof SyncTableEntry)) return false; - SyncTableEntry o = (SyncTableEntry) other; - return equals(key, o.key) - && equals(value, o.value); - } - - @Override - public int hashCode() { - int result = hashCode; - if (result == 0) { - result = key != null ? key.hashCode() : 0; - result = result * 37 + (value != null ? value.hashCode() : 0); - hashCode = result; - } - return result; - } - - public static final class Builder extends Message.Builder { - - public String key; - public Long value; - - public Builder() { - } - - public Builder(SyncTableEntry message) { - super(message); - if (message == null) return; - this.key = message.key; - this.value = message.value; - } - - public Builder key(String key) { - this.key = key; - return this; - } - - public Builder value(Long value) { - this.value = value; - return this; - } - - @Override - public SyncTableEntry build() { - return new SyncTableEntry(this); - } - } -} diff --git a/wearable/src/main/protos-repo/wearable.proto b/wearable/src/main/protos-repo/wearable.proto index f286eb3..ab0e4c7 100644 --- a/wearable/src/main/protos-repo/wearable.proto +++ b/wearable/src/main/protos-repo/wearable.proto @@ -1,3 +1,4 @@ + /* * SPDX-FileCopyrightText: 2015, microG Project Team * SPDX-License-Identifier: Apache-2.0 @@ -157,3 +158,5 @@ message SyncTableEntry { optional string key = 1; optional int64 value = 2; } + +