diff --git a/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.kt b/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.kt index 50050ea3ff..5807a31b9c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.kt @@ -11,10 +11,7 @@ object AppCapabilities { @JvmStatic fun getCapabilities(storageCapable: Boolean): AccountAttributes.Capabilities { return AccountAttributes.Capabilities( - uuid = false, - gv2 = true, storage = storageCapable, - gv1Migration = true, senderKey = true, announcementGroup = true, changeNumber = true, diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionCapabilities.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionCapabilities.java index 7734f9250b..e4e465e415 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionCapabilities.java +++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionCapabilities.java @@ -34,8 +34,6 @@ public final class LogSectionCapabilities implements LogSection { RecipientRecord.Capabilities globalCapabilities = SignalDatabase.recipients().getCapabilities(self.getId()); StringBuilder builder = new StringBuilder().append("-- Local").append("\n") - .append("GV2 : ").append(localCapabilities.getGv2()).append("\n") - .append("GV1 Migration : ").append(localCapabilities.getGv1Migration()).append("\n") .append("Sender Key : ").append(localCapabilities.getSenderKey()).append("\n") .append("Announcement Groups: ").append(localCapabilities.getAnnouncementGroup()).append("\n") .append("Change Number : ").append(localCapabilities.getChangeNumber()).append("\n") diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/account/AccountAttributes.kt b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/account/AccountAttributes.kt index 92ca4aa6ba..584b1efe41 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/account/AccountAttributes.kt +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/account/AccountAttributes.kt @@ -57,10 +57,7 @@ class AccountAttributes @JsonCreator constructor( ) data class Capabilities @JsonCreator constructor( - @JsonProperty val uuid: Boolean, - @JsonProperty("gv2-3") val gv2: Boolean, @JsonProperty val storage: Boolean, - @JsonProperty("gv1-migration") val gv1Migration: Boolean, @JsonProperty val senderKey: Boolean, @JsonProperty val announcementGroup: Boolean, @JsonProperty val changeNumber: Boolean,