2
0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-05 21:20:45 +00:00
Commit Graph

1362 Commits

Author SHA1 Message Date
James Hugman
b352f85bb5 [fenix] Closes https://github.com/mozilla-mobile/fenix/issues/4114 - Re-enable app-links 2019-07-17 10:39:17 -07:00
Emily Kager
a97e5ac7ca [fenix] For https://github.com/mozilla-mobile/fenix/issues/3521 - Show Quick Settings Dialog Entirely in Landscape 2019-07-17 09:52:01 -07:00
Emily Kager
9b8522bf46 [fenix] For https://github.com/mozilla-mobile/fenix/issues/2160 - Hide Keyboard in onPause from EditBookmarkFragment 2019-07-17 09:20:28 -07:00
Emily Kager
ef1e6a91fa [fenix] Closes https://github.com/mozilla-mobile/fenix/issues/3332 - Do not alter text of hosts of tabs in collection 2019-07-17 09:02:30 -07:00
Emily Kager
228a90c5c6 [fenix] Closes https://github.com/mozilla-mobile/fenix/issues/4038 - Adds margin before close icon in tab item 2019-07-16 14:14:08 -07:00
Aaron Train
f1fefba0a9 [fenix] Closes https://github.com/mozilla-mobile/fenix/issues/3977: Add basic navigational UI tests (https://github.com/mozilla-mobile/fenix/pull/3978)
- Adds UI tests (and assets) for basic navigation

fix: review changes

fix: linter cleanup

fix: detekt cleanup

fix: adjust wait approaches
2019-07-16 13:02:12 -07:00
Emily Kager
df1cda0b52 [fenix] For https://github.com/mozilla-mobile/fenix/issues/3998 - Make Turn On Sync Fragment scrollable in landscape 2019-07-16 12:56:07 -07:00
Sawyer Blatz
8ab0e5a405 [fenix] For https://github.com/mozilla-mobile/fenix/issues/2362: Adds telemetry for history (https://github.com/mozilla-mobile/fenix/pull/3940) 2019-07-16 12:21:03 -07:00
Colin Lee
ea018de253 [fenix] For https://github.com/mozilla-mobile/fenix/issues/3615: Long pressing the address bar should not copy link (https://github.com/mozilla-mobile/fenix/pull/4083) 2019-07-16 13:42:05 -05:00
Emily Kager
669ddbca83 [fenix] Closes https://github.com/mozilla-mobile/fenix/issues/4080 - Trim New Bookmark Folder Title Text 2019-07-16 11:02:36 -07:00
Sebastian Kaspari
d7da01235a [fenix] Use Mozilla Android Components 4.0.0. 2019-07-16 18:35:35 +02:00
Tiger Oakes
2ba90fdb51 [fenix] Merge some library UIView code for toolbar 2019-07-16 09:27:30 -07:00
Tiger Oakes
c7ad818506 [fenix] Remove unused sessions resources 2019-07-16 09:15:50 -07:00
Colin Lee
755e717e82 [fenix] Fixes https://github.com/mozilla-mobile/fenix/issues/4072: Re-installing Fenix shows tabs from previous install (https://github.com/mozilla-mobile/fenix/pull/4076) 2019-07-16 08:28:18 -07:00
Jonathan Almeida
d973f3aaed [fenix] No issue: Enable send tab in nightly legacy 2019-07-16 08:54:45 -04:00
Emily Kager
68a26abe61 [fenix] For https://github.com/mozilla-mobile/fenix/issues/3134 - Add confirmation dialog to sign out of FxA (https://github.com/mozilla-mobile/fenix/pull/3959) 2019-07-15 16:21:13 -07:00
Jeff Boek
89e9293c18 [fenix] For https://github.com/mozilla-mobile/fenix/issues/3633 - Creates generic store provider (https://github.com/mozilla-mobile/fenix/pull/4060) 2019-07-15 15:54:13 -07:00
Sawyer Blatz
f428d7a545 [fenix] No issue: Speed up onboarding UI test (https://github.com/mozilla-mobile/fenix/pull/4061) 2019-07-15 17:02:55 -05:00
Tiger Oakes
ce333bc7b9 [fenix] Use tools:text to avoid inflating strings twice (https://github.com/mozilla-mobile/fenix/pull/3619) 2019-07-15 17:01:37 -05:00
Jonathan Almeida
74f2b435f8 [fenix] No issue: Add comments on the push flag state 2019-07-15 17:42:58 -04:00
Sawyer Blatz
da7f3ddb75 [fenix] Closes https://github.com/mozilla-mobile/fenix/issues/4027: Adds search fragment UI tests (https://github.com/mozilla-mobile/fenix/pull/4033) 2019-07-15 14:25:31 -07:00
Axel Hecht
6ed01ce746 [fenix] Import strings from android-l10n (https://github.com/mozilla-mobile/fenix/pull/4054)
State: mozilla-l10n/android-l10n@64a8eca673
2019-07-15 16:09:44 -05:00
ekager
a7d73b28e6 [fenix] For https://github.com/mozilla-mobile/fenix/issues/3554 - Add DiffUtil to HistoryAdapter 2019-07-15 13:46:21 -07:00
Jonathan Almeida
01457f8490 [fenix] For https://github.com/mozilla-mobile/fenix/issues/3015: Add push support for send tab 2019-07-15 16:38:49 -04:00
Sebastian Kaspari
5aa444e448 [fenix] Closes https://github.com/mozilla-mobile/fenix/issues/4052: Remove pending intent workaround. (https://github.com/mozilla-mobile/fenix/pull/4059)
Previously we needed to set a static launch function to be invoked when the find in page
integration should be launched. Now we can access the integration class directly and
can avoid the static property that caused issues when used by multiple activities.
2019-07-15 14:15:59 -05:00
Colin Lee
71f174f922 [fenix] For https://github.com/mozilla-mobile/fenix/issues/3865: Use separate app name and icon for Nightly build (https://github.com/mozilla-mobile/fenix/pull/3873) 2019-07-15 14:12:30 -05:00
Christian Sadilek
70c981cc25 [fenix] For https://github.com/mozilla-mobile/fenix/issues/3633: Add unit tests for SearchStore 2019-07-15 13:47:01 -04:00
Sebastian Kaspari
ad2d2072de [fenix] Use updated feature-tab-collections API. (https://github.com/mozilla-mobile/fenix/pull/4056) 2019-07-15 09:58:33 -07:00
Christian Sadilek
0ce2651610 [fenix] Closes https://github.com/mozilla-mobile/fenix/issues/1350: Use GeckoView fetch client for service-fretboard / kinto 2019-07-15 11:26:40 -04:00
Tiger Oakes
26e5073816 [fenix] No issue: Use putCompoundDrawables helper (https://github.com/mozilla-mobile/fenix/pull/3982) 2019-07-15 08:24:59 -07:00
ekager
32ab171f8f [fenix] For https://github.com/mozilla-mobile/fenix/issues/4039 - Set angle of progress bar gradient 2019-07-15 08:02:06 -07:00
Sebastian Kaspari
30f9fdfa86 [fenix] After mege day: Switch from GV 68 beta to GV 68 release. 2019-07-15 16:29:41 +02:00
Sebastian Kaspari
3e44741d8d [fenix] Closes https://github.com/mozilla-mobile/fenix/issues/3996: Remove workaround for opening custom tab in browser.
`EngineView` now allows releasing the `Session` so that it can be rendered by an
other `EngineView` instance.
2019-07-15 10:52:57 +02:00
Jeff Boek
8f72063d99 [fenix] For https://github.com/mozilla-mobile/fenix/issues/3633 - Refactors the search screen to use lib-state
* For https://github.com/mozilla-mobile/fenix/issues/3633 - Adds SearchStore

* For https://github.com/mozilla-mobile/fenix/issues/3633 - Refactors AwesomeBarUIView

* For https://github.com/mozilla-mobile/fenix/issues/3633 - Refactors ToolbarUIView to use lib-state

* For https://github.com/mozilla-mobile/fenix/issues/3633 - Fixes a couple of state bugs

* For https://github.com/mozilla-mobile/fenix/issues/3633 - Moves all user interaction to SearchInteractor

* For https://github.com/mozilla-mobile/fenix/issues/3633 - Adds kdocs to SearchStore and SearchInteractor

* For https://github.com/mozilla-mobile/fenix/issues/3633 - Adds documentation for the properties on SearchState
Also removes uneccessary property

* For https://github.com/mozilla-mobile/fenix/issues/3633 - Creates `StateViewModel` to handle state restoration

* For https://github.com/mozilla-mobile/fenix/issues/3633 - Adds a test for onTextChanged

* For https://github.com/mozilla-mobile/fenix/issues/3633 - Adds tests for SearchInteractor

* For https://github.com/mozilla-mobile/fenix/issues/3633 - Fixes bugs and adds documentation
2019-07-12 16:32:00 -07:00
Sawyer Blatz
e3ae3bf145 [fenix] For https://github.com/mozilla-mobile/fenix/issues/4032: Fixes broken homescreen UI tests (https://github.com/mozilla-mobile/fenix/pull/4011) 2019-07-12 16:19:08 -07:00
Emily Kager
691a67c66d [fenix] For https://github.com/mozilla-mobile/fenix/issues/3997 - Use ScrollView so landscape mode displays entire view 2019-07-12 11:49:12 -07:00
Emily Kager
ea3bfeaa16 [fenix] For https://github.com/mozilla-mobile/fenix/issues/3568 - Use correct styling for QR and Share Alert Dialogs 2019-07-12 11:40:33 -07:00
Tiger Oakes
8d3020ebcf [fenix] No issue: Normalize license header comment (https://github.com/mozilla-mobile/fenix/pull/3909) 2019-07-12 11:38:15 -07:00
Emily Kager
f914c789d4 [fenix] No issue: Remove rounded QAB corners to avoid overlapping web content 2019-07-12 09:59:19 -07:00
Colin Lee
0644a18942 [fenix] No issue: Enable Strict Mode in Debug Builds (https://github.com/mozilla-mobile/fenix/pull/4014) 2019-07-12 00:23:28 -05:00
Emily Kager
cb3f6eaf24 [fenix] For https://github.com/mozilla-mobile/fenix/issues/3997 - Use srcCompat for sign in ImageView 2019-07-11 13:29:24 -04:00
Emily Kager
6a3eb71c7c [fenix] For https://github.com/mozilla-mobile/fenix/issues/3806 - Adds corner radius to QAB and dialogs 2019-07-11 12:57:27 -04:00
Grisha Kruglov
8729a8cc7f [fenix] Update FxA integration to new APIs 2019-07-11 13:19:37 +02:00
Emily Kager
deabbf47df [fenix] For https://github.com/mozilla-mobile/fenix/issues/3772 - Update FXA sign in UI (https://github.com/mozilla-mobile/fenix/pull/3933) 2019-07-10 21:20:06 -05:00
Emily Kager
3c50e4efd8 [fenix] For https://github.com/mozilla-mobile/fenix/issues/3906 - Add backgrounds to Permissions Buttons (https://github.com/mozilla-mobile/fenix/pull/3958) 2019-07-10 20:59:47 -05:00
Emily Kager
38266569b2 [fenix] For https://github.com/mozilla-mobile/fenix/issues/1949 - Fixes bookmark separator appearance, removes menu (https://github.com/mozilla-mobile/fenix/pull/3957) 2019-07-10 14:23:35 -05:00
Emily Kager
6cd52f7838 [fenix] For https://github.com/mozilla-mobile/fenix/issues/3478 - Add Tab sent snackbar confirmation for device sharing 2019-07-10 14:13:10 -04:00
ekager
5fd2bbd1e1 [fenix] For https://github.com/mozilla-mobile/fenix/issues/3240 - Create AuthCustomTabActivity to fix dead end on auth 2019-07-10 12:23:01 -04:00
Emily Kager
80655c80f2 [fenix] No issue: Adds new strings for sync, fxa, and settings 2019-07-09 18:52:36 -04:00
Richard Pappalardo
4bcbc91e9e [fenix] Update HomeScreenTest and add first run (https://github.com/mozilla-mobile/fenix/pull/3951) 2019-07-09 14:52:15 -07:00
Colin Lee
97636e4615 [fenix] For https://github.com/mozilla-mobile/fenix/issues/3818: Handle crashes accessing view after onDestroyView (https://github.com/mozilla-mobile/fenix/pull/3942) 2019-07-08 18:42:17 -05:00
Sawyer Blatz
61bb1ef218 [fenix] For https://github.com/mozilla-mobile/fenix/issues/3175: Correctly grabs focus in search fragment (https://github.com/mozilla-mobile/fenix/pull/3938) 2019-07-08 14:44:30 -07:00
Tiger Oakes
301b057d02 [fenix] Replace deprecated pxToDp (https://github.com/mozilla-mobile/fenix/pull/3932) 2019-07-08 14:45:07 -05:00
Mugurell
50820c4ae0 [fenix] Fix https://github.com/mozilla-mobile/fenix/issues/3425 - Use Share header text as contentDescription (https://github.com/mozilla-mobile/fenix/pull/3822) 2019-07-08 14:35:53 -05:00
Jeff Boek
ece0478446 [fenix] For https://github.com/mozilla-mobile/fenix/issues/2094 - Keep motionlayout internals from being optimized away by (https://github.com/mozilla-mobile/fenix/pull/3937)
proguard

Co-Authored-By: sblatz <sdblatz@gmail.com>
2019-07-08 14:29:51 -05:00
Colin Lee
8bfdd2b449 [fenix] For https://github.com/mozilla-mobile/fenix/issues/2251 - Add bookmark adapter diffutil (https://github.com/mozilla-mobile/fenix/pull/3936)
* For https://github.com/mozilla-mobile/fenix/issues/2251 - Add bookmark adapter diffutil

* For https://github.com/mozilla-mobile/fenix/issues/2251 - Fix unit tests for bookmark adapter diffutil
2019-07-08 14:00:25 -05:00
afr30010
bb27160d88 [fenix] Modify the order of Privacy Policy and About in Settings (https://github.com/mozilla-mobile/fenix/pull/2760) 2019-07-08 12:16:18 -05:00
Axel Hecht
e5788b7fe8 [fenix] Import strings from android-l10n (https://github.com/mozilla-mobile/fenix/pull/3923)
State: mozilla-l10n/android-l10n@5d8852d69a
2019-07-08 12:11:44 -05:00
Emily Kager
5f611402d1 [fenix] For https://github.com/mozilla-mobile/fenix/issues/3772 - Remove Create an Account Option on TurnOnSyncFragment (https://github.com/mozilla-mobile/fenix/pull/3928) 2019-07-08 12:07:09 -05:00
Colin Lee
e34a537230 [fenix] Closes https://github.com/mozilla-mobile/fenix/issues/2683. Update Gradle to 5.5 (https://github.com/mozilla-mobile/fenix/pull/3929)
* Closes https://github.com/mozilla-mobile/fenix/issues/2683. Update Gradle to `5.4.1`

* Upgrade to Gradle 5.5
2019-07-08 11:14:13 -05:00
Sawyer Blatz
cb2bd4d4d9 [fenix] For https://github.com/mozilla-mobile/fenix/issues/2357: Removes snapping threshold on home fragment (https://github.com/mozilla-mobile/fenix/pull/3878) 2019-07-08 09:11:22 -07:00
kglazko
e8acfc56b4 [fenix] Adding l10n screenshot tests for Fenix (https://github.com/mozilla-mobile/fenix/pull/3562)
* Adding l10n screenshot tests for Fenix

* fixing comments

* fix klint and detekt error and adding all tests

* better test name and doc added explaining tests
2019-07-08 11:00:29 -05:00
ekager
b619b30373 [fenix] For https://github.com/mozilla-mobile/fenix/issues/3547 - Use MaterialButton for Share Component Close Button 2019-07-08 08:59:58 -07:00
Christian Sadilek
dfe883a345 [fenix] Closes https://github.com/mozilla-mobile/fenix/issues/3914: Exclude gecko.util.DebugConfig from Proguard optimization 2019-07-07 18:37:39 -07:00
ekager
ab44bf5901 [fenix] Closes https://github.com/mozilla-mobile/fenix/issues/3879 - Remove attributeSetId from AccountPreference 2019-07-07 18:06:17 -07:00
Richard Pappalardo
623407a92f [fenix] Update HomeScreenTest (https://github.com/mozilla-mobile/fenix/pull/3882) 2019-07-05 10:38:09 -07:00
ekager
9943951b6e [fenix] For https://github.com/mozilla-mobile/fenix/issues/3201 - Update bookmark state when session selected 2019-07-03 11:38:14 -07:00
Emily Kager
b8f2943b0b [fenix] For https://github.com/mozilla-mobile/fenix/issues/3829 - Add pop up to nav_graph to browser to home nav 2019-07-03 11:29:49 -07:00
Colin Lee
38657770e4 [fenix] For https://github.com/mozilla-mobile/fenix/issues/3364: Set bookmark root titles onResume (https://github.com/mozilla-mobile/fenix/pull/3828) 2019-07-03 13:13:53 -05:00
ekager
ed5ee7c267 [fenix] For https://github.com/mozilla-mobile/fenix/issues/3715 - Update menu corner radius to 8dp to match tabs 2019-07-03 11:13:23 -07:00
ekager
b0abda06b5 [fenix] No issue: Adds mischievous Fenix debug launcher 2019-07-03 09:47:41 -07:00
Jeff Boek
2af10de2c7 [fenix] For https://github.com/mozilla-mobile/fenix/issues/3869 - Creates a SearchLocalizationProvider that sets the region to get the correct default search engine based on a locale 2019-07-03 08:57:59 -07:00
Yeon Taek Jeong
58f813f365 [fenix] For https://github.com/mozilla-mobile/fenix/issues/3317: Prepopulate FxA device name field with existing name (https://github.com/mozilla-mobile/fenix/pull/3733) 2019-07-03 08:38:09 -07:00
Axel Hecht
fc18e75ad9 [fenix] Import strings from android-l10n
State: mozilla-l10n/android-l10n@63a524065c
2019-07-03 17:07:45 +02:00
Axel Hecht
84841abf9a [fenix] Import strings from android-l10n
State: mozilla-l10n/android-l10n@1a1047c59e
2019-07-03 13:42:22 +02:00
Axel Hecht
77feb9118b [fenix] Import strings from android-l10n
State: mozilla-l10n/android-l10n@4c73402212
2019-07-03 13:42:22 +02:00
Emily Kager
07abba40ba [fenix] For https://github.com/mozilla-mobile/fenix/issues/3734 - Don't SwipeToDelete RecyclerView without windowfocus (https://github.com/mozilla-mobile/fenix/pull/3839) 2019-07-02 14:42:50 -07:00
Emily Kager
e802201a5d [fenix] Closes https://github.com/mozilla-mobile/fenix/issues/3268 - Change Tab Favicon Border Radius to 4 (https://github.com/mozilla-mobile/fenix/pull/3856) 2019-07-02 14:42:20 -07:00
Emily Kager
298be38e35 [fenix] For https://github.com/mozilla-mobile/fenix/issues/203 - Adds find in page and request desktop site to custom tab menu (https://github.com/mozilla-mobile/fenix/pull/3835) 2019-07-02 14:41:29 -07:00
Colin Lee
1d378b8b20 [fenix] For https://github.com/mozilla-mobile/fenix/issues/2945: Launches to blank screen and hangs on Nexus 10 (https://github.com/mozilla-mobile/fenix/pull/3854) 2019-07-02 14:58:28 -05:00
Mitchell Hentges
9da8449e36 [fenix] Re-enables pushing nightly to org.mozilla.fenix (https://github.com/mozilla-mobile/fenix/pull/3823)
* Re-enables pushing nightly to org.mozilla.fenix

* Publishes org.mozilla.fenix.nightly releases on internal track
2019-07-02 11:34:04 -07:00
Sawyer Blatz
a8b04c98b9 [fenix] For https://github.com/mozilla-mobile/fenix/issues/3174: Adds telemetry for bookmarks (https://github.com/mozilla-mobile/fenix/pull/3724) 2019-07-02 08:41:20 -07:00
Sawyer Blatz
1700a97ba7 [fenix] For https://github.com/mozilla-mobile/fenix/issues/2054: Collapses quick action bar when opening find in page (https://github.com/mozilla-mobile/fenix/pull/3837) 2019-07-02 08:22:34 -07:00
Emily Kager
a619aacdf0 [fenix] For https://github.com/mozilla-mobile/fenix/issues/3834 - Initialize job in init 2019-07-01 16:26:46 -07:00
Colin Lee
1c2fc8f4ab [fenix] For https://github.com/mozilla-mobile/fenix/issues/3551: Tapping a bookmark/history from Library should open new tab (https://github.com/mozilla-mobile/fenix/pull/3832) 2019-07-01 16:31:30 -05:00
Colin Lee
e06ee833ee [fenix] No issue: Fix master builds (https://github.com/mozilla-mobile/fenix/pull/3825) 2019-07-01 14:15:54 -05:00
Tiger Oakes
1283ea9ce2 [fenix] Move adapter Job setup code to helper class (https://github.com/mozilla-mobile/fenix/pull/3407) 2019-07-01 13:34:25 -05:00
Sören Hentzschel
4533cd3664 [fenix] For https://github.com/mozilla-mobile/fenix/issues/2425 - QAB showed wrong text for bookmarked pages (https://github.com/mozilla-mobile/fenix/pull/3794)
* For https://github.com/mozilla-mobile/fenix/issues/2425 - QAB showed wrong text for bookmarked pages

* fixed linting issue
2019-07-01 11:45:52 -05:00
Sawyer Blatz
c860dd154c [fenix] For https://github.com/mozilla-mobile/fenix/issues/3005: Closes tabs when saving to collection (https://github.com/mozilla-mobile/fenix/pull/3723) 2019-07-01 11:39:48 -05:00
Weverson Nascimento
203e27818e [fenix] For https://github.com/mozilla-mobile/fenix/issues/3645: Fix search engine selection (https://github.com/mozilla-mobile/fenix/pull/3665)
* Remove RadioButton drawable applied in runtime

* Add default RadioButton layout
2019-07-01 11:08:58 -05:00
Emily Kager
1ef2034eb6 [fenix] No issue: Remove attributeSetId from DefaultBrowserPreference (https://github.com/mozilla-mobile/fenix/pull/3712) 2019-07-01 09:02:40 -07:00
Colin Lee
fcb91db5cb [fenix] For https://github.com/mozilla-mobile/fenix/issues/3784: Crash loading bookmarks while detached (https://github.com/mozilla-mobile/fenix/pull/3787) 2019-07-01 10:57:31 -05:00
Colin Lee
5d4bc3967e [fenix] For https://github.com/mozilla-mobile/fenix/issues/3785: Crash onDestroy of BookmarkFragment when detached (https://github.com/mozilla-mobile/fenix/pull/3786) 2019-07-01 10:57:16 -05:00
Tiger Oakes
06263bdf12 [fenix] No issue: Remove duplicate wordmark and update about page (https://github.com/mozilla-mobile/fenix/pull/3590) 2019-07-01 08:54:16 -07:00
Yeon Taek Jeong
cc7802e5c1 [fenix] For https://github.com/mozilla-mobile/fenix/issues/3381: Fix 'Remove account' returning app to home screen (https://github.com/mozilla-mobile/fenix/pull/3778)
* For https://github.com/mozilla-mobile/fenix/issues/3381: Fix 'Remove account' returning app to home screen

* Remove unused import

* Move popBackStack() outside lifecycleScope instead
2019-07-01 08:32:06 -07:00
Arturo Mejia
2f1a5a6110 [fenix] For https://github.com/mozilla-mobile/fenix/issues/3750: Crash when tapping "Blocked" on Google Maps after disabling
location requests.
2019-06-29 18:39:19 -07:00
Emily Kager
60372ff52b [fenix] For https://github.com/mozilla-mobile/fenix/issues/3355 - Allow multilines on bottom bar in Collection Creation (https://github.com/mozilla-mobile/fenix/pull/3782) 2019-06-28 19:10:54 -05:00
Sawyer Blatz
bf2a8a0351 [fenix] For https://github.com/mozilla-mobile/fenix/issues/2210: Improves UI of search fragment (https://github.com/mozilla-mobile/fenix/pull/3773) 2019-06-28 19:03:04 -05:00
Mitchell Hentges
3fa6a6e7e6 [fenix] Nightly package name should be "org.mozilla.fenix.nightly" (https://github.com/mozilla-mobile/fenix/pull/3771) 2019-06-28 18:56:55 -05:00
Divya Raj
03196d7547 [fenix] Fixed Issue https://github.com/mozilla-mobile/fenix/issues/3741 - %s in Japanese version + A few typos (https://github.com/mozilla-mobile/fenix/pull/3749)
* Typo in README

* Fixed Issue https://github.com/mozilla-mobile/fenix/issues/3741 - %s in Japanese version

* Fixed various typos
2019-06-28 18:56:25 -05:00