Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 01:40:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused capabilities.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-07-02 11:59:56 -04:00
committed by Cody Henthorne
parent 585401a98e
commit 70378b85d7
11 changed files with 8 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.kt
View File

@@ -12,13 +12,6 @@ object AppCapabilities {
fun getCapabilities(storageCapable: Boolean): AccountAttributes.Capabilities {
return AccountAttributes.Capabilities(
storage = storageCapable,
senderKey = true,
announcementGroup = true,
changeNumber = true,
stories = true,
giftBadges = true,
pni = true,
paymentActivation = true,
deleteSync = RemoteConfig.deleteSyncEnabled
)
}

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

@@ -341,7 +341,6 @@ class InternalConversationSettingsFragment : DSLSettingsFragment(
return if (capabilities != null) {
TextUtils.concat(
colorize("PaymentActivation", capabilities.paymentActivation),
", ",
colorize("DeleteSync", capabilities.deleteSync)
)

5
app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
View File

@@ -409,7 +409,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.PAYMENT_ACTIVATION, Capabilities.BIT_LENGTH, Recipient.Capability.fromBoolean(capabilities.isPaymentActivation).serialize().toLong())
value = Bitmask.update(value, Capabilities.DELETE_SYNC, Capabilities.BIT_LENGTH, Recipient.Capability.fromBoolean(capabilities.isDeleteSync).serialize().toLong())
return value
}
@@ -4577,8 +4576,10 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
// const val STORIES = 5
// const val GIFT_BADGES = 6
// const val PNP = 7
const val PAYMENT_ACTIVATION = 8
// const val PAYMENT_ACTIVATION = 8
const val DELETE_SYNC = 9
// IMPORTANT: We cannot sore more than 32 capabilities in the bitmask.
}
enum class VibrateState(val id: Int) {

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,
paymentActivation = Recipient.Capability.deserialize(Bitmask.read(capabilities, Capabilities.PAYMENT_ACTIVATION, Capabilities.BIT_LENGTH).toInt()),
deleteSync = Recipient.Capability.deserialize(Bitmask.read(capabilities, Capabilities.DELETE_SYNC, 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 paymentActivation: Recipient.Capability,
val deleteSync: Recipient.Capability
) {
companion object {
@JvmField
val UNKNOWN = Capabilities(
0,
Recipient.Capability.UNKNOWN,
Recipient.Capability.UNKNOWN
)
}

2
app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
View File

@@ -326,7 +326,7 @@ public class AttachmentManager {
intent.putExtra(PaymentsActivity.EXTRA_PAYMENTS_STARTING_ACTION, R.id.action_directly_to_createPayment);
intent.putExtra(PaymentsActivity.EXTRA_STARTING_ARGUMENTS, new CreatePaymentFragmentArgs.Builder(new PayeeParcelable(recipient.getId())).setFinishOnConfirm(true).build().toBundle());
fragment.startActivity(intent);
} else if (RemoteConfig.paymentsRequestActivateFlow() && recipient.getPaymentActivationCapability().isSupported()) {
} else if (RemoteConfig.paymentsRequestActivateFlow()) {
showRequestToActivatePayments(fragment.requireContext(), recipient);
} else {
RecipientHasNotEnabledPaymentsDialog.show(fragment.requireContext());

3
app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.kt
View File

@@ -314,9 +314,6 @@ class Recipient(
/** The notification channel, if both set and supported by the system. Otherwise null. */
val notificationChannel: String? = if (!NotificationChannels.supported()) null else notificationChannelValue
/** The user's payment capability. */
val paymentActivationCapability: Capability = capabilities.paymentActivation
/** The user's payment capability. */
val deleteSyncCapability: Capability = capabilities.deleteSync