Slavik Nychkalo
88f8f68e29
fix width of submenu items on Vertical orientation ( #2306 )
...
* fix width of submenu items on vertical view
* Gui: slightly better canvas width handling in submenu
* Gui: remove unused include
Co-authored-by: あく <alleteam@gmail.com>
2023-07-01 00:50:46 +09:00
MX
259979a76a
fix issue with None app used in favourites
...
User desktop settings will be reset to defaults
2023-06-29 05:51:14 +03:00
MX
380734f804
Allow api mismatch bypass again :C
...
for those who explicitly doesn't update their manually installed apps and want to ignore warnings and issues caused by using outdated apps
2023-06-29 05:38:44 +03:00
MX
b0988e4d86
Merge branch 'ofw-dev' into dev
2023-06-29 04:22:51 +03:00
Astra
bf975ad786
Fix roll-over in file browser and archive ( #2811 )
2023-06-28 20:46:42 +09:00
Petr Portnov | PROgrm_JARvis
75354ec5ba
fix: make dialog_file_browser_set_basic_options initialize all fields ( #2756 )
...
* fix: make `dialog_file_browser_set_basic_options` initialize all fields
* fix(GH-2756): use alternative test for `test_dialog_file_browser_set_basic_options_should_init_all_fields`
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2023-06-27 18:46:04 +09:00
Astra
168fa72d53
[FL-3373] Scroll acceleration ( #2784 )
...
* Support for scroll acceleration
* Revert keyboard acceleration
* Add scroll acceleration to the text box
* Remove redundant code from the file manager input handler
* Archive: slightly better scrolling
* Gui,Archive: final version of accelerated scrolling
Co-authored-by: あく <alleteam@gmail.com>
2023-06-27 18:22:35 +09:00
MX
a466885df3
Merge branch 'ofw-dev' into dev
2023-06-25 03:08:40 +03:00
Sergey Gavrilov
761a14e6e2
[FL-2837][FL-3270] Loader refaptoring: second encounter ( #2779 )
...
* Core: rename internal FlipperApplication to FlipperInternalApplication
* FAP Loader: move load_name_and_icon to flipper_application library
* Loader menu: rework api
* View holder: move to gui service
* Loader: simple "loading" worker
* Loader: applications dialog
* Loader: fapping
* Update f18 api
* Apps: remove fap_loader
* Libs, flipper application: store args, rename thread allocation
* Loader: error handling
* Apps: use loader error handling
* Loader: documentation
* FBT: accomodate loader
* Loader: do not raise gui error if loader is locked
* Archive: accomodate loader
* Loader: fix loading message
* Flipper: drop some old dolphin legacy
* Loader: generalize error construction
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2023-06-23 21:01:40 +09:00
MX
8bb3092002
Revert BLE gatt characteristics refactoring temporarily
2023-06-14 03:19:18 +03:00
MX
f7195adbda
OFW PR 2756
2023-06-10 06:01:23 +03:00
MX
1a6b2010ba
Merge pull request #509 from gid9798/byte_input_mini_editor
...
Byte input add feature: editor without keyboard
2023-06-09 18:52:44 +03:00
MX
e9fc5f62a5
Merge branch 'ofw-dev' into dev
2023-06-09 14:13:11 +03:00
Sergey Gavrilov
0e4344a83c
Services: simplify api ( #2540 )
...
Co-authored-by: あく <alleteam@gmail.com>
2023-06-09 20:02:47 +09:00
MX
18220515b5
Merge branch 'ofw-dev' into dev
2023-06-08 14:58:46 +03:00
gid9798
ce25d6339e
Byte input add feature: editor without keyboard
2023-06-08 13:53:29 +03:00
hedger
e3e64e5e83
[FL-3267] ble: refactored bt gatt characteristics setup ( #2587 )
...
* ble: refactored bt gatt characteristics setup
* ble: naming fixes, small optimizations
* ble: expanded bitfields; fixed pvs warnings
* ble: fixed pvs warnings for real
* ble: using FlipperGattCharacteristicDataPropsFixed for char[] props
* ble: removed flipper_gatt_characteristic_props_const_char
* ble: gatt: naming changes
* ble: gatt: fixed device_info service constant attrs sizes
* ble: gatt: copy descriptors to char instances; reworked hid chars to be callback-based; moved max size getter to callback with NULL data; added comments
* ble: gatt: removed hid_svc_report_data_callback
* ble: hid svc: better double loop idx naming
* ble: hid svc: simplified hid_svc_update_info
* ble: gatt: removed magic values; fixed type for HidSvcGattCharacteristicInfo
* ble: gatt: moved long uuids to separate files
Co-authored-by: gornekich <n.gorbadey@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
2023-06-08 18:42:02 +09:00
MX
0d394a6f87
Merge branch 'ofw-dev' into dev
2023-06-07 00:29:06 +03:00
あく
76c70bdf2c
[FL-3316] Settings: add contrast adjustment ( #2737 )
...
Co-authored-by: hedger <hedger@users.noreply.github.com>
2023-06-06 21:46:01 +04:00
MX
e990e58177
change butthurt timer
2023-06-02 22:55:05 +03:00
MX
ca49da3c83
Fix APP_IDs to match new regex
...
regex check will be added in OFW soon
2023-06-02 13:42:44 +03:00
gid9798
b17125c65c
Desktop Clock: some improvements
2023-05-29 17:54:01 +03:00
MX
04f9811c6e
Fix crash when renaming files with long file name
2023-05-29 14:17:50 +03:00
MX
a11b6e72dc
Update changelog and readme
...
+ some small fixes
2023-05-28 03:53:54 +03:00
MX
12f9b6a89e
Apply desktop favourite apps refactoring
2023-05-26 13:13:46 +03:00
MX
36102b8ee0
Merge branch 'ofw-dev' into dev
2023-05-26 12:03:49 +03:00
Yukai Li
77bb997b0b
desktop: Refactor favorites settings and allow app browser in selection ( #2687 )
...
* desktop: Refactor favorites settings and allow app browser in selection
* desktop: Gate app browser entry add, just in case
* Desktop: simplify favorite application selection
* Desktop: refactor favorite application opening routine and cleanup code
* Desktop: handle exit from external application selection
Co-authored-by: hedger <hedger@users.noreply.github.com>
Co-authored-by: あく <alleteam@gmail.com>
2023-05-26 01:16:41 +09:00
あく
080324f7e0
[FL-3315] Desktop,Rpc: desktop status subscription ( #2696 )
...
* Desktop,Rpc: desktop status subscription
* Desktop,RPC: properly handle unsubscribe
Co-authored-by: Sergey Gavrilov <who.just.the.doctor@gmail.com>
2023-05-25 23:22:31 +09:00
MX
d094bfaa12
Merge branch 'ofw-dev' into dev
2023-05-25 16:48:28 +03:00
Sergey Gavrilov
88f0b63577
Storage, common_rename: check that old path is exists ( #2698 )
...
* Storage, common_rename: check that old path is exists
* Storage, common_rename: return correct status
2023-05-25 22:44:32 +09:00
MX
035bb57c56
bump version!!!
2023-05-24 07:50:45 +03:00
MX
977c9e706e
Fix typos
2023-05-24 07:50:13 +03:00
MX
d597211161
Merge branch 'dev' into clock_on_desktop
2023-05-24 07:49:27 +03:00
MX
1e5a8f4391
Merge branch 'ofw-dev' into dev
2023-05-24 07:16:05 +03:00
gid9798
1d5a4240b9
Clock: some improvements
2023-05-23 22:47:15 +03:00
あく
3217f286f0
Services: remove deallocator for persistent services ( #2692 )
...
Co-authored-by: hedger <hedger@users.noreply.github.com>
2023-05-23 19:17:12 +04:00
Sergey Gavrilov
711f0fef40
[FL-3327] Storage: common_rename is now POSIX compliant ( #2693 )
...
* Storage: common_rename is now POSIX compliant
* storage: check for success on storage_common_remove in file rename
---------
Co-authored-by: hedger <hedger@nanode.su>
2023-05-23 18:59:32 +04:00
gid9798
c82ed71b6f
cleanup
2023-05-23 16:41:57 +03:00
gid9798
e40620fd10
clock
2023-05-22 22:45:16 +03:00
gid9798
544b6fea8a
clock port
2023-05-22 11:42:27 +03:00
MX
aab4d2bd34
API CleanUp part 3
2023-05-22 03:45:17 +03:00
MX
e7965c6d95
De-libify name changer
2023-05-19 06:33:15 +03:00
MX
a7ee5fea93
Name changer as service + extra checks
2023-05-19 04:33:14 +03:00
MX
d539b948a0
Revert hitag for now, need to cleanup more space
2023-05-17 23:06:41 +03:00
MX
c9ddecff87
OFW PR 2658: Hitag
...
by blackvault88
2023-05-17 21:18:05 +03:00
MX
89ca69b111
Fix keyboard buffer issues
...
by @Willy-JL
2023-05-15 05:56:44 +03:00
MX
89c69ed622
Dont use temp str for manipulating text input
...
by @Willy-JL
2023-05-15 01:29:24 +03:00
MX
62fa698e2d
Merge branch 'ofw-dev' into dev
2023-05-14 20:38:24 +03:00
あく
341cd5e860
[FL-3312] fix PIN retry count reset on reboot ( #2671 )
2023-05-14 16:04:03 +04:00
MX
c2713eff87
New way of changing device name
...
Settings scene, char Validator, Idea -> by Willy-JL
Implemented by me
Kod plohoi, ochen plohoi, kto mozhet - sdelaite kak nado, esli smozhete :)
Ya luche varianta ne pridumal poka 4to
2023-05-14 05:38:00 +03:00
MX
f08dd2fd03
Text Input improvements, added cursor and ability to set minimal length
...
thanks to WillyJL
2023-05-14 01:44:00 +03:00
MX
849f14e480
Bad BT plugin, Submenu locked elements, API updates, etc.
...
Thanks to WillyJL, ClaraCrazy, and XFW contributors
2023-05-13 00:14:22 +03:00
MX
a7691b2d3b
Fix merge issues
2023-05-11 17:57:17 +03:00
MX
b2e55d7d84
Merge branch 'ofw-dev' into dev
...
:(
2023-05-11 17:47:14 +03:00
あく
aa8a369e2a
Rpc: add desktop service. Desktop: refactor locking routine. ( #2665 )
...
* Rpc: add desktop service
* Protobuf: sync to latest release. Desktop: rewrite PIN locking, finalize locking API
* Desktop: cleanup code a little bit
2023-05-11 19:50:17 +10:00
MX
417343e3dd
Merge branch 'fz-dev' into dev
2023-05-09 01:14:42 +03:00
hedger
538f96f0ac
[FL-3300] API version in UI ( #2649 )
...
* desktop, about: replaced commit# with API version
* scripts: storage: added approx speed for file uploads
* scripts: selfupdate: use folder name by default
* vscode: fixed broken get_blackmagic shell integration on *nix
Co-authored-by: あく <alleteam@gmail.com>
2023-05-08 20:11:23 +09:00
MX
6b186622cb
Merge branch 'fz-dev' into dev
2023-05-05 16:10:00 +03:00
あく
914129a0d9
[FL-3289] Various Furi/FuriHal bug fixes and improvements ( #2637 )
...
* Furi: properly handle thread free before TCB scrapping, add furi_free - more invasive version of free to memmgr. FuriHal: add DWT comparator api to cortex. Updater, RPC: refactor various thread shanenigans. Code cleanup.
* Rollback free macros and related changes
2023-05-05 21:40:55 +09:00
Sergey Gavrilov
ac05387803
[FL-3270] Loader refactoring, part 1 ( #2593 )
...
* Loader: menu part
* Settings: remove unused loader api
* Desktop: get loader from record_open
* CLI: remove unneeded loader api
* gitignore: ignore .old files
* Loader: now really a service
* Loader: working service prototype
* Loader: cli, system start hooks
* CI/CD: make happy
* Loader: autorun
* Loader: lock and unlock
* Loader: rearrange code
* Gui, module menu: fix memleak
* Updater test: add timeout
* added update timeouts and max run duration
* Github: revert updater test workflow changes
* Loader: less missleading message in info cli command
Co-authored-by: doomwastaken <k.volkov@flipperdevices.com>
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2023-05-04 17:46:00 +03:00
Sergey Gavrilov
a7d1ec03e8
[FL-3270] Loader refactoring, part 1 ( #2593 )
...
* Loader: menu part
* Settings: remove unused loader api
* Desktop: get loader from record_open
* CLI: remove unneeded loader api
* gitignore: ignore .old files
* Loader: now really a service
* Loader: working service prototype
* Loader: cli, system start hooks
* CI/CD: make happy
* Loader: autorun
* Loader: lock and unlock
* Loader: rearrange code
* Gui, module menu: fix memleak
* Updater test: add timeout
* added update timeouts and max run duration
* Github: revert updater test workflow changes
* Loader: less missleading message in info cli command
Co-authored-by: doomwastaken <k.volkov@flipperdevices.com>
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2023-05-04 12:48:13 +09:00
MX
6874b3b429
We don't use region provision so remove 00 from about screens
2023-05-03 21:53:44 +03:00
MX
cae4790ef2
Merge branch 'fz-dev' into dev
2023-05-03 17:15:59 +03:00
hedger
c5b460b416
[FL-3260] Added API version to device info ( #2611 )
...
* hal: device_info: added API version to "firmware.api.major" & "firmware.api.minor"
* FuriHal: bump device info version
Co-authored-by: あく <alleteam@gmail.com>
2023-05-03 12:58:59 +09:00
Lewis Westbury
5c09bc5b2d
Gui: relax some asserts in view ( #2623 )
...
* Remove assertion preventing replacement of view input callback
* Gui: relax some asserts in view
Co-authored-by: あく <alleteam@gmail.com>
2023-05-03 12:33:30 +09:00
MX
e24cb944ff
Temp fix desktop lock bug and update changelog
2023-05-02 02:38:42 +03:00
MX
6271409e5a
Allow locking without pin using Up menu on desktop
2023-04-25 02:09:29 +03:00
MX
7514bc8b49
Final updates
2023-04-21 15:55:06 +03:00
SG
8cfb37c12f
Gui, module menu: fix memleak
2023-04-20 16:05:35 +03:00
MX
2de476b11d
Merge branch 'fz-dev' into dev
2023-04-19 17:03:56 +03:00
Astra
74fe003f8b
[FL-3171] Introduce stealth mode and auto-selective lock ( #2576 )
...
* Introduce stealth mode and auto-selective lock
* Stealth mode status bar icon
* Review fixes
* Fix icon disappearing after reboot
* Support overriding stealth mode
* FuriHal: correct reserved space size in RTC SystemReg
Co-authored-by: あく <alleteam@gmail.com>
2023-04-19 18:33:23 +09:00
Astra
2c7eb53cac
[FL-2505] Active RPC session icon ( #2583 )
...
* Active RPC session icon
* Add RpcOwner, don't show the RPC icon when the session was started from BLE
* Fix rpc_test and f18 api
* Bump API version
Co-authored-by: あく <alleteam@gmail.com>
2023-04-19 17:30:26 +09:00
MX
aac7654ca3
Merge branch 'fz-dev' into dev
2023-04-06 07:14:48 +03:00
Astra
b4ceb55fd2
[FL-2524] Graphics cleanup and icon rotation ( #2561 )
...
* Canvas with rotation
* Full icon rotation, cleanup of unused resources
* F18 API update
* Bitmap draw cleanup
* More cleaning up
* Migrate recovery and DFU to canvas
* Make the internal draw function static
* Remove all calls to u8g2_DrawXBM
Co-authored-by: あく <alleteam@gmail.com>
2023-04-06 11:36:12 +08:00
hedger
a91d319839
[FL-3162] Moved ufbt to fbt codebase ( #2520 )
...
* scripts: moved ufbt code
* ufbt: fixed tool path
* ufbt: fixed linter/formatter target descriptions
* scripts: ufbt: cleanup
* fbt: moved fap launch target to tools; ufbt fixes
* fbt: fixed missing headers from SDK
* ufbt: removed debug output
* ufbt: moved project template to main codebase
* ufbt: fixed vscode_dist
* ufbt: path naming changes
* fbt: error message for older ufbt versions
* ufbt: docs fixes
* ufbt: fixed build dir location
* fbt: fixes for extapps objcopy
* fbt: extapps: removed extra debug output; fixed formatting
* ufbt: handle launch target for multiple known apps
* ufbt: dropping wrapper; linter fixes
* ufbt: fixed boostrap path
* ufbt: renamed entrypoint
* ufbt: updated vscode config
* ufbt: moved sconsign db location
* ufbt: fixed sconsign path
* fbt: SDK builders rework
* fbt: reworked sdk packaging
* ufbt: additional checks and state processing
* ufbt: fixed sdk state file location
* dist: not packaging pycache
* dump commit json content
* Github: more workflow debug prints
* Github: fix incorrect commit meta extraction in get_env.py
* ufbt, fbt: changed SConsEnvironmentError->StopError
* fbtenv: no longer needs SCRIPT_PATH pre-set
* ufbt: fixed sdk state check
* scripts: exception fixes for storage.py
* scripts: fbtenv: added FBT_TOOLCHAIN_PATH for on Windows for compat
* ufbt: app template: creating .gitkeep for images folder
* ufbt: app template: fixed .gitkeep creation
* docs: formatting fixes for AppManifests; added link to ufbt
* fbt: added link to PyPI for old ufbt versions
* sdk: fixed dir component paths
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2023-04-06 10:44:37 +08:00
MX
d4a20bc37a
Merge branch 'fz-dev' into dev
2023-04-01 17:41:05 +03:00
Sergey Gavrilov
ae3a3d6336
RPC: increase max message size ( #2543 )
...
* RPC: increase max message size
* RPC: do not use magic numbers
2023-03-31 16:15:15 +09:00
MX
ae3481ef6c
Merge branch 'fz-dev' into dev
2023-03-28 22:44:35 +03:00
Sergey Gavrilov
8b2dfea925
Improved thread lifecycle ( #2534 )
...
* Core, Thread: mark thread to join from prvDeleteTCB
* USB HAL: move vars to MEM2
* Core, Thread: cleanup sources
* Cli: add magic delays on rx pipe error, prevent cli from consuming processor time
* Furi: update thread documentation
Co-authored-by: あく <alleteam@gmail.com>
2023-03-28 16:34:49 +09:00
Sergey Gavrilov
3617ad33e4
View Model: recursive mutex ( #2532 )
...
Co-authored-by: あく <alleteam@gmail.com>
2023-03-28 15:31:21 +09:00
MX
9165b819f4
fix merge issues
2023-03-22 22:04:04 +03:00
MX
795c8eeef7
Merge branch 'fz-dev' into dev
2023-03-22 21:13:39 +03:00
あく
7bf0a4786c
[FL-3152] Screen streaming improvements ( #2498 )
...
* Rpc: reserve some bandwidth when screen streaming
* Move furi_hal_compress to toolbox/comporess
* Lib: heatshrink as external submodule, compile warnings fixes, better buffer management
* Lib: cleanup compressor definitions
* Rpc: add canvas orientation support
* Format Sources
2023-03-23 03:00:48 +10:00
Nikolay Minaylov
0444a80f19
[FL-3134] BadUSB: Script interpreter refactoring ( #2485 )
...
* Script command and character tables
* Non-blocking stringdelay, docs update
* altchar/altstring fix
* Layout select UI fix
* Remove debug print
Co-authored-by: あく <alleteam@gmail.com>
2023-03-21 02:22:03 +09:00
MX
5660111b28
Merge branch 'fz-dev' into dev
2023-03-20 20:04:22 +03:00
Sergey Gavrilov
f7024cff78
SD Driver: reinit sd card on error ( #2493 )
...
* SD Driver: reinit sd card on error
* SD Driver: cleanup fatfs bindings
* Storage: optimized glue
* Storage: move fatfs initialization to appropriate subsystems, minor code cleanup
* SD Driver: minor code cleanup
Co-authored-by: あく <alleteam@gmail.com>
2023-03-20 22:09:10 +09:00
MX
58d4f3b531
OFW PR: 2493 - SD Driver: reinit sd card on error
...
No issues was found during my own testing and running sd benchmarks, sorry for rushing, I may miss something, usually I prefer to wait for official review
2023-03-18 02:50:05 +03:00
MX
3444c5245e
Tertiary favourite app
2023-03-18 01:16:34 +03:00
MX
54cefb7884
Merge branch 'fz-dev' into dev
2023-03-17 17:54:05 +03:00
Astra
7de7fa293b
Optimize trailing slash check ( #2503 )
...
* Optimize trailing slash check
2023-03-18 00:45:42 +10:00
MX
559b0e9b40
Small UI fixes
2023-03-16 21:24:09 +03:00
MX
49378f0893
Merge branch 'fz-dev' into dev
2023-03-16 13:49:24 +03:00
Astra
9fbf327028
[FL-1799] Require the trailing slash for root paths ( #2486 )
...
* Require the trailing slash
* Fix the swapped storages
* Fix root paths
2023-03-16 17:28:50 +09:00
Liam Hays
c27d4d78f9
Fix auto-capitalization in the keyboard when the text box is empty. ( #2483 )
...
Co-authored-by: hedger <hedger@users.noreply.github.com>
Co-authored-by: あく <alleteam@gmail.com>
2023-03-15 23:51:15 +09:00
MX
dd99c22792
Merge branch 'fz-dev' into dev
2023-03-14 19:55:16 +03:00
hedger
53435579b3
[FL-3097] fbt, faploader: minimal app module implementation ( #2420 )
...
* fbt, faploader: minimal app module implementation
* faploader, libs: moved API hashtable core to flipper_application
* example: compound api
* lib: flipper_application: naming fixes, doxygen comments
* fbt: changed `requires` manifest field behavior for app extensions
* examples: refactored plugin apps; faploader: changed new API naming; fbt: changed PLUGIN app type meaning
* loader: dropped support for debug apps & plugin menus
* moved applications/plugins -> applications/external
* Restored x bit on chiplist_convert.py
* git: fixed free-dap submodule path
* pvs: updated submodule paths
* examples: example_advanced_plugins.c: removed potential memory leak on errors
* examples: example_plugins: refined requires
* fbt: not deploying app modules for debug/sample apps; extra validation for .PLUGIN-type apps
* apps: removed cdefines for external apps
* fbt: moved ext app path definition
* fbt: reworked fap_dist handling; f18: synced api_symbols.csv
* fbt: removed resources_paths for extapps
* scripts: reworked storage
* scripts: reworked runfap.py & selfupdate.py to use new api
* wip: fal runner
* fbt: moved file packaging into separate module
* scripts: storage: fixes
* scripts: storage: minor fixes for new api
* fbt: changed internal artifact storage details for external apps
* scripts: storage: additional fixes and better error reporting; examples: using APP_DATA_PATH()
* fbt, scripts: reworked launch_app to deploy plugins; moved old runfap.py to distfap.py
* fbt: extra check for plugins descriptors
* fbt: additional checks in emitter
* fbt: better info message on SDK rebuild
* scripts: removed requirements.txt
* loader: removed remnants of plugins & debug menus
* post-review fixes
2023-03-14 23:29:28 +09:00
Sergey Gavrilov
c5db1aaaf5
Revert "Revert "Embed assets in elf file ( #2466 )""
...
This reverts commit a04c01a2fd
2023-03-10 13:57:44 +03:00
Sergey Gavrilov
a04c01a2fd
Revert "Embed assets in elf file ( #2466 )"
...
This reverts commit 4fd043398a
2023-03-10 01:43:46 +03:00
MX
68fed0e03d
Merge branch 'fz-dev' into dev
2023-03-09 21:17:57 +03:00
Michal Suchánek
780da7d4d5
Upside down / left handed orientation support ( #2462 )
...
* Add backup files to .gitignore
* Added lefty support in Settings > System > hand Orient: Fixes : #1015
* Left handed mode
* Fix lefthanded mode on vertical interfaces
* Input: new composite sequence identifier
* Gui: move input mapping from Canvas to ViewPort, properly handle input mapping on View switch in ViewDispatcher
* Rpc: proper input sequencing and tagging in RpcGui
* Rpc: remove magic from RpcGui
Co-authored-by: MrDaGree <5050898+MrDaGree@users.noreply.github.com>
Co-authored-by: Willy-JL <willy.leslie@icloud.com>
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
Co-authored-by: Sergey Gavrilov <who.just.the.doctor@gmail.com>
2023-03-10 02:13:18 +09:00
