Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-21 19:48:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add paymentActivation capability

Browse Source
This commit is contained in:
Katherine Yen
2022-12-20 09:20:42 -08:00
committed by GitHub
parent 9aceaa7a4d
commit cb5d3840d9
7 changed files with 101 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
service/src/main/java/org/whispersystems/textsecuregcm/entities/UserCapabilities.java
View File

@@ -17,7 +17,8 @@ public class UserCapabilities {
account.isAnnouncementGroupSupported(),
account.isChangeNumberSupported(),
account.isStoriesSupported(),
account.isGiftBadgesSupported());
account.isGiftBadgesSupported(),
false); // Hardcode to false until all clients support the flow
}
@JsonProperty("gv1-migration")
@@ -38,6 +39,9 @@ public class UserCapabilities {
@JsonProperty
private boolean giftBadges;
@JsonProperty
private boolean paymentActivation;
public UserCapabilities() {
}
@@ -47,7 +51,8 @@ public class UserCapabilities {
final boolean announcementGroup,
final boolean changeNumber,
final boolean stories,
final boolean giftBadges) {
final boolean giftBadges,
final boolean paymentActivation) {
this.gv1Migration = gv1Migration;
this.senderKey = senderKey;
@@ -55,6 +60,7 @@ public class UserCapabilities {
this.changeNumber = changeNumber;
this.stories = stories;
this.giftBadges = giftBadges;
this.paymentActivation = paymentActivation;
}
public boolean isGv1Migration() {
@@ -80,4 +86,6 @@ public class UserCapabilities {
public boolean isGiftBadges() {
return giftBadges;
}
public boolean isPaymentActivation() { return paymentActivation; }
}

4
service/src/main/java/org/whispersystems/textsecuregcm/storage/Account.java
View File

@@ -221,6 +221,10 @@ public class Account {
return allEnabledDevicesHaveCapability(DeviceCapabilities::isGiftBadges);
}
public boolean isPaymentActivationSupported() {
return allEnabledDevicesHaveCapability(DeviceCapabilities::isPaymentActivation);
}
private boolean allEnabledDevicesHaveCapability(Predicate<DeviceCapabilities> predicate) {
requireNotStale();

10
service/src/main/java/org/whispersystems/textsecuregcm/storage/Device.java
View File

@@ -277,12 +277,15 @@ public class Device {
@JsonProperty
private boolean giftBadges;
@JsonProperty
private boolean paymentActivation;
public DeviceCapabilities() {
}
public DeviceCapabilities(boolean storage, boolean transfer,
final boolean senderKey, final boolean announcementGroup, final boolean changeNumber,
final boolean pni, final boolean stories, final boolean giftBadges) {
final boolean pni, final boolean stories, final boolean giftBadges, final boolean paymentActivation) {
this.storage = storage;
this.transfer = transfer;
this.senderKey = senderKey;
@@ -291,6 +294,7 @@ public class Device {
this.pni = pni;
this.stories = stories;
this.giftBadges = giftBadges;
this.paymentActivation = paymentActivation;
}
public boolean isStorage() {
@@ -324,5 +328,9 @@ public class Device {
public boolean isGiftBadges() {
return giftBadges;
}
public boolean isPaymentActivation() {
return paymentActivation;
}
}
}