Skip to content

Commit

Permalink
Merge tag 'v6.38.2' into molly-6.38
Browse files Browse the repository at this point in the history
  • Loading branch information
@valldrac
valldrac committed Nov 5, 2023
2 parents 0f190f5 + 2378346 commit e9eb970
Show file tree
Hide file tree
Showing 60 changed files with 1,500 additions and 1,091 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ ext {
MAPS_API_KEY = getEnv('CI_MAPS_API_KEY') ?: mapsApiKey
}

def canonicalVersionCode = 1352
def canonicalVersionName = "6.38.1"
def canonicalVersionCode = 1353
def canonicalVersionName = "6.38.2"
def mollyRevision = 0

def postFixSize = 100
Expand Down
26 changes: 13 additions & 13 deletions app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4696,31 +4696,31 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
*/
@Throws(MmsException::class)
private fun IncomingMessage.toMessageType(): Long {
var type = MessageTypes.BASE_INBOX_TYPE or MessageTypes.SECURE_MESSAGE_BIT or MessageTypes.PUSH_MESSAGE_BIT
var type = MessageTypes.SECURE_MESSAGE_BIT or MessageTypes.PUSH_MESSAGE_BIT

if (this.giftBadge != null) {
type = type or MessageTypes.SPECIAL_TYPE_GIFT_BADGE
}

type = type or when (this.type) {
MessageType.NORMAL -> 0
MessageType.EXPIRATION_UPDATE -> MessageTypes.EXPIRATION_TIMER_UPDATE_BIT
MessageType.STORY_REACTION -> MessageTypes.SPECIAL_TYPE_STORY_REACTION
MessageType.PAYMENTS_NOTIFICATION -> MessageTypes.SPECIAL_TYPE_PAYMENTS_NOTIFICATION
MessageType.ACTIVATE_PAYMENTS_REQUEST -> MessageTypes.SPECIAL_TYPE_PAYMENTS_ACTIVATE_REQUEST
MessageType.PAYMENTS_ACTIVATED -> MessageTypes.SPECIAL_TYPE_PAYMENTS_ACTIVATED
MessageType.NORMAL -> MessageTypes.BASE_INBOX_TYPE
MessageType.EXPIRATION_UPDATE -> MessageTypes.EXPIRATION_TIMER_UPDATE_BIT or MessageTypes.BASE_INBOX_TYPE
MessageType.STORY_REACTION -> MessageTypes.SPECIAL_TYPE_STORY_REACTION or MessageTypes.BASE_INBOX_TYPE
MessageType.PAYMENTS_NOTIFICATION -> MessageTypes.SPECIAL_TYPE_PAYMENTS_NOTIFICATION or MessageTypes.BASE_INBOX_TYPE
MessageType.ACTIVATE_PAYMENTS_REQUEST -> MessageTypes.SPECIAL_TYPE_PAYMENTS_ACTIVATE_REQUEST or MessageTypes.BASE_INBOX_TYPE
MessageType.PAYMENTS_ACTIVATED -> MessageTypes.SPECIAL_TYPE_PAYMENTS_ACTIVATED or MessageTypes.BASE_INBOX_TYPE
MessageType.CONTACT_JOINED -> MessageTypes.JOINED_TYPE
MessageType.IDENTITY_UPDATE -> MessageTypes.KEY_EXCHANGE_IDENTITY_UPDATE_BIT
MessageType.IDENTITY_VERIFIED -> MessageTypes.KEY_EXCHANGE_IDENTITY_VERIFIED_BIT
MessageType.IDENTITY_DEFAULT -> MessageTypes.KEY_EXCHANGE_IDENTITY_DEFAULT_BIT
MessageType.END_SESSION -> MessageTypes.END_SESSION_BIT
MessageType.IDENTITY_UPDATE -> MessageTypes.KEY_EXCHANGE_IDENTITY_UPDATE_BIT or MessageTypes.BASE_INBOX_TYPE
MessageType.IDENTITY_VERIFIED -> MessageTypes.KEY_EXCHANGE_IDENTITY_VERIFIED_BIT or MessageTypes.BASE_INBOX_TYPE
MessageType.IDENTITY_DEFAULT -> MessageTypes.KEY_EXCHANGE_IDENTITY_DEFAULT_BIT or MessageTypes.BASE_INBOX_TYPE
MessageType.END_SESSION -> MessageTypes.END_SESSION_BIT or MessageTypes.BASE_INBOX_TYPE
MessageType.GROUP_UPDATE -> {
val isOnlyGroupLeave = this.groupContext?.let { GroupV2UpdateMessageUtil.isJustAGroupLeave(it) } ?: false

if (isOnlyGroupLeave) {
MessageTypes.GROUP_V2_BIT or MessageTypes.GROUP_UPDATE_BIT or MessageTypes.GROUP_LEAVE_BIT
MessageTypes.GROUP_V2_BIT or MessageTypes.GROUP_UPDATE_BIT or MessageTypes.GROUP_LEAVE_BIT or MessageTypes.BASE_INBOX_TYPE
} else {
MessageTypes.GROUP_V2_BIT or MessageTypes.GROUP_UPDATE_BIT
MessageTypes.GROUP_V2_BIT or MessageTypes.GROUP_UPDATE_BIT or MessageTypes.BASE_INBOX_TYPE
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion .../java/org/thoughtcrime/securesms/database/helpers/migration/V210_FixPniPossibleColumns.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ object V210_FixPniPossibleColumns : SignalDatabaseMigration {
private fun getLocalPni(context: Application): ServiceId.PNI? {
if (KeyValueDatabase.exists(context)) {
val keyValueDatabase = KeyValueDatabase.getInstance(context).readableDatabase
keyValueDatabase.query("key_value", arrayOf("value"), "key = ?", SqlUtil.buildArgs("account.pni"), null, null, null).use { cursor ->
keyValueDatabase.query("key_value", arrayOf("value"), "key = ?", SqlUtil.buildArgs("account.1.pni"), null, null, null).use { cursor ->
return if (cursor.moveToFirst()) {
ServiceId.PNI.parseOrNull(cursor.requireString("value"))
} else {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/webrtc_call_screen_speaker_toggle_small.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
android:left="4dp"
android:right="4dp"
android:drawable="@drawable/webrtc_call_screen_circle_checked" />
<item android:bottom="14dp" android:drawable="@drawable/symbol_speaker_fill_24" android:left="14dp" android:right="14dp" android:top="14dp" />
<item android:bottom="14dp" android:drawable="@drawable/symbol_speaker_fill_white_24" android:left="14dp" android:right="14dp" android:top="14dp" />
</layer-list>
</item>
<item app:state_handset_selected="true">
Expand Down
38 changes: 24 additions & 14 deletions app/src/main/res/values-ar/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2391,9 +2391,19 @@

<!-- ApkUpdateNotifications -->
<string name="ApkUpdateNotifications_prompt_install_title">تحديث سيجنال</string>
<<<<<<< HEAD
<string name="ApkUpdateNotifications_prompt_install_body">A new version of Molly is available. Tap to update.</string>
<string name="ApkUpdateNotifications_failed_general_title">Molly failed to update</string>
<string name="ApkUpdateNotifications_failed_general_body">We will try again later.</string>
||||||| cdb9df5aba
<string name="ApkUpdateNotifications_prompt_install_body">A new version of Molly is available. Tap to update.</string>
<string name="ApkUpdateNotifications_failed_general_title">Molly failed to update</string>
<string name="ApkUpdateNotifications_failed_general_body">We will try again later.</string>
=======
<string name="ApkUpdateNotifications_prompt_install_body">إصدار جديد من سيجنال متوفر. انقر للتحديث.</string>
<string name="ApkUpdateNotifications_failed_general_title">تعذّر على سيجنال التحديث</string>
<string name="ApkUpdateNotifications_failed_general_body">سنحاول من جديد لاحقًا.</string>
>>>>>>> v6.38.2

<!-- UntrustedSendDialog -->
<string name="UntrustedSendDialog_send_message">هل تود إرسال الرسالة ؟</string>
Expand Down Expand Up @@ -6371,8 +6381,8 @@
<string name="GatewaySelectorBottomSheet__ideal">iDEAL</string>

<!-- Dialog title for launching external intent -->
<string name="ExternalNavigationHelper__leave_signal_to_confirm_payment">Leave Signal to confirm payment?</string>
<string name="ExternalNavigationHelper__once_this_payment_is_confirmed">Once this payment is confirmed, return to Signal to finish processing your donation.</string>
<string name="ExternalNavigationHelper__leave_signal_to_confirm_payment">مغادرة سيجنال لتأكيد الدفع؟</string>
<string name="ExternalNavigationHelper__once_this_payment_is_confirmed">بمُجرد تأكيد عملية الدفع هذه، عُد إلى سيجنال لإنهاء عملية التبرع.</string>

<!-- IdealBank -->
<!-- iDEAL bank name -->
Expand Down Expand Up @@ -6412,7 +6422,7 @@
<!-- Button label to continue with transfer -->
<string name="BankTransferMandateFragment__continue">مواصلة</string>
<!-- Text displayed when mandate load fails -->
<string name="BankTransferMandateFragment__failed_to_load_mandate">Failed to load mandate</string>
<string name="BankTransferMandateFragment__failed_to_load_mandate">تعذر تحميل الطلب</string>

<!-- BankTransferDetailsFragment -->
<!-- Subtext explaining how email is used. Placeholder is \'Learn more\' -->
Expand All @@ -6432,13 +6442,13 @@
<!-- Donate button label for one-time -->
<string name="BankTransferDetailsFragment__donate_s">تبرّع لـ %1$s</string>
<!-- Error label for IBAN field when number is too short -->
<string name="BankTransferDetailsFragment__iban_is_too_short">IBAN is too short</string>
<string name="BankTransferDetailsFragment__iban_is_too_short">رقم IBAN قصير جدًا</string>
<!-- Error label for IBAN field when number is too long -->
<string name="BankTransferDetailsFragment__iban_is_too_long">IBAN is too long</string>
<string name="BankTransferDetailsFragment__iban_is_too_long">رقم IBAN طويل جدًا</string>
<!-- Error label for IBAN field when country is not supported -->
<string name="BankTransferDetailsFragment__iban_country_code_is_not_supported">رقم IBAN الخاص ببلدك غير مدعوم</string>
<!-- Error label for IBAN field when number is invalid -->
<string name="BankTransferDetailsFragment__invalid_iban">Invalid IBAN</string>
<string name="BankTransferDetailsFragment__invalid_iban">رقم IBAN غير صحيح</string>

<!-- IdealTransferDetailsFragment -->
<!-- Title of the screen, displayed in the toolbar -->
Expand All @@ -6461,7 +6471,7 @@
<!-- Title of bottom sheet for finding account information -->
<string name="FindAccountInfoSheet__find_your_account_information">العثور على معلومات حسابك</string>
<!-- Body of bottom sheet for finding account information -->
<string name="FindAccountInfoSheet__look_for_your_iban_at">Look for your IBAN at the top of your bank statement. IBANs contain up to 34 characters. The name you enter should match your full name on your bank account. Contact your bank for more information.</string>
<string name="FindAccountInfoSheet__look_for_your_iban_at">ابحث عن رقم IBAN الخاص بك في الجزء العلوي من كشف حسابك المصرفي. يَحتوي رقم IBAN على ما يصل إلى 34 رقمًا. يَجب أن يتطابق الاسم الذي تُدخله مع اسمك الكامل في حسابك المصرفي. يُرجى الاتصال بمصرفك لمزيد من المعلومات.</string>

<!-- Title of donation pending sheet displayed after making a bank transfer -->
<string name="DonationPendingBottomSheet__donation_pending">التبرّع معلق</string>
Expand All @@ -6477,9 +6487,9 @@
<string name="DonationPendingBottomSheet__done">تمّ</string>

<!-- Title of donation error sheet displayed after making a bank transfer that fails -->
<string name="DonationErrorBottomSheet__donation_couldnt_be_processed">Donation couldn\'t be processed</string>
<string name="DonationErrorBottomSheet__donation_couldnt_be_processed">تعذر معالجة التبرّع</string>
<!-- Text block of donation error sheet displayed after making a bank transfer that fails -->
<string name="DonationErrorBottomSheet__were_having_trouble">We\'re having trouble processing your bank transfer. You have not been charged. Try another payment method or contact your bank for more information.</string>
<string name="DonationErrorBottomSheet__were_having_trouble">نُواجه مشكلة في معالجة التحويل المصرفي الخاص بك. لم تُحصّل أي رسوم منك. يُرجى محاولة طريقة أخرى للدفع أو الاتصال بالمصرف الذي لديك عنده حساب للمزيد من المعلومات.</string>
<!-- Button label for retry button of donation error sheet displayed after making a bank transfer that fails -->
<string name="DonationErrorBottomSheet__try_again">حاول مجددا</string>
<!-- Button label for not now button of donation error sheet displayed after making a bank transfer that fails -->
Expand Down Expand Up @@ -6930,17 +6940,17 @@
<string name="PendingParticipantsBottomSheet__approve">الموافقة</string>

<!-- Title of a megaphone shown at the bottom of the chat list when a user has disable the system setting for showing full screen notifications used showing incoming calls -->
<string name="GrantFullScreenIntentPermission_megaphone_title">Turn on full screen notifications?</string>
<string name="GrantFullScreenIntentPermission_megaphone_title">تفعيل إشعارات ملء الشاشة؟</string>
<!-- Body of a megaphone shown at the bottom of the chat list when a user has disable the system setting for showing full screen notifications used showing incoming calls -->
<string name="GrantFullScreenIntentPermission_megaphone_body">Never miss a call from your contacts and groups.</string>
<string name="GrantFullScreenIntentPermission_megaphone_body">لا تفوّت مكالمة أبدًا من جهات اتصالك أو مجموعاتك.</string>
<!-- Button on the megaphone megaphone shown at the bottom of the chat list when a user has disable the system setting for showing full screen notifications used showing incoming calls that starts the fix process -->
<string name="GrantFullScreenIntentPermission_megaphone_turn_on">شغّل</string>
<!-- Title of bottom sheet shown after tapping "Turn on" from the megaphone to re-enable full screen notifications for incoming call notifications -->
<string name="GrantFullScreenIntentPermission_bottomsheet_title">Turn on full screen notifications</string>
<string name="GrantFullScreenIntentPermission_bottomsheet_title">تفعيل إشعارات ملء الشاشة</string>
<!-- Subtitle of bottom sheet shown after tapping "Turn on" from the megaphone to re-enable full screen notifications for incoming call notifications -->
<string name="GrantFullScreenIntentPermission_bottomsheet_subtitle">To receive call notifications from your contacts and groups:</string>
<string name="GrantFullScreenIntentPermission_bottomsheet_subtitle">للتوصّل بإشعارات مُكالمات من جهات اتصالك ومجموعاتك:</string>
<!-- Step 2 of bottom sheet shown after tapping "Turn on" from the megaphone to re-enable full screen notifications for incoming call notifications, it indicates the name of the setting that needs to be re-enabled -->
<string name="GrantFullScreenIntentPermission_bottomsheet_step2">2. %1$s Allow full screen notifications</string>
<string name="GrantFullScreenIntentPermission_bottomsheet_step2">2. %1$s تفعيل إشعارات ملء الشاشة</string>

<!-- EOF -->
</resources>
Loading

0 comments on commit e9eb970

Please sign in to comment.