2662 Commits

Author SHA1 Message Date
alansley
1e9eeff86a AccessibilityId adjustments & removed some unused XML layouts 2024-08-07 11:06:39 +10:00
alansley
e5fd2c8cc0 AccessibilityId refactor WIP 2024-08-07 09:22:14 +10:00
alansley
399796bac3 AccessibilityId WIP - up to AccessibilityId_reveal_recovery_phrase_button 2024-08-06 15:51:53 +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
alansley
a8d72dfcc0 Cleaned up a few comments and fixed some plurals logic 2024-08-06 14:12:10 +10:00
ThomasSession
96dded096f Making sure the username is saved when creating an account 2024-08-06 12:24:42 +10:00
alansley
be400d8f4f Removed commented out merge conflict marker 2024-08-06 11:32:08 +10:00
alansley
5cbe289a8d Merge dev and cleanup 2024-08-06 11:30:50 +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
Al Lansley
5fe123e7b5 Adjusted sending of mms messages to show 'Uploading' rather than 'Sending' as per SES-1721 2024-08-05 14:37:47 +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
Al Lansley
d3f8e928b6 Merge branch 'dev' into strings-squashed 2024-08-05 13:30:03 +10:00
Al Lansley
6c0450b487 Renamed 'quitButton' string to just 'quit' 2024-08-05 12:59:15 +10:00
Al Lansley
284c485903 Replaced 'screenSecurity' with 'screenshotNotifications' as the title of the notifications toggle 2024-08-05 12:00:35 +10:00
Al Lansley
6948d64fa8 WIP 2024-08-05 10:45:05 +10:00
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
alansley
bc94cb78db End of day push 2024-08-02 16:21:16 +10:00
ThomasSession
41ab9b98f8 Updated logic for hiding the input in conversation 2024-08-02 16:00:24 +10:00
alansley
1a2df3798a Merged dev 2024-08-02 15:20:19 +10:00
alansley
c7fdb6aed9 Replaced string 'dialog_disappearing_messages_follow_setting_confirm' with 'confirm' 2024-08-02 14:21:11 +10:00
alansley
2992d590d9 Removed string 'attachment_type_selector__gallery' and associated / un-used 'attachment_type_selector.xml' layout 2024-08-02 14:01:00 +10:00
alansley
4218663c95 Removed 'message_details_header__disappears' and the unused 'activity_message_detail.xml' which was the only reference to it 2024-08-02 13:39:54 +10:00
bemusementpark
b93ec3be04 Optimise Snode and Snode.Version 2024-08-02 12:22:25 +09:30
alansley
ba2d0275e4 Implemented task SS-79 to only provide a save attachment menu option when the attachment download is complete 2024-08-02 12:15:42 +10:00
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
alansley
20662c8222 Merge branch 'dev' into strings-squashed 2024-07-31 13:08:04 +10:00
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
alansley
006a4e8bad Cleaned up MuteDialog.kt 2024-07-30 16:43:54 +10:00
alansley
d3177f9f1a Added a 1 second kludge to the mute for subtitle so that it initially shows 1 hour not 59 minutes etc. 2024-07-30 16:27:06 +10:00
alansley
d568a86649 Removed 'Muted for' strings and fixed it up to use 'Mute for {large_time_unit}' across the board 2024-07-30 16:20:20 +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
alansley
84f6f19cf4 Changed some hard-coded 'Session' text in strings and renamed another 2024-07-30 11:03:46 +10:00
alansley
bc90d18c91 Cleaned up a leftover plural & changed 'app_name' to use 'sessionMessenger' string 2024-07-30 10:27:55 +10:00
ThomasSession
a796f05136
Merge pull request #1577 from bemusementpark/dark-light
Fix followSystemInDark
2024-07-30 10:01:37 +10:00
alansley
79cd87878c Merge branch 'dev' into strings-squashed 2024-07-30 08:16:02 +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
Al Lansley
3b62e474b3 Down to just the final few straggler strings 2024-07-29 16:33:21 +10:00
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
Al Lansley
2d9961d5c0 Further cleanup of stragglers 2024-07-29 08:58:01 +10:00
Al Lansley
08b8a84309 Cleaning up straggler strings 2024-07-29 08:29:12 +10:00
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
alansley
4bc9d09be2 WIP 2024-07-26 16:30:28 +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
alansley
3cee4bc12f Removed some legacy strings & substituted others 2024-07-26 13:57:09 +10:00
fanchao
aa1db13e3a Initial squash merge for strings 2024-07-26 11:34:05 +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
bemusementpark
85ee87f619 Cleanup new account empty logic 2024-07-16 01:32:52 +09:30
bemusementpark
593e417af5 Fix SessionContactDatabase 2024-07-16 00:08:24 +09:30
Morgan Pretty
789d2b4a75 Updated the geolite2 database, removed the IP from the paths page 2024-07-15 17:08:42 +10:00
bemusementpark
4bbdc79415 SES-2394 fix mic button enabled 2024-07-12 13:34:44 +09:30
bemusementpark
4c395cb71e Cleanup InputBar 2024-07-12 13:28:34 +09:30
bemusementpark
38e73cf514 Cleanup search processing 2024-07-12 12:32:59 +09:30
bemusementpark
e3a33ea615 Fix nickname change not updating in search 2024-07-12 12:32:48 +09:30
bemusementpark
0992d12d71 Add name to Model.Contact to fix diffing in search as Contact.equals only checks accountId 2024-07-12 12:09:48 +09:30
bemusementpark
afe1295289 Cleanup GlobalSearchViewModel 2024-07-12 11:48:39 +09:30
bemusementpark
cb8b9d63ac SES-2249 fix contentDescriptions 2024-07-12 00:08:42 +09:30
bemusementpark
e3b4636b42 Reopen app to pcurrently open activity 2024-07-11 23:52:29 +09:30
bemusementpark
30ee3946ef Merge branch 'od' into on-2 2024-07-11 15:07:46 +09:30
bemusementpark
e139afed6a Make loading animation work when animations are off 2024-07-11 14:58:18 +09:30
bemusementpark
eeabd32da4 Remove easing on progress animation 2024-07-11 11:46:34 +09:30
bemusementpark
95ecbe664d SES-2386 Account Creation Modal 2024-07-11 11:26:41 +09:30
ThomasSession
b510b064cf
[SES-1652] Swap video views in calls (#1533)
* WIP: swap video views

* feat: swap video views

* minor fixes

* minor fix

* minor fix

* update libsession-util

* Revert "update libsession-util"

This reverts commit 0d386e706e78d86147728cccb80636d920006d98.

* reverse updating libsession-util

* update libsession-util

* Tweaking colors to match designs

* More theme fixes

* WebRTC rework

Only using two sinks and swapping between them
Reworked the device rotation logic as it didn't work well with pitch ( you could tip the device front to back and the rotation went out of whack, so had to resort to more robust calculation for the device orientation.
Had to use a deprecated sensor setting but it's the only one I could use that works.

* Video management logic update

Rounded corners for floating inset
Proper handling of video scaling based on video proportions
Proper handling of mirroring logic for floating/fullscreen videos depending on whether they are the user or the remote video and whether the camera is front facing or not

* Showing floating video inset only when there is at least one video stream active, hiding it when both are inactive

* Rotating controls on rotation

* Clean up

* Review feedback

* OrientationManager

The new OrientationManager encapsulate the orientation logic and sends out a mutable state flow

* PR feedback

---------

Co-authored-by: Ryan Zhao <ryanzhaors@qq.com>
Co-authored-by: Ryan ZHAO <>
2024-07-11 09:44:17 +10:00
AL-Session
2e3acd902f
SS-2168 - User profile warnings (#1531)
* Profile picture upload fail informs user

* End of day push

* Push before trying with okhttp library update

* WIP

* Further WIP

* Add additional debug comments

* Push before cleanup

* Cleaned up

* More cleanup

* Minor adjustment

* Final cleanup prior to PR review

* Removed commented out old conscrypt version import

* Addressed PR feeback from Fanchao

---------

Co-authored-by: alansley <aclansley@gmail.com>
2024-07-09 16:23:26 +10:00
ThomasSession
de7df58503
Merge pull request #1540 from oxen-io/release/1.18.5
Dev: Release/1.18.5
2024-07-09 14:35:55 +10:00
ThomasSession
ad0b1a9db7
Revert "Release/1.18.5 (#1536)"
This reverts commit 8c4bd9b44883fbc4ebfda8d707ddd8223a7e838f.
2024-07-09 14:07:25 +10:00
ThomasSession
8c4bd9b448
Release/1.18.5 (#1536)
* Fix issue with span being the full length (#1528)

* Proper display of unresolved names in mentions (#1530)

* Fix issue with span being the full length

* Making sure a mention with a username without a resolved name still displayed with the appropriate style with the truncated is

* Testnet build (#1532)

Co-authored-by: fanchao <git@fanchao.dev>

* Allow "public.loki.foundation" to be accessed by http (#1534)

Co-authored-by: fanchao <git@fanchao.dev>

* Bumping the version code and name

* Reverting temporary change

---------

Co-authored-by: Fanchao Liu <273191+simophin@users.noreply.github.com>
Co-authored-by: fanchao <git@fanchao.dev>
2024-07-09 11:45:30 +10:00
ThomasSession
2b27b7d5e0 Bumping the version code and name 2024-07-09 09:33:06 +10:00
bemusementpark
84b1fb6527 Truncate name to 100 bytes on restore account 2024-07-08 13:11:49 +09:30
Fanchao Liu
075341abe1
Allow "public.loki.foundation" to be accessed by http (#1534)
Co-authored-by: fanchao <git@fanchao.dev>
2024-07-08 11:24:37 +10:00
bemusementpark
fa5b10e2e1 Merge remote-tracking branch 'ry/poller-fix' into on-3 2024-07-05 16:55:18 +09:30
bemusementpark
9c10bbfe65 Merge branch 'od' into on-2 2024-07-05 12:04:42 +09:30
ThomasSession
15b3b18321
Proper display of unresolved names in mentions (#1530)
* Fix issue with span being the full length

* Making sure a mention with a username without a resolved name still displayed with the appropriate style with the truncated is
2024-07-05 10:48:51 +10:00
ThomasSession
bbb1b2b517
Fix issue with span being the full length (#1528) 2024-07-04 17:50:17 +10:00
bemusementpark
81f9bf9412 Fix refresh on open search 2024-07-04 14:58:18 +09:30