Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-24 03:35:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files

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();
}
}