empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Stop reading the PNP capability.

Browse source
This commit is contained in:
Greyson Parrelli 2024-04-01 12:29:51 -04:00
parent c904a7aa97
commit 6c697fad8b
10 changed files with 4 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalActivityRule.kt
View file

@ -141,7 +141,7 @@ class SignalActivityRule(private val othersCount: Int = 4, private val createGro
val recipientId = RecipientId.from(SignalServiceAddress(aci, "+15555551%03d".format(i)))
SignalDatabase.recipients.setProfileName(recipientId, ProfileName.fromParts("Buddy", "#$i"))
SignalDatabase.recipients.setProfileKeyIfAbsent(recipientId, ProfileKeyUtil.createNew())
SignalDatabase.recipients.setCapabilities(recipientId, SignalServiceProfile.Capabilities(true, true, true))
SignalDatabase.recipients.setCapabilities(recipientId, SignalServiceProfile.Capabilities(true, true))
SignalDatabase.recipients.setProfileSharing(recipientId, true)
SignalDatabase.recipients.markRegistered(recipientId, aci)
val otherIdentity = IdentityKeyUtil.generateIdentityKeyPair()

1
app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/InternalConversationSettingsFragment.kt
View file

@ -325,7 +325,6 @@ class InternalConversationSettingsFragment : DSLSettingsFragment(
return if (capabilities != null) {
TextUtils.concat(
colorize("PNP/PNI", capabilities.pnpCapability),
colorize("PaymentActivation", capabilities.paymentActivation)
)
} else {

3
app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
View file

@ -408,7 +408,6 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
@JvmStatic
fun maskCapabilitiesToLong(capabilities: SignalServiceProfile.Capabilities): Long {
var value: Long = 0
value = Bitmask.update(value, Capabilities.PNP, Capabilities.BIT_LENGTH, Recipient.Capability.fromBoolean(capabilities.isPnp).serialize().toLong())
value = Bitmask.update(value, Capabilities.PAYMENT_ACTIVATION, Capabilities.BIT_LENGTH, Recipient.Capability.fromBoolean(capabilities.isPaymentActivation).serialize().toLong())
return value
}
@ -4569,7 +4568,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
// const val CHANGE_NUMBER = 4
// const val STORIES = 5
// const val GIFT_BADGES = 6
const val PNP = 7
// const val PNP = 7
const val PAYMENT_ACTIVATION = 8
}

1
app/src/main/java/org/thoughtcrime/securesms/database/RecipientTableCursorUtil.kt
View file

@ -175,7 +175,6 @@ object RecipientTableCursorUtil {
val capabilities = cursor.requireLong(RecipientTable.CAPABILITIES)
return RecipientRecord.Capabilities(
rawBits = capabilities,
pnpCapability = Recipient.Capability.deserialize(Bitmask.read(capabilities, Capabilities.PNP, Capabilities.BIT_LENGTH).toInt()),
paymentActivation = Recipient.Capability.deserialize(Bitmask.read(capabilities, Capabilities.PAYMENT_ACTIVATION, Capabilities.BIT_LENGTH).toInt())
)
}

2
app/src/main/java/org/thoughtcrime/securesms/database/model/RecipientRecord.kt
View file

@ -119,14 +119,12 @@ data class RecipientRecord(
data class Capabilities(
val rawBits: Long,
val pnpCapability: Recipient.Capability,
val paymentActivation: Recipient.Capability
) {
companion object {
@JvmField
val UNKNOWN = Capabilities(
0,
Recipient.Capability.UNKNOWN,
Recipient.Capability.UNKNOWN
)
}

3
app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionCapabilities.java
View file

@ -34,12 +34,11 @@ public final class LogSectionCapabilities implements LogSection {
RecipientRecord.Capabilities globalCapabilities = SignalDatabase.recipients().getCapabilities(self.getId());
StringBuilder builder = new StringBuilder().append("-- Local").append("\n")
.append("PNP/PNI: ").append(localCapabilities.getPni()).append("\n")
.append("\n")
.append("-- Global").append("\n");
if (globalCapabilities != null) {
builder.append("PNP/PNI: ").append(globalCapabilities.getPnpCapability()).append("\n");
builder.append("\n");
} else {
builder.append("Self not found!");
}

4
app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
View file

@ -1069,10 +1069,6 @@ public class Recipient {
return !NotificationChannels.supported() ? null : notificationChannel;
}
public @NonNull Capability getPnpCapability() {
return capabilities.getPnpCapability();
}
public @NonNull Capability getPaymentActivationCapability() {
return capabilities.getPaymentActivation();
}

4
app/src/main/java/org/thoughtcrime/securesms/storage/AccountRecordProcessor.java
View file

@ -169,10 +169,6 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
.setUsername(username)
.setUsernameLink(usernameLink);
if (!self.getPnpCapability().isSupported()) {
builder.setE164(e164);
}
return builder.build();
}
}

1
app/src/test/java/org/thoughtcrime/securesms/database/RecipientDatabaseTestUtils.kt
View file

@ -125,7 +125,6 @@ object RecipientDatabaseTestUtils {
unidentifiedAccessMode = unidentifiedAccessMode,
capabilities = RecipientRecord.Capabilities(
rawBits = capabilities,
pnpCapability = Recipient.Capability.deserialize(Bitmask.read(capabilities, RecipientTable.Capabilities.PNP, RecipientTable.Capabilities.BIT_LENGTH).toInt()),
paymentActivation = Recipient.Capability.deserialize(Bitmask.read(capabilities, RecipientTable.Capabilities.PAYMENT_ACTIVATION, RecipientTable.Capabilities.BIT_LENGTH).toInt())
),
storageId = storageId,

10
libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfile.java
View file

@ -192,18 +192,14 @@ public class SignalServiceProfile {
@JsonProperty
private boolean storage;
@JsonProperty
private boolean pnp;
@JsonProperty
private boolean paymentActivation;
@JsonCreator
public Capabilities() {}
public Capabilities(boolean storage, boolean pnp, boolean paymentActivation) {
public Capabilities(boolean storage, boolean paymentActivation) {
this.storage = storage;
this.pnp = pnp;
this.paymentActivation = paymentActivation;
}
@ -211,10 +207,6 @@ public class SignalServiceProfile {
return storage;
}
public boolean isPnp() {
return pnp;
}
public boolean isPaymentActivation() {
return paymentActivation;
}