ThomasSession
32acd6e029
Fixing up styling of Prominent buttons and "view_user" to work better on different bg colors
2024-09-06 08:34:31 +10:00
ThomasSession
f2413288ca
Fixing styling issue in unread scroll to bottom button
2024-09-06 08:34:31 +10:00
ThomasSession
cef47df0e4
Bumping version code (to cater for internal track build)
2024-09-06 08:33:50 +10:00
ThomasSession
b95fe8c83d
Fixing scrolling issues in emoji reactions
2024-09-06 08:33:30 +10:00
ThomasSession
8b10527125
Adding text color tertiary to the sheet's theme
2024-09-06 08:33:30 +10:00
ThomasSession
c4f0854335
Fixing the crashing Share feature
...
TODO: Rebuild this screen in compose because the search functionality is not working
2024-09-06 08:30:11 +10:00
Al Lansley
786485d874
Subtituted 'Session' into 'Quit Session' text on go-back modal
2024-09-06 08:30:10 +10:00
Fanchao Liu
67bcc937ce
Strings work
...
Squashed commit of the following:
commit 86cab0e11e
Author: ThomasSession <thomas.r@getsession.org>
Date: Fri Aug 30 10:17:04 2024 +1000
Bringing my xml dialog styling from my 'Standardise message deletion' branch
commit 706d1aadd8
Author: ThomasSession <thomas.r@getsession.org>
Date: Fri Aug 30 09:49:48 2024 +1000
fixing up clear data dialog
Removing unused code
commit f90599451f
Author: Al Lansley <al@oxen.io>
Date: Fri Aug 30 09:13:51 2024 +1000
Replaced 'now' with 12/24 hour time
commit 16b8ad46c0
Author: alansley <aclansley@gmail.com>
Date: Thu Aug 29 17:34:03 2024 +1000
Fix two one-liner issues
commit 4c6c450b32
Merge: 052f910d69
beb89d5b74
Author: ThomasSession <thomas.r@getsession.org>
Date: Thu Aug 29 17:07:16 2024 +1000
Merge branch 'strings-squashed' of https://github.com/oxen-io/session-android into strings-squashed
commit 052f910d69
Author: ThomasSession <thomas.r@getsession.org>
Date: Thu Aug 29 17:06:53 2024 +1000
More bold fixing
commit beb89d5b74
Author: fanchao <git@fanchao.dev>
Date: Thu Aug 29 17:00:37 2024 +1000
Fix incorrect group member left message
commit 5773f05a5c
Merge: d35482daba
1cec477020
Author: ThomasSession <thomas.r@getsession.org>
Date: Thu Aug 29 15:21:44 2024 +1000
Merge branch 'strings-squashed' of https://github.com/oxen-io/session-android into strings-squashed
commit d35482daba
Author: ThomasSession <thomas.r@getsession.org>
Date: Thu Aug 29 15:20:13 2024 +1000
More bold fixes and UI tweaks
commit 78a9ab7159
Author: ThomasSession <thomas.r@getsession.org>
Date: Thu Aug 29 14:03:41 2024 +1000
Making sure we bold appropriately
commit 1cec477020
Author: alansley <aclansley@gmail.com>
Date: Thu Aug 29 13:33:50 2024 +1000
Made call to 'getQuantityString' pass the count twice because otherwise it doesn't work correctly
commit 8e80ab08a9
Author: ThomasSession <thomas.r@getsession.org>
Date: Thu Aug 29 13:28:54 2024 +1000
Using the existing implementation
commit cb9554ab38
Author: alansley <aclansley@gmail.com>
Date: Thu Aug 29 12:32:30 2024 +1000
Merge CrowdIn strings circa 2024-08-29
commit dd57da70f6
Author: alansley <aclansley@gmail.com>
Date: Thu Aug 29 09:06:22 2024 +1000
Updated Phrase usage in ConversationAdapter
commit 34b15d7865
Author: alansley <aclansley@gmail.com>
Date: Thu Aug 29 09:03:55 2024 +1000
Converted TransferControlView into Kotlin and updated Phrase usage
commit a35a7a6a96
Author: alansley <aclansley@gmail.com>
Date: Thu Aug 29 08:55:16 2024 +1000
Converted MessageReceipientNotificationBuilder to Kotlin & updated Phrase usage
commit 6dd93b33f2
Author: alansley <aclansley@gmail.com>
Date: Thu Aug 29 08:25:24 2024 +1000
Update MuteDialog, LinkPreviewDialog, and PathActivity
commit e7dd1c582d
Author: alansley <aclansley@gmail.com>
Date: Thu Aug 29 08:16:09 2024 +1000
Updated DisappearingMessages.kt and HelpSettingsActivity.kt
commit 5bd55ea993
Author: alansley <aclansley@gmail.com>
Date: Thu Aug 29 08:01:30 2024 +1000
Converted SwitchPreferenceCompat to Kotlin and fixed the BlockedDialog using the joinCommunity string for some bizarre reason
commit d3fb440d05
Author: alansley <aclansley@gmail.com>
Date: Thu Aug 29 07:15:03 2024 +1000
Removed R.string.gif and replaced with a string constant
commit ace58e3493
Author: alansley <aclansley@gmail.com>
Date: Thu Aug 29 07:11:53 2024 +1000
getSubbedString correction
commit 2a8f010369
Merge: ce8efd7def
116bef3c71
Author: alansley <aclansley@gmail.com>
Date: Wed Aug 28 16:31:43 2024 +1000
Merge branch 'compose-open-url-dialog' into strings-squashed
commit ce8efd7def
Author: alansley <aclansley@gmail.com>
Date: Wed Aug 28 16:31:11 2024 +1000
WIP
commit 114066ad5f
Author: alansley <aclansley@gmail.com>
Date: Wed Aug 28 15:30:02 2024 +1000
Push before changing over all the Phrase.from to extension method calls
commit 116bef3c71
Author: ThomasSession <thomas.r@getsession.org>
Date: Wed Aug 28 15:25:03 2024 +1000
For safety
commit 0b1a71a582
Author: ThomasSession <thomas.r@getsession.org>
Date: Wed Aug 28 15:23:02 2024 +1000
Cleaning other use of old url dialog
commit 20abbebf4a
Author: ThomasSession <thomas.r@getsession.org>
Date: Wed Aug 28 15:19:46 2024 +1000
Forgot !!
commit 25132c6342
Author: ThomasSession <thomas.r@getsession.org>
Date: Wed Aug 28 15:13:58 2024 +1000
Proper set up for the Open URL dialog
commit 1f68791da9
Author: alansley <aclansley@gmail.com>
Date: Wed Aug 28 14:35:05 2024 +1000
Replaced placeholder text with new string
commit 8d97f31b4d
Author: alansley <aclansley@gmail.com>
Date: Wed Aug 28 14:31:52 2024 +1000
Adjusted comment
commit dfebe6f3f9
Author: alansley <aclansley@gmail.com>
Date: Wed Aug 28 14:25:23 2024 +1000
Moved block/unblock string selection logic into ViewModel and fixed a comment
commit 736b5313e6
Author: alansley <aclansley@gmail.com>
Date: Wed Aug 28 14:02:54 2024 +1000
Changed toast to warning - although condition to trigger should not be possible
commit 413bc0be4b
Author: alansley <aclansley@gmail.com>
Date: Wed Aug 28 13:55:04 2024 +1000
Adjusted EditGroupMembers to match iOS and fixed up save attachment commentary / logic
commit ae7164ecbb
Merge: 5df981bc7a
d1c4283f42
Author: alansley <aclansley@gmail.com>
Date: Wed Aug 28 09:51:58 2024 +1000
Merge branch 'dev' into strings-squashed
commit 2aa58f4dd6
Author: alansley <aclansley@gmail.com>
Date: Wed Aug 28 08:27:03 2024 +1000
WIP compose openURL dialog
commit 5df981bc7a
Author: alansley <aclansley@gmail.com>
Date: Tue Aug 27 15:51:38 2024 +1000
Adjusted NotificationRadioButton that takes string IDs to act as a pass-through
commit 96453f1f1e
Author: alansley <aclansley@gmail.com>
Date: Tue Aug 27 15:42:33 2024 +1000
Added some TODO markers for tomorrow
commit a402a1be79
Author: alansley <aclansley@gmail.com>
Date: Tue Aug 27 15:33:55 2024 +1000
Adjusted Landing page string substitutions to cater for emojis
commit 4809b5444b
Author: alansley <aclansley@gmail.com>
Date: Tue Aug 27 15:12:39 2024 +1000
Removed unused 'isEmpty' utility methods
commit b52048a080
Author: alansley <aclansley@gmail.com>
Date: Tue Aug 27 14:42:57 2024 +1000
Addressed many aspects of PR feedback + misc. strings issues
commit 9cdbc4b80b
Author: alansley <aclansley@gmail.com>
Date: Tue Aug 27 09:50:51 2024 +1000
Adjusted strings as per Rebecca's 'String Changes' spreadsheet
commit 4d7e4b9e2c
Merge: 3c576053a3
1393335121
Author: alansley <aclansley@gmail.com>
Date: Tue Aug 27 08:19:53 2024 +1000
Merge branch 'dev' into strings-squashed
commit 3c576053a3
Author: alansley <aclansley@gmail.com>
Date: Mon Aug 26 17:11:45 2024 +1000
Moved into libsession for ease of access to control message view creation
commit b908a54a44
Merge: 404fb8001c
bfbe4a8fd2
Author: alansley <aclansley@gmail.com>
Date: Mon Aug 26 11:54:09 2024 +1000
Merge branch 'dev' into strings-squashed
commit 404fb8001c
Author: alansley <aclansley@gmail.com>
Date: Mon Aug 26 11:52:41 2024 +1000
Performed a PR pass to fix up anything obvious - there's still a few things left TODO
commit 53978f818d
Author: Al Lansley <al@oxen.io>
Date: Fri Aug 23 14:13:11 2024 +1000
Cleaned up HomeActivityTests.kt
commit 5f82571bef
Merge: 69b8bd7396
8deb21c0c6
Author: Al Lansley <al@oxen.io>
Date: Fri Aug 23 08:59:21 2024 +1000
Merge branch 'dev' into strings-squashed
commit 69b8bd7396
Author: alansley <aclansley@gmail.com>
Date: Thu Aug 22 16:20:17 2024 +1000
Added back app_name string so app names properly, fixed API 28 save issue, made some buttons display as red if they should
commit e3cab9c0d9
Author: alansley <aclansley@gmail.com>
Date: Thu Aug 22 14:26:48 2024 +1000
SS-75 Prevented ScrollView vertical scroll bar from fading out
commit b0b835092d
Author: alansley <aclansley@gmail.com>
Date: Thu Aug 22 14:07:49 2024 +1000
SS-64 Removed all 'Unblocked {name}' toasts as per instructions
commit c3c35de408
Merge: efc2ee2824
8e10e1abf4
Author: alansley <aclansley@gmail.com>
Date: Thu Aug 22 13:43:00 2024 +1000
Merge branch 'dev' into strings-squashed
commit efc2ee2824
Author: alansley <aclansley@gmail.com>
Date: Thu Aug 22 13:40:59 2024 +1000
Added some comments about the new CrowdIn strings
commit 7a03fb37ef
Author: alansley <aclansley@gmail.com>
Date: Thu Aug 22 13:08:03 2024 +1000
Initial integration of CrowdIn strings (English only)
commit 9766c3fd0b
Author: alansley <aclansley@gmail.com>
Date: Thu Aug 22 09:55:14 2024 +1000
SS-75 Added 'Copied' toast when the user copies a URL in the Open URL dialog
commit 59b4805b8b
Author: alansley <aclansley@gmail.com>
Date: Thu Aug 22 09:51:01 2024 +1000
SS-75 Prevent 'Are you sure you want to open this URL?' dialog from being excessively tall when given a very long URL
commit b7f627f03c
Author: alansley <aclansley@gmail.com>
Date: Wed Aug 21 14:54:17 2024 +1000
Made closed group deleting-someone-elses msgs use 'Delete message' or 'Delete Messages' appropriately
commit 69f6818f99
Author: alansley <aclansley@gmail.com>
Date: Wed Aug 21 13:53:58 2024 +1000
Adjusted SS-64 so that all Block / Unblock buttons now use that text and are displayed in red
commit 2192c2c007
Merge: 2338bb47ca
eea54d1a17
Author: alansley <aclansley@gmail.com>
Date: Wed Aug 21 13:28:16 2024 +1000
Merge branch 'dev' into strings-squashed
commit 2338bb47ca
Author: alansley <aclansley@gmail.com>
Date: Tue Aug 20 19:11:40 2024 +1000
Converted DefaultMessageNotifier to Kotlin because it needs adjustment & that Java is nasty
commit 6b29e4d8ce
Author: alansley <aclansley@gmail.com>
Date: Tue Aug 20 17:53:27 2024 +1000
Added a note about the plurals for search results
commit f7748a0c05
Author: alansley <aclansley@gmail.com>
Date: Tue Aug 20 16:06:24 2024 +1000
Corrected text on storage permission dialog
commit f6b6256598
Author: alansley <aclansley@gmail.com>
Date: Tue Aug 20 14:44:25 2024 +1000
Minor cleanup of BlockedContactsActivity
commit e3d4870d81
Author: alansley <aclansley@gmail.com>
Date: Tue Aug 20 14:41:14 2024 +1000
Addressed changes to fix SS-64 / QA-146 - unblocking contacts modal & toast adjustments
commit e812527358
Merge: 5e02e1ef5c
9919f716a7
Author: alansley <aclansley@gmail.com>
Date: Tue Aug 20 13:27:35 2024 +1000
Merge branch 'dev' into strings-squashed
commit 5e02e1ef5c
Author: alansley <aclansley@gmail.com>
Date: Tue Aug 20 09:39:16 2024 +1000
Added 'NonTranslatableStringConstants' file
commit 816f21bb29
Author: alansley <aclansley@gmail.com>
Date: Tue Aug 20 09:30:30 2024 +1000
Addressed commit feedback & removed desktop string 'attachmentsClickToDownload' as we use 'attachmentsTapToDownload'
commit acc8d47c68
Author: Al Lansley <al@oxen.io>
Date: Mon Aug 19 16:22:08 2024 +1000
SES-1571 Large messages show warning toast
commit 27ca77d5c4
Merge: 27bc90bf1f
f379604c54
Author: Al Lansley <al@oxen.io>
Date: Mon Aug 19 11:19:27 2024 +1000
Merge branch 'dev' into strings-squashed
commit 27bc90bf1f
Author: Al Lansley <al@oxen.io>
Date: Mon Aug 19 08:59:38 2024 +1000
Cleaned up some comments and content description
commit 558684a56d
Merge: 90d7064c18
93a28906fb
Author: Al Lansley <al@oxen.io>
Date: Mon Aug 19 08:41:47 2024 +1000
Merge branch 'dev' into strings-squashed
commit 90d7064c18
Author: Al Lansley <al@oxen.io>
Date: Thu Aug 15 12:13:30 2024 +1000
Fixed issue where new closed groups would display a timestamp instead of the 'groupNoMessages' text
commit 51ef0ec81c
Author: Al Lansley <al@oxen.io>
Date: Thu Aug 15 09:45:28 2024 +1000
Replaced string 'CreateProfileActivity_profile_photo' with the string 'photo' which has the same text ('Photo')
commit eecce08c25
Merge: 01009cf521
5a248da445
Author: Al Lansley <al@oxen.io>
Date: Thu Aug 15 09:38:10 2024 +1000
Merge branch 'dev' into strings-squashed
commit 01009cf521
Author: Al Lansley <al@oxen.io>
Date: Thu Aug 15 08:37:19 2024 +1000
Changed allowed emoji reactions per minute from 5 (which I used for testing) to 20 (production)
commit 9441d1e08d
Author: Al Lansley <al@oxen.io>
Date: Thu Aug 15 08:34:16 2024 +1000
Refactored emoji rate limiter to use a timestamp mechanism rather than removing queue items after a delay
commit 6cd6cc3e26
Author: alansley <aclansley@gmail.com>
Date: Wed Aug 14 16:48:07 2024 +1000
Adjusted emoji rate limit to 20 reactions per minute to match acceptance criteria
commit edd154d8e1
Author: alansley <aclansley@gmail.com>
Date: Wed Aug 14 16:02:16 2024 +1000
SS-78 / SES-199 Mechanism required to limit emoji reaction rate
commit a8ee5c9f3b
Author: alansley <aclansley@gmail.com>
Date: Wed Aug 14 14:51:40 2024 +1000
Replaced hard-coded 'Session' with '{app_name}' in 'callsSessionCall'
commit 621094ebe4
Author: alansley <aclansley@gmail.com>
Date: Wed Aug 14 13:40:01 2024 +1000
SS-72 Update save attachment models + add one-time warning that other apps can access saved attachments
commit 0c83606539
Author: alansley <aclansley@gmail.com>
Date: Tue Aug 13 15:50:35 2024 +1000
SS-75 Open URL modal change
commit 802cf19598
Author: Al Lansley <al@oxen.io>
Date: Mon Aug 12 16:42:15 2024 +1000
Open or copy URL WIP
commit ea84aa1478
Author: Al Lansley <al@oxen.io>
Date: Mon Aug 12 14:17:04 2024 +1000
Tied in bandDeleteAll string
commit 93b8e74f2d
Author: Al Lansley <al@oxen.io>
Date: Mon Aug 12 11:34:03 2024 +1000
Job done! All Accessibility ID strings mapped and/or dealt with appropriately!
commit fc3b4ad367
Author: Al Lansley <al@oxen.io>
Date: Mon Aug 12 09:49:57 2024 +1000
Further AccessibilityId mapping & fixed group members counts to display correct details
commit 558d6741b1
Author: alansley <aclansley@gmail.com>
Date: Fri Aug 9 17:24:44 2024 +1000
End of day push
commit 73fdb16214
Author: alansley <aclansley@gmail.com>
Date: Fri Aug 9 15:57:06 2024 +1000
Localised time strings working - even if the unit tests aren't
commit 436175d146
Author: alansley <aclansley@gmail.com>
Date: Fri Aug 9 13:54:09 2024 +1000
Relative time string WIP
commit f309263e39
Merge: 45c4118d52
007e705cd9
Author: alansley <aclansley@gmail.com>
Date: Fri Aug 9 11:39:13 2024 +1000
Merge dev
commit 45c4118d52
Author: Al Lansley <al@oxen.io>
Date: Thu Aug 8 16:43:02 2024 +1000
Further AccessibilityId mapping WIP
commit 31bac8e30e
Author: Al Lansley <al@oxen.io>
Date: Thu Aug 8 10:53:30 2024 +1000
Further accessibility ID changes & removed fragment_new_conversation_home.xml
commit 9c2111e66e
Author: alansley <aclansley@gmail.com>
Date: Wed Aug 7 13:13:52 2024 +1000
AccessibilityId WIP
commit 1e9eeff86a
Author: alansley <aclansley@gmail.com>
Date: Wed Aug 7 11:06:39 2024 +1000
AccessibilityId adjustments & removed some unused XML layouts
commit e5fd2c8cc0
Author: alansley <aclansley@gmail.com>
Date: Wed Aug 7 09:22:14 2024 +1000
AccessibilityId refactor WIP
commit 399796bac3
Author: alansley <aclansley@gmail.com>
Date: Tue Aug 6 15:51:53 2024 +1000
AccessibilityId WIP - up to AccessibilityId_reveal_recovery_phrase_button
commit a8d72dfcc0
Author: alansley <aclansley@gmail.com>
Date: Tue Aug 6 14:12:10 2024 +1000
Cleaned up a few comments and fixed some plurals logic
commit be400d8f4f
Author: alansley <aclansley@gmail.com>
Date: Tue Aug 6 11:32:08 2024 +1000
Removed commented out merge conflict marker
commit 5cbe289a8d
Merge: 5fe123e7b5
d6c5ab2b18
Author: alansley <aclansley@gmail.com>
Date: Tue Aug 6 11:30:50 2024 +1000
Merge dev and cleanup
commit 5fe123e7b5
Author: Al Lansley <al@oxen.io>
Date: Mon Aug 5 14:37:47 2024 +1000
Adjusted sending of mms messages to show 'Uploading' rather than 'Sending' as per SES-1721
commit d3f8e928b6
Merge: 00552930e6
cd1a0643e3
Author: Al Lansley <al@oxen.io>
Date: Mon Aug 5 13:30:03 2024 +1000
Merge branch 'dev' into strings-squashed
commit 00552930e6
Author: Al Lansley <al@oxen.io>
Date: Mon Aug 5 13:28:55 2024 +1000
Removed unused helpReportABugDesktop strings
commit 6c0450b487
Author: Al Lansley <al@oxen.io>
Date: Mon Aug 5 12:59:15 2024 +1000
Renamed 'quitButton' string to just 'quit'
commit 284c485903
Author: Al Lansley <al@oxen.io>
Date: Mon Aug 5 12:00:35 2024 +1000
Replaced 'screenSecurity' with 'screenshotNotifications' as the title of the notifications toggle
commit 6948d64fa8
Author: Al Lansley <al@oxen.io>
Date: Mon Aug 5 10:45:05 2024 +1000
WIP
commit bc94cb78db
Author: alansley <aclansley@gmail.com>
Date: Fri Aug 2 16:21:16 2024 +1000
End of day push
commit 1a2df3798a
Merge: c7fdb6aed9
a56e1d0b91
Author: alansley <aclansley@gmail.com>
Date: Fri Aug 2 15:20:19 2024 +1000
Merged dev
commit c7fdb6aed9
Author: alansley <aclansley@gmail.com>
Date: Fri Aug 2 14:21:11 2024 +1000
Replaced string 'dialog_disappearing_messages_follow_setting_confirm' with 'confirm'
commit 2992d590d9
Author: alansley <aclansley@gmail.com>
Date: Fri Aug 2 14:01:00 2024 +1000
Removed string 'attachment_type_selector__gallery' and associated / un-used 'attachment_type_selector.xml' layout
commit 4218663c95
Author: alansley <aclansley@gmail.com>
Date: Fri Aug 2 13:39:54 2024 +1000
Removed 'message_details_header__disappears' and the unused 'activity_message_detail.xml' which was the only reference to it
commit ba2d0275e4
Author: alansley <aclansley@gmail.com>
Date: Fri Aug 2 12:15:42 2024 +1000
Implemented task SS-79 to only provide a save attachment menu option when the attachment download is complete
commit 20662c8222
Merge: 608c984a6b
fbbef4898a
Author: alansley <aclansley@gmail.com>
Date: Wed Jul 31 13:08:04 2024 +1000
Merge branch 'dev' into strings-squashed
commit 608c984a6b
Author: alansley <aclansley@gmail.com>
Date: Tue Jul 30 16:58:08 2024 +1000
Actually remove the 4 specific time period mute strings
commit 006a4e8bad
Author: alansley <aclansley@gmail.com>
Date: Tue Jul 30 16:43:54 2024 +1000
Cleaned up MuteDialog.kt
commit d3177f9f1a
Author: alansley <aclansley@gmail.com>
Date: Tue Jul 30 16:27:06 2024 +1000
Added a 1 second kludge to the mute for subtitle so that it initially shows 1 hour not 59 minutes etc.
commit d568a86649
Author: alansley <aclansley@gmail.com>
Date: Tue Jul 30 16:20:20 2024 +1000
Removed 'Muted for' strings and fixed it up to use 'Mute for {large_time_unit}' across the board
commit 84f6f19cf4
Author: alansley <aclansley@gmail.com>
Date: Tue Jul 30 11:03:46 2024 +1000
Changed some hard-coded 'Session' text in strings and renamed another
commit bc90d18c91
Author: alansley <aclansley@gmail.com>
Date: Tue Jul 30 10:27:55 2024 +1000
Cleaned up a leftover plural & changed 'app_name' to use 'sessionMessenger' string
commit 79cd87878c
Merge: 3b62e474b3
dec02cef5a
Author: alansley <aclansley@gmail.com>
Date: Tue Jul 30 08:16:02 2024 +1000
Merge branch 'dev' into strings-squashed
commit 3b62e474b3
Author: Al Lansley <al@oxen.io>
Date: Mon Jul 29 16:33:21 2024 +1000
Down to just the final few straggler strings
commit 13e81f046b
Author: Al Lansley <al@oxen.io>
Date: Mon Jul 29 13:13:54 2024 +1000
WIP
commit 2d9961d5c0
Author: Al Lansley <al@oxen.io>
Date: Mon Jul 29 08:58:01 2024 +1000
Further cleanup of stragglers
commit 08b8a84309
Author: Al Lansley <al@oxen.io>
Date: Mon Jul 29 08:29:12 2024 +1000
Cleaning up straggler strings
commit d0e87c64b5
Author: alansley <aclansley@gmail.com>
Date: Fri Jul 26 17:07:46 2024 +1000
WIP
commit 4bc9d09be2
Author: alansley <aclansley@gmail.com>
Date: Fri Jul 26 16:30:28 2024 +1000
WIP
commit 3cee4bc12f
Merge: aa1db13e3a
a495ec232a
Author: alansley <aclansley@gmail.com>
Date: Fri Jul 26 13:57:09 2024 +1000
Removed some legacy strings & substituted others
commit aa1db13e3a
Author: fanchao <git@fanchao.dev>
Date: Fri Jul 26 11:34:05 2024 +1000
Initial squash merge for strings
2024-09-06 08:30:03 +10:00
ThomasSession
d1c4283f42
Fix/emoji reactions crash ( #1646 )
...
* Fixing crash on sdk =28 for emoji reactions
* Proper styling of reactions
Making sure we display the public key when there is no name
* Making sure we display the emoji that was long pressed
2024-08-28 09:17:15 +10:00
ThomasSession
1393335121
Feature/debug menu ( #1645 )
...
* Reorganised cells
* Clipping content
* Simplifying Cell and leaving responsibility to modifier and content
* Fixing animations
Also fixing compose copy that wasn't set up properly...
* Debug menu
Added a debug menu
It can be accessed from the settings page or via an app shortcut (from the app icon)
* Finalising the debug menu
We can now switch environments between mainnet and testnet
* Update app/src/main/java/org/thoughtcrime/securesms/debugmenu/DebugMenu.kt
Co-authored-by: AL-Session <160798022+AL-Session@users.noreply.github.com>
---------
Co-authored-by: AL-Session <160798022+AL-Session@users.noreply.github.com>
2024-08-26 13:09:37 +10:00
ThomasSession
bfbe4a8fd2
Merge pull request #1644 from oxen-io/release/1.19.2
...
Release/1.19.2
2024-08-26 09:57:49 +10:00
ThomasSession
a50e304938
Removing resources
2024-08-26 08:07:47 +10:00
AL-Session
afbb71351a
Applied save-crash workaround ( #1640 )
2024-08-23 14:37:07 +10:00
ThomasSession
8deb21c0c6
Feature/icons fix ( #1638 )
...
* Removing hardcoded blue styling for media picker indicator
* Proper styling of media picker buttons
* Normalising arrow icons
* Tweaks
2024-08-22 21:36:31 +10:00
ThomasSession
fa395456a5
Sync name change ( #1637 )
2024-08-22 15:59:03 +10:00
ThomasSession
55c49eccf8
Merge branch 'dev' into release/1.19.2
2024-08-22 14:45:33 +10:00
Fanchao Liu
8e10e1abf4
Incorrect copy for denied permission ( #1636 )
...
Co-authored-by: fanchao <git@fanchao.dev>
2024-08-22 11:02:23 +10:00
ThomasSession
20e1fbceb5
Merge branch 'dev' into release/1.19.2
2024-08-21 16:33:19 +10:00
ThomasSession
b14f8f6e8e
Using the proper icon ( #1635 )
2024-08-21 16:32:50 +10:00
ThomasSession
e731c7d0bd
Fix/ip2 country out of memory ( #1628 )
...
* Avoiding to recall Ipv4Int on every loop
* Avoiding memory allocation since this is used in laarge sets
* Further improvements and updated the memory allocation avoiding code
* PR feedback
2024-08-21 16:09:00 +10:00
Fanchao Liu
245241e614
Fix search ANR ( #1634 )
...
Co-authored-by: fanchao <git@fanchao.dev>
2024-08-21 16:08:36 +10:00
ThomasSession
0fa8a6e3d3
Merge branch 'dev' into release/1.19.2
2024-08-21 16:05:17 +10:00
Fanchao Liu
d5ff61f021
[SES-2574] Fix crash on gallery screen ( #1632 )
2024-08-21 15:40:42 +10:00
Fanchao Liu
eea54d1a17
Add back action mode title ( #1633 )
...
Co-authored-by: fanchao <git@fanchao.dev>
2024-08-21 12:13:32 +10:00
AL-Session
ab2e3744a9
Replaced MLKit with ZXing for QR code scanning ( #1630 )
...
* Replaced MLKit with ZXing for QR code scanning
* Adjusted some comment spacing
* Adjusted some comment phrasing
* Renamed MaybeScanQrCode to QRScannerScreen & removed double-import of ZXing core + removed ZXing android-integration
---------
Co-authored-by: alansley <aclansley@gmail.com>
2024-08-21 12:10:55 +10:00
ThomasSession
70f217c030
Using open documents so that the downloads can be accessed ( #1631 )
2024-08-21 10:58:51 +10:00
Fanchao Liu
8fc6679178
Revert "[SES-2512] Rewrite ProfilePictureView ( #1622 )" ( #1629 )
...
This reverts commit 9919f716a7
.
Co-authored-by: fanchao <git@fanchao.dev>
2024-08-21 09:30:02 +10:00
ThomasSession
43c6e86da0
Bumped version code
2024-08-20 11:56:15 +10:00
Fanchao Liu
9919f716a7
[SES-2512] Rewrite ProfilePictureView ( #1622 )
2024-08-19 17:32:30 +10:00
ThomasSession
6701cb1dc1
SES-2437 - fix broken path animation ( #1627 )
2024-08-19 15:44:18 +10:00
Fanchao Liu
2a438ac24d
Add missing play button on media gallery page ( #1626 )
2024-08-19 15:38:55 +10:00
ThomasSession
80933938e1
Removing unsed UI tests ( #1625 )
...
We need to rethink the UI tests if we do indeed want to use them as they are not tied to the existing flow anymore
2024-08-19 13:56:35 +10:00
Fanchao Liu
16d6efbb5b
SES-2524 - Rewrite media gallery in Compose ( #1619 )
2024-08-19 13:46:38 +10:00
ThomasSession
f379604c54
Feature/convo capitalised ( #1624 )
...
* [SES-2551] capitalising sentences in convos
* [SES-2555] Add bg to image loading
* Using Robolectric to fix the tests
2024-08-19 09:35:11 +10:00
ThomasSession
bc6718e996
Feature/resource cleanup ( #1623 )
...
* Removing unrequired APi checks
* Bumping min sdk to 26 and further cleaning version checks
* More clean ups
* Removed unused class
* Clean up
* Clean up
* Clean up
* Clean up
* Clean up
* Clean up
* Clean up
* Clean up
2024-08-19 09:25:53 +10:00
ThomasSession
93a28906fb
Removing unrequired APi checks ( #1620 )
...
* Removing unrequired APi checks
* Bumping min sdk to 26 and further cleaning version checks
* More clean ups
* Removed unused class
2024-08-15 15:32:41 +10:00
fanchao
50929b8970
Merge remote-tracking branch 'origin/dev' into release/1.19.1
...
# Conflicts:
# app/build.gradle
# app/src/main/java/org/thoughtcrime/securesms/calls/WebRtcCallActivity.kt
# app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
# gradle.properties
2024-08-14 10:47:16 +10:00
fanchao
09e46134e6
Fix crashes destroying conversation activity
2024-08-13 14:29:22 +10:00
fanchao
4c52e66c0c
Updated flexbox and removed unused libraries, turn off configuration cache
2024-08-13 14:03:50 +10:00
fanchao
bc3f33701e
Remove unused resources
2024-08-13 14:03:22 +10:00
ThomasSession
d82c5b6a1b
Migrate exoplayer to media3
2024-08-13 13:57:40 +10:00
fanchao
2bf8bc17b5
Added stickyheader AAR
2024-08-13 13:50:21 +10:00
ThomasSession
53c1fd5e9c
Removing Glide
2024-08-13 13:50:21 +10:00
ThomasSession
c3d928ed8c
Using PLAN_B for now to make it work with the old code
2024-08-13 13:49:57 +10:00
ThomasSession
84896f8d23
Updated to latest web-rtc library
...
It seems setWebRtcBasedAcousticEchoCanceler and setBlacklistDeviceForOpenSLESUsage are no longer available.
What this means is unclear and the new library might be handling certain things internally
2024-08-13 13:49:57 +10:00
ThomasSession
26b186452a
Replace image cropping library
2024-08-13 13:49:57 +10:00
ThomasSession
62873ee773
Removed com.amulyakhare.textdrawable
...
Cleaned up references to TextDrawable.
Also cleaned up the way we load layered drawables, used in ProfilePictureView for the load state as the icons were stretched across and didn't look nice.
2024-08-13 13:49:57 +10:00
ThomasSession
518fe5e712
Bump version name
2024-08-13 13:49:10 +10:00
ThomasSession
f865f9f8ed
Merge branch 'dev' into merge/1.19.0
2024-08-08 10:55:55 +10:00
ThomasSession
4e50701c90
version code bump
2024-08-08 09:30:58 +10:00
ThomasSession
4e741e68f3
Adding back the fullscreen intent permission
2024-08-08 09:20:38 +10:00
ThomasSession
80216e995e
Removing the snodes version patch
2024-08-08 09:19:49 +10:00
ThomasSession
b089677860
Merge branch 'master' into release/1.19.0
2024-08-08 09:17:59 +10:00
ThomasSession
a742620b6f
Not needed anymre
2024-08-07 16:01:25 +10:00
ThomasSession
fe1fe2e109
Merge branch 'fix/removing-ad-id' of https://github.com/oxen-io/session-android into fix/removing-ad-id
2024-08-07 15:57:56 +10:00
ThomasSession
bbac0939f5
Unchecked code
2024-08-07 15:57:44 +10:00
alansley
76a74f7e9f
Upgraded firebase from v18.0.0 to v24.0.0
2024-08-07 15:31:19 +10:00
ThomasSession
2b8d2d49e8
Making sure we do not have AD_ID in the app
2024-08-07 12:50:14 +10:00
ThomasSession
71f9548343
comments
2024-08-06 14:59:41 +10:00
ThomasSession
514c19e33f
Relying on the home config sync
2024-08-06 14:58:54 +10:00
ThomasSession
96dded096f
Making sure the username is saved when creating an account
2024-08-06 12:24:42 +10:00
Andrew
d6c5ab2b18
Merge pull request #1593 from bemusementpark/more-snodes
...
Optimise SnodeAPI and Add Snode.Version and tests
2024-08-05 20:15:23 +09:30
ThomasSession
982e23be30
Merge branch 'dev' into release/1.19.0
2024-08-05 15:08:06 +10:00
bemusementpark
41f5fcc67e
Merge branch 'dev' into more-snodes
2024-08-05 13:52:23 +09:30
Andrew
415264eb0d
Merge pull request #1594 from bemusementpark/shared-random
...
Share SecureRandom
2024-08-05 13:09:29 +09:30
bemusementpark
f5d1debc32
Add shared SecureRandom instance
2024-08-04 00:18:47 +09:30
bemusementpark
5417660996
Improve Version to cap parts at 16-bits rather than masking them
2024-08-03 21:52:01 +09:30
bemusementpark
6e1ed8cc11
Add SnodeTest
2024-08-03 21:41:45 +09:30
ThomasSession
48554fada7
[SES-2494] Applying proper styling for message request
2024-08-03 09:42:02 +10:00
ThomasSession
9ce3ab4b80
Added a background to emoji variations popup
2024-08-02 16:31:24 +10:00
ThomasSession
41ab9b98f8
Updated logic for hiding the input in conversation
2024-08-02 16:00:24 +10:00
bemusementpark
b93ec3be04
Optimise Snode and Snode.Version
2024-08-02 12:22:25 +09:30
ThomasSession
a56e1d0b91
Merge pull request #1591 from oxen-io/feature/service-clean-up
...
Feature/service clean up
2024-08-02 08:57:09 +10:00
ThomasSession
e71f650dc0
Update app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.kt
...
Co-authored-by: Andrew <andrewgallasch@gmail.com>
2024-08-02 08:44:39 +10:00
ThomasSession
7dcfba4932
Update app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java
...
Co-authored-by: Andrew <andrewgallasch@gmail.com>
2024-08-02 08:44:30 +10:00
ThomasSession
fb7c24a26d
Update app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java
...
Co-authored-by: Andrew <andrewgallasch@gmail.com>
2024-08-02 08:43:48 +10:00
Fanchao Liu
268b6cc097
Fix crashes on conversation screen ( #1590 )
...
* Fixed onion request crashes
* Use kotlin.Result instead
---------
Co-authored-by: fanchao <git@fanchao.dev>
2024-08-01 19:36:38 +10:00
ThomasSession
0616e148cf
Merge pull request #1585 from bemusementpark/fix-version-check
...
Fix version check
2024-08-01 17:05:54 +10:00
bemusementpark
d8bcb83de5
Fix app exit after Lock Screen
2024-08-01 16:59:06 +10:00
ThomasSession
2f135a6bf6
Cleaning up foreground service calls
2024-08-01 16:50:20 +10:00
ThomasSession
33f23e5fa1
Another unused or referenced service
2024-08-01 11:27:43 +10:00
ThomasSession
137a26c3bf
KeepAliveService doesn't seem to be used anywhere
2024-08-01 11:25:35 +10:00
bemusementpark
5c4e95c4ec
Update VersionDataFetcher KDoc
2024-08-01 10:34:45 +09:30
ThomasSession
8d15169c93
Version bump to go above last live version
2024-08-01 09:03:13 +10:00
ThomasSession
60c111d30a
Removing the snodes version patch
2024-08-01 09:01:56 +10:00
bemusementpark
72d77a9caf
Add @JvmOverloads
2024-07-31 17:40:47 +09:30
bemusementpark
4992123baf
Cleanup comment
2024-07-31 16:00:23 +09:30
bemusementpark
40db23d341
Fix setLastVersion called onException
2024-07-31 15:52:38 +09:30
bemusementpark
7fa3d9f3ff
Fix version check
2024-07-31 13:53:54 +09:30
ThomasSession
fbbef4898a
Merge pull request #1564 from oxen-io/feature/adding-back-fullscreen-intent-permission
...
Adding back the fullscreen intent permission
2024-07-31 12:01:12 +10:00
ThomasSession
fc4bf6ff27
Merge pull request #1583 from oxen-io/feature/blinded-version
...
Feature/blinded version
2024-07-30 15:42:07 +10:00
ThomasSession
83ea71de24
Update app/src/main/java/org/thoughtcrime/securesms/util/VersionUtil.kt
...
Co-authored-by: Andrew <andrewgallasch@gmail.com>
2024-07-30 14:49:45 +10:00
ThomasSession
4b87e926c4
Added a log so we can see when the version data is returned
2024-07-30 13:58:35 +10:00
ThomasSession
42733c910d
Clean up logic
...
Fixed randomly found timeunit error
2024-07-30 13:30:58 +10:00
ThomasSession
d3990572a0
Linking Version util to the app
2024-07-30 12:46:13 +10:00
ThomasSession
35a9f9fbbe
Version fetching API added
2024-07-30 12:02:56 +10:00
ThomasSession
a796f05136
Merge pull request #1577 from bemusementpark/dark-light
...
Fix followSystemInDark
2024-07-30 10:01:37 +10:00
bemusementpark
ce501fd363
Move invalidateComposeThemeColors()
2024-07-30 00:19:16 +09:30
bemusementpark
447ea85333
Improve naming
2024-07-29 17:35:55 +09:30
Fanchao Liu
d23d8f3b07
Fix double closing on memory file ( #1579 )
...
Co-authored-by: fanchao <git@fanchao.dev>
2024-07-29 17:44:07 +10:00
Fanchao Liu
dec02cef5a
Fix double closing on memory file ( #1579 )
...
Co-authored-by: fanchao <git@fanchao.dev>
2024-07-29 17:42:26 +10:00
bemusementpark
7bb1a3a513
Suppress compose name warning
2024-07-29 16:36:17 +09:30
bemusementpark
25e7c7ec61
Simplify ThemeFromPreferences by removing lambdas
2024-07-29 16:32:26 +09:30
bemusementpark
492d5217d0
Add colors lambda
2024-07-29 14:49:37 +09:30
bemusementpark
1a3ffe1a8c
Merge branch 'release/1.19.0' into fix-send-seed-dialog
2024-07-29 13:03:43 +09:30
bemusementpark
d9649215e6
Fix dialog not shown on seed send attempt
2024-07-29 13:00:59 +09:30
Andrew
648d3729c0
Merge pull request #1578 from bemusementpark/lock
...
[QA-32] Fix app closes on app-unlock
2024-07-29 12:46:51 +09:30
ThomasSession
51a43d1de1
Merge pull request #1576 from oxen-io/fix/trimmed-account-id
...
Trimming the accound ID when validating it
2024-07-29 08:04:50 +10:00
bemusementpark
49ecdfd110
Fix app exit after Lock Screen
2024-07-27 16:12:03 +09:30
bemusementpark
90f6fee579
Change ThemeColorSet naming
2024-07-26 21:49:55 +09:30
bemusementpark
80d08a5fb2
Fix follow light
2024-07-26 21:43:10 +09:30
ThomasSession
2818552519
Merge pull request #1574 from oxen-io/fix/next-button-and-blinded-search
...
Fix/next button and blinded search
2024-07-26 17:26:50 +10:00
ThomasSession
b4f13bbe82
Trimming the accound ID when validating it
2024-07-26 17:21:06 +10:00
ThomasSession
55ec4e1549
Update app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessage.kt
...
Co-authored-by: AL-Session <160798022+AL-Session@users.noreply.github.com>
2024-07-26 16:23:33 +10:00
ThomasSession
456f8d0b3a
Handling keyboard inset for Android sdk < 30
2024-07-26 15:49:41 +10:00
ThomasSession
c883b8dc91
Merge pull request #1571 from bemusementpark/qa-20
...
[QA-20] Show Account Created empty view only for newAccounts
2024-07-26 14:16:09 +10:00
bemusementpark
af302d4d43
Change conversations heading in search
2024-07-26 10:13:51 +09:30
bemusementpark
143d4c462a
Show Account Created empty view only for newAccounts
2024-07-26 09:47:57 +09:30
ThomasSession
e813756fb3
Adding the long press fix in 1.19.0
2024-07-25 16:26:02 +10:00
bemusementpark
ac4f2525ab
Fix longpress message fails
2024-07-25 11:37:06 +09:30
Fanchao Liu
631d93c20c
Replace kapt with ksp and update dependencies ( #1560 )
2024-07-24 16:18:18 +10:00
ThomasSession
fc5c7a7528
Merge pull request #1566 from oxen-io/release/1.18.6
...
Bumping version for 1.18.6
2024-07-24 10:51:11 +10:00
ThomasSession
530853b94f
Bumping version for 1.18.6
2024-07-24 10:38:40 +10:00
ThomasSession
8ad7005c5f
Adding back the fullscreen intent permission
2024-07-23 18:34:18 +10:00
ThomasSession
9c3513f68e
Merge pull request #1563 from oxen-io/release/1.18.5
...
Release/1.18.5
2024-07-23 18:28:40 +10:00
ThomasSession
79ae27d7b6
Snode version patch ( #1561 )
...
* Snode version number
Getting the version number from the API and checking the last node in the onion routing, making sure its version is at least 2.8.0
* Clearing the snode and onion request dbs on launch
* Removing logs
* Tweak to snode filtering
* PR feedback
2024-07-23 17:52:53 +10:00
ThomasSession
66c78847d8
Merge branch 'dev' into release/1.19.0
2024-07-22 14:28:48 +10:00
Andrew
bc968dcdae
Fix incorrect scale on back camera in reverse landscape ( #1559 )
...
Co-authored-by: bemusementpark <bemusementpark>
2024-07-22 14:28:12 +10:00
ThomasSession
9957edd5ac
Bumping version code and removing permission (might add it back if we get reviewed in time)
2024-07-22 10:51:54 +10:00
ThomasSession
cbdd25abd3
Merge branch 'dev' into release/1.19.0
2024-07-22 10:49:32 +10:00
Andrew
bb239a4048
Fix WebRtcCallService ( #1558 )
...
Co-authored-by: bemusementpark <bemusementpark>
2024-07-22 10:47:53 +10:00
ThomasSession
4b7f5d3cb5
1.19.0 - Bumping release version and code
2024-07-19 16:42:51 +10:00
bemusementpark
5a931845cb
Add TelephonyHandler.kt
2024-07-19 14:54:52 +09:30
bemusementpark
8037502f35
Clean CallManager etc
2024-07-19 13:06:52 +09:30
ThomasSession
19c991ebc8
New translation URL ( #1555 )
...
* Using the new translate URL
Cleaned up unused references
* empty space
2024-07-18 16:58:16 +10:00
ThomasSession
9e2b24f7b9
Feature/compose cleanup ( #1543 )
...
* Moving color files
* Moving theme classes into their own package
* Only obtain new theme when required
* UI Tweaks
Using the proper color for danger as opposed to one hardcoded color
Reusing BlackAlpha40
Using the right delete icon in settings
* matching figma
* Matching signature across buttons
* Dialogs do not have a 'x' button by default
* Updated typography
Updated the typography in an composition local so it can be accessed from anyehere in compose and matching the figma declarations.
* Centered text in control messages
* Fixing new color access for action items
* renaming spacing to be more general
* Unifying dimensions and rectifying design inconsistencies
Unifying spacing values and reusing common ones
Identified spacing issues and inconsistencies in design and figma
* Rounded corners for the new conversation sheet
* Rounding sheets corners
* Spacing fixes and UI consolidating
Discussed with QA to make sure the 'new message' screen should indeed behave as the other screens and use disabled state instead of disappearing
* Disappearing messages tweaks
Re-using our new radio buttons in disappearing messages
Tweaking UI to match designs
* Cleaning up spaces
* Migrating to Material3
* Fixing UI issues found
* PR feedbacks
---------
Co-authored-by: bemusementpark <bemusementpark>
2024-07-18 16:32:03 +10:00
AL-Session
d23a0b8ceb
Converted three classes to kotlin ( #1552 )
2024-07-18 13:17:17 +10:00
Andrew
e2a40ddabc
Merge pull request #1451 from bemusementpark/on-2
...
[SES-48 SES-824] Onboarding Overhaul
2024-07-18 11:20:32 +09:30
Morgan Pretty
afcb8c1150
Removed the attribution label
2024-07-18 09:11:37 +10:00
Morgan Pretty
d6ea2221ec
Merge pull request #1545 from mpretty-cyro/update-geolite2
...
Updated GeoLite2 database
2024-07-17 15:29:42 +10:00
ThomasSession
01cd449794
Fix/video call rotation and avatars ( #1548 )
...
* Simplifying profile picture view
We don't need the isLarge option as the component's size is always set.
Using profilePictureView in the call screen.
* Swapping avatars between user and contact's
* Adding the user's avatar for when it needs to be displayed
* Making sure we never invert the contact's landscape rotation
* Update app/src/main/java/org/thoughtcrime/securesms/calls/WebRtcCallActivity.kt
Co-authored-by: Andrew <andrewgallasch@gmail.com>
* Update app/src/main/java/org/thoughtcrime/securesms/calls/WebRtcCallActivity.kt
Co-authored-by: Andrew <andrewgallasch@gmail.com>
* Update app/src/main/java/org/thoughtcrime/securesms/calls/WebRtcCallActivity.kt
Co-authored-by: Andrew <andrewgallasch@gmail.com>
---------
Co-authored-by: Andrew <andrewgallasch@gmail.com>
2024-07-17 15:16:12 +10:00
Morgan Pretty
bcf9d154f8
Resolving PR comment
2024-07-17 14:49:23 +10:00
bemusementpark
872cb8a204
Move Session id input box contentDescription
2024-07-17 12:38:48 +09:30
bemusementpark
8245e4ffe5
Rename remaining session id refs
2024-07-17 12:32:15 +09:30
Morgan Pretty
e8fdc57bf3
Merge branch 'dev' into update-geolite2
2024-07-17 10:42:11 +10:00
Morgan Pretty
e815a43cdf
Added an attribution label to the PathActivity
2024-07-17 10:41:39 +10:00
bemusementpark
ce1790a895
Merge branch 'od' into on-2
2024-07-16 18:09:27 +09:30
AL-Session
8a7f321ee0
SES2397 - Fix display name change fail feedback ( #1544 )
...
* Added check to not update display name if offline or should config sync fail
* Addressed PR feedback
* WIP
* Addressed PR feedback
* Adjusted phrasing of log statement
---------
Co-authored-by: alansley <aclansley@gmail.com>
2024-07-16 15:41:46 +10:00
AL-Session
1ca62629f6
SS-40 - MMS Notification Strings ( #1541 )
...
* Feature implemented
* Removed stray quotation mark
* Cleanup WIP
* Cleanup
* Addressed PR feedback
* Addressed further PR feedback
---------
Co-authored-by: alansley <aclansley@gmail.com>
2024-07-16 11:28:50 +10:00
bemusementpark
6507b0a973
Fix snippet
2024-07-16 02:25:53 +09:30