piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity
42,818 Commits 5 Branches 11 Tags 1.3 GiB
02e061d84b
Commit Graph

2352 Commits

Author SHA1 Message Date
Charles Lombardo
c5d81c1006 android: Regenerate baseline profile module for AGP 8.2.0 2023-12-09 15:44:29 -05:00
Charles Lombardo
7d4db6603b android: Update AGP to 8.2.0 
Also updates gradle to 8.2 as that is the minimum required version for AGP 8.2.0
 2023-12-09 15:44:29 -05:00
Charles Lombardo
001089dbf4 android: Convert gradle files to kotlin gradle dsl 2023-12-09 14:57:09 -05:00
Charles Lombardo
57b33e9142 android: Remove benchmark module 2023-12-09 14:57:09 -05:00
t895
42a4630245 Android: Allow Coil image cache to use more memory 
Allows the Coil memory cache to use up to 90% of the application's available memory. Previously this could cause problems with reloading images in very large libraries of games.
 2023-12-09 14:55:58 -05:00
JosJuice
a4eff2acc1 Android: Don't call Run before directory initialization 
Combined with the previous commits, this finally fixes the bug where
Dolphin had a chance of crashing if you returned to it after Android
killed the Dolphin process.
 2023-12-08 19:36:11 +01:00
JosJuice
a31214b8c6 Android: Fix EmulationActivity's handling of process recreation 2023-12-08 19:31:12 +01:00
JosJuice
5aa80603d7 Android: Reload EmulationActivity settings on title change 
This way, we ensure that game INI settings are properly applied. I don't
think we actually expose the affected settings on a per-game basis in
the UI, but still.
 2023-12-08 17:57:30 +01:00
JosJuice
11041e950d Android: Combine reading cutout setting with updateOrientation 2023-12-08 17:56:29 +01:00
JosJuice
4203632c93 Android: Improve GameFileCacheManager comments 2023-12-07 21:09:17 +01:00
JosJuice
3e7a16f225 Android: Use config changed callback for tracking recursive scan setting 
This way the Settings class doesn't contain a hardcoded reference to
a specific setting. And Settings.loadSettings no longer calls
getBoolean, which is a step towards fixing the crash when recreating
EmulationActivity after process death.
 2023-12-07 21:09:17 +01:00
JosJuice
d80f9d53fc Android: Expose config changed callbacks 2023-12-07 21:09:17 +01:00
Minh Truong
4b91bf48f5 Finish parent activity after directory initializer completes 
Add frontIntent flag to control activity.finish()

Moved parent activity finish inside of performLaunchChecks
 2023-12-01 15:12:10 -06:00
iwubcode
d57c1cbe6c Android / Core / DolphinQt: disable arbitrary mipmap detection by default, let the games that need it be enabled with a config option, there aren't many of them 2023-12-01 14:23:56 -06:00
Mai
b7435be90a
Merge pull request #12298 from Shoegzer/master 
Update default IP for HLE BBA
 2023-11-28 22:45:17 +01:00
Mai
ac53766058
Merge pull request #12215 from JosJuice/android-si-devices 
Android: Add more GameCube controller types
 2023-11-28 19:21:29 +01:00
JosJuice
5bda811a00 Android: Remove HostThreadLocks that are no longer needed 
71ce8bb6f0 got rid of the need to be the
host or CPU thread when writing to the config.
 2023-11-25 14:06:29 +01:00
Shoegzer
21e9cdfbd0 Also update IP in Android GUI 2023-11-15 13:50:54 -05:00
Admiral H. Curtiss
ec69ed2173
Merge pull request #12133 from mandar1jn/skylanders-improved-generation 
Skylanders: Improve figure data view and generation
 2023-11-05 18:29:19 +01:00
Mandar1jn
afdf6de041
Skylanders: Improve figure data view and generation 
Co-authored-by: deReeperJosh <joshua@dereeper.co.nz>
 2023-11-05 18:06:10 +01:00
JosJuice
d04e67be3d Add fastmem arena setting 
Just for debugging.
 2023-10-31 19:43:49 +01:00
JosJuice
b3bfcc5d7f PowerPC: Allow toggling write-back cache during emulation 
Now that PR 10575 is merged, the JIT automatically clears its cache
when this setting is changed, making this reasonable to implement.
 2023-10-31 19:43:49 +01:00
JosJuice
d811c12196 Android: Add more GameCube controller types 
For all your PSO needs.
 2023-10-01 18:47:49 +02:00
JosJuice
d6c0f8e749 Android: Get profile name from core 
To avoid duplicating information between Kotlin and C++.
 2023-10-01 18:47:49 +02:00
JosJuice
d8e00c98e8 Android: Remove a stray backtick 2023-10-01 13:37:04 +02:00
JosJuice
117bfd326d
Merge pull request #12197 from t895/double-numeric-settings-fix 
Android: Float slider settings fix
 2023-09-24 15:33:24 +02:00
Admiral H. Curtiss
c67cd65b53
Merge pull request #12190 from AdmiralCurtiss/fmt10 
Update fmt to 10.1.1
 2023-09-24 00:05:00 +02:00
Charles Lombardo
fa37336ba3 Android: Adjust settings slider dialog 
Move text above slider
 2023-09-23 10:58:29 -04:00
Charles Lombardo
f205a20d3f Android: Use 0.5 unit step size and show decimal for numeric settings 
In some settings where the default value could not be evenly divided by the step size for the slider, there would be a crash. This increases the precision of all double numeric settings to 0.5 and now shows the decimal that you couldn't see before.
 2023-09-23 10:48:23 -04:00
get
63467559b2
fmt 10.0.0-10.1.1 compile fixes 
Implicit conversion operators and enums was removed for parity with std::format (fce74caa15).
 2023-09-21 01:19:23 +02:00
Charles Lombardo
f13b29196d Android: Use custom image loader for game covers 
This fixes a bug where custom cover loading was initiated but would finish by the time another image view would be in the place of the previous one.
 2023-09-20 14:36:58 -04:00
JosJuice
c378365324 Android: Get rid of unnecessary nullability in features.settings 2023-09-03 17:44:26 +02:00
JosJuice
26e9294075
Merge pull request #12153 from JosJuice/android-iso-paths-jni 
Android: Use JNI for setting/getting ISO paths
 2023-09-03 17:38:52 +02:00
JosJuice
190e71a318 Android: Use JNI for setting/getting ISO paths 
This gets rid of the last Android-specific code that directly interfaces
with INI files.
 2023-09-02 12:58:20 +02:00
JosJuice
1c47c510cd Android: Remove all uses of Any from SliderSetting 
This makes casting unnecessary, preventing the kind of type error we
just had from occurring in the future.
 2023-09-02 10:05:42 +02:00
JosJuice
e6138d7683 Android: Fix controller float sliders crashing 
By not setting a stepSize, stepSize was getting set to the default
value of 0, which is an Int. This later caused a crash when trying to
cast it to Float.
 2023-09-02 09:12:42 +02:00
Charles Lombardo
5e5887a378
Merge pull request #12095 from t895/color-space-settings 
Android: Expose color space settings
 2023-08-30 10:07:07 -04:00
Charles Lombardo
53fc3446d5 Android: Support settings with float values 
We did support float settings before but we never showed anything past the decimal place before.
 2023-08-29 00:30:03 -04:00
Charles Lombardo
80b329b77f Android: Expose color correction settings 2023-08-29 00:20:16 -04:00
Charles Lombardo
153a95482a
Merge pull request #12119 from ThunderousEcho/feature/latching-buttons 
Added latching buttons (Android)
 2023-08-28 15:32:47 -04:00
Charles Oliner
ee395bb2e5 Added latching buttons 
Added latching buttons, buttons which turn on when you press them and off when you press them again.
 2023-08-27 13:28:53 -04:00
JosJuice
f9959656e7
Merge pull request #11919 from t895/kotlin-controls 
Android: Convert "features.input" package to Kotlin
 2023-08-26 19:10:56 +02:00
Charles Lombardo
6a19629fc6 Android: Convert TvSettingsItem to Kotlin 2023-08-25 14:54:17 -04:00
Charles Lombardo
ed9467dc1b Android: Convert HomeScreenChannel to Kotlin 2023-08-25 14:54:17 -04:00
Charles Lombardo
09c2c6541d Android: Convert GameFileCache to Kotlin 2023-08-25 14:54:17 -04:00
Charles Lombardo
a56ee1a62e Android: Convert GameFile to Kotlin 2023-08-25 14:54:16 -04:00
Charles Lombardo
0e3b33d901 Android: Convert InputMappingControlSettingViewHolder to Kotlin 2023-08-25 14:20:33 -04:00
Charles Lombardo
6caa4307ac Android: Convert ProfileViewHolder to Kotlin 2023-08-25 14:20:33 -04:00
Charles Lombardo
29e5c78541 Android: Convert ProfileDialogPresenter to Kotlin 2023-08-25 14:20:33 -04:00
Charles Lombardo
6ad18e4ee5 Android: Convert ProfileAdapter to Kotlin 2023-08-25 14:20:33 -04:00
Charles Lombardo
dfafa74ba1 Android: Convert MotionAlertDialog to Kotlin 2023-08-25 14:20:33 -04:00
Charles Lombardo
5171290bdb Android: Convert AdvancedMappingDialog to Kotlin 2023-08-25 14:20:33 -04:00
Charles Lombardo
d049be0cad Android: Convert AdvancedMappingControlViewHolder to Kotlin 2023-08-25 14:20:33 -04:00
Charles Lombardo
dac7035119 Android: Convert AdvancedMappingControlAdapter to Kotlin 2023-08-25 14:20:33 -04:00
Charles Lombardo
d21b2d86a8 Android: Convert InputMappingControlSetting to Kotlin 2023-08-25 14:20:33 -04:00
Charles Lombardo
9d7bd6e6bd Android: Convert InputDeviceSetting to Kotlin 2023-08-25 14:20:32 -04:00
Charles Lombardo
2590382871 Android: Convert MappingCommon to Kotlin 2023-08-25 14:20:32 -04:00
Charles Lombardo
f8ab65bcac Android: Convert InputOverrider to Kotlin 2023-08-25 14:20:32 -04:00
Charles Lombardo
cb9c670d85 Android: Convert InputMappingIntSetting to Kotlin 2023-08-25 14:20:32 -04:00
Charles Lombardo
60b3b1231b Android: Convert InputMappingDoubleSetting to Kotlin 2023-08-25 14:20:32 -04:00
Charles Lombardo
b2e2c3b8d4 Android: Convert InputMappingBooleanSetting to Kotlin 2023-08-25 14:20:32 -04:00
Charles Lombardo
4c8cd49d80 Android: Convert DolphinVibratorManagerPassthrough to Kotlin 2023-08-25 14:20:32 -04:00
Charles Lombardo
29adbb4394 Android: Convert DolphinVibratorManagerCompat to Kotlin 2023-08-25 14:20:32 -04:00
Charles Lombardo
1ff6a3788e Android: Convert DolphinVibratorManager to Kotlin 2023-08-25 14:20:32 -04:00
Charles Lombardo
ba9f2373c0 Android: Convert DolphinSensorEventListener to Kotlin 2023-08-25 14:20:31 -04:00
Charles Lombardo
24c882622f Android: Convert ControllerInterface to Kotlin 2023-08-25 14:20:31 -04:00
Charles Lombardo
9ac1847cbd Android: Convert NumericSetting to Kotlin 2023-08-25 14:20:31 -04:00
Charles Lombardo
82298dc408 Android: Convert CoreDevice to Kotlin 2023-08-25 14:20:31 -04:00
Charles Lombardo
3011c0dc64 Android: Convert EmulatedController to Kotlin 2023-08-25 13:31:21 -04:00
Charles Lombardo
4ce069cf4f Android: Convert ControlReference to Kotlin 2023-08-25 13:31:04 -04:00
Charles Lombardo
7c79ff0100 Android: Convert ControlGroup to Kotlin 2023-08-25 13:30:42 -04:00
Charles Lombardo
fafbb2199e Android: Convert Control to Kotlin 2023-08-25 13:30:23 -04:00
Charles Lombardo
0454578f45 Android: Convert ControlGroupEnabledSetting to Kotlin 2023-08-25 10:08:50 -04:00
JosJuice
4b1b5881b0 Android: Move DirectoryInitialization toast to UI thread 
You're not allowed to just show toasts on any thread you want.
 2023-08-15 14:03:08 +02:00
JosJuice
b5b8282ca9 Android: Fix SettingsActivity.onActivityResult 
`or` is the bitwise or operator.

Fixes file pickers in the settings not saving your choice.
 2023-07-28 18:45:07 +02:00
SketchMaster2001
2569d10b3d Add Enable WiiLink checkbox to Android GUI 2023-07-21 17:46:37 -04:00
Charles Lombardo
e185dbf857
Merge pull request #11989 from JosJuice/android-title-on-shutdown 
Android: Handle game shutdown in onTitleChanged
 2023-06-28 12:48:54 -04:00
JosJuice
a7aee396f6
Merge pull request #11929 from t895/gradle-updates 
Android: Gradle updates
 2023-06-26 19:44:23 +02:00
JosJuice
ac53ab184c
Merge pull request #11952 from K0bin/no-per-game-driver 
Android: Remove GPU driver from per-game settings
 2023-06-25 19:00:01 +02:00
JosJuice
b5e197e2dc Android: Handle game shutdown in onTitleChanged 2023-06-23 20:40:04 +02:00
Robin Kertels
38a5774a85
Android: Remove GPU driver from per-game settings 2023-06-23 20:13:14 +02:00
JosJuice
1f130bf8a3 Android: Declare host thread when generating analytics ID 
Another instance of the host thread check failing.
 2023-06-21 18:16:46 +02:00
Charles Lombardo
deb37f0846
Merge pull request #11964 from JosJuice/android-hide-infinity 
Android: Hide Infinity Base in MenuFragment when not relevant
 2023-06-20 17:11:18 -04:00
JosJuice
27db8d4123
Merge pull request #11935 from nitanmarcel/patch-1 
Use getCacheDir if getExternalCacheDir returns null.
 2023-06-19 20:47:27 +02:00
JosJuice
cff3e22f84
Merge pull request #11926 from JosJuice/android-host-check 
Android: Re-add host thread check
 2023-06-19 20:37:59 +02:00
JosJuice
f16381adc5 Android: Hide Infinity Base in MenuFragment when not relevant 2023-06-17 11:57:53 +02:00
Marcel Alexandru Nitan
cff7a4bfd2 Use getCacheDir if getExternalCacheDir returns null. 2023-06-13 18:44:27 +00:00
JosJuice
ae4d52c838 Android: Fix overlay d-pad not working until finger moves 
A switch case fallthrough was overlooked when translating from Java to
Kotlin.
 2023-06-13 20:37:59 +02:00
JosJuice
c961c6c35a Android: Fix pressing up on overlay d-pad 2023-06-13 20:37:59 +02:00
JosJuice
03f2f57edf Android: Add HostThreadLock where necessary 2023-06-12 23:39:42 +02:00
JosJuice
3519a7070d Android: And Lock and Unlock wrappers to HostThreadLock 
This way we can ensure DeclareAsHostThread and UndeclareAsHostThread
are called when locking and unlocking.
 2023-06-12 23:39:42 +02:00
JosJuice
5524042922 Android: Move host thread lock to a separate file 2023-06-12 23:39:42 +02:00
Charles Lombardo
9a7e1652f3 Android: Target Java 17 2023-06-11 23:44:44 -04:00
Charles Lombardo
7822e662f5 Android: Update Kotlin to 1.8.21 
Additionally updates the serialization plugin to match
 2023-06-11 23:44:44 -04:00
Charles Lombardo
4934b6e30b Android: Update dependencies 2023-06-11 23:44:44 -04:00
Charles Lombardo
7c2c558646 Android: Upgrade to AGP 8.0.2 2023-06-11 23:44:44 -04:00
Charles Lombardo
78f7463363 Android: Fix use of deprecated JVM flag 2023-06-11 22:54:31 -04:00
Charles Lombardo
157deb5864
Merge pull request #11928 from K0bin/adrenotools-release-build-fix 
Android: Fix Adrenotools in release builds
 2023-06-11 17:02:36 -04:00
Charles Lombardo
8db5775a1b
Merge pull request #11927 from JosJuice/android-custom-file-extension-locale 
Android: Check file name extensions locale-independently
 2023-06-11 16:52:50 -04:00
Robin Kertels
6f55b26751
Android: Fix Adrenotools in release builds 2023-06-11 22:44:48 +02:00
JMC47
5c0581e990
Merge pull request #11867 from K0bin/adrenotools 
Implement loading custom drivers on Android
 2023-06-11 14:17:39 -04:00
JosJuice
fee86e8536 Android: Check file name extensions locale-independently 
A very minor bug that became more obvious when this code was translated
to Kotlin.
 2023-06-11 19:03:49 +02:00
Robin Kertels
2da7d16b7c
Android: Implement a UI for Adrenotools 2023-06-11 13:53:31 +02:00
Robin Kertels
23bebc5270
VideoBackends:Vulkan: Allow loading custom drivers on Android 
... using libadrenotools
 2023-06-11 13:52:34 +02:00
Charles Lombardo
28785c5fad Android: Convert SaveLoadStateFragment to Kotlin 2023-06-11 00:53:26 -04:00
Charles Lombardo
d26eddd4e2 Android: Convert MenuFragment to Kotlin 2023-06-11 00:53:26 -04:00
Charles Lombardo
afb6719a1a Android: Convert EmulationFragment to Kotlin 2023-06-11 00:53:26 -04:00
Charles Lombardo
7e7cd6ff76 Android: Convert CustomFilePickerFragment to Kotlin 2023-06-11 00:53:26 -04:00
Admiral H. Curtiss
a7678f3210
Merge pull request #11694 from jnaidu360/skylanders-portal-window 
Skylanders Portal Menu Navigational Improvements
 2023-06-06 19:20:39 +02:00
Charles Lombardo
05b1aa3775 android: Fix compilation error from Kotlin changes 
Since the ThemeProvider interface changed `fun getThemeId()` to `var themeId`, I had to adjust how it was used in the EmulationActivity. Similar case for `fun getConfiguredControllerType()`.
 2023-06-06 12:36:21 -04:00
JosJuice
2d56daf1bb
Merge pull request #11873 from AdmiralCurtiss/pause-and-lock-host 
Core: Assert that only the Host thread may call PauseAndLock().
 2023-06-06 13:50:20 +02:00
JosJuice
83b4af86b6
Merge pull request #11892 from t895/kotlin-adapters 
Android: Convert "adapters" package to Kotlin
 2023-06-06 13:06:56 +02:00
JosJuice
04fab7f2b2
Merge pull request #11884 from t895/kotlin-overlay 
Android: Convert InputOverlay to Kotlin
 2023-06-06 13:03:39 +02:00
JosJuice
36ca747d55
Merge pull request #11886 from t895/kotlin-ui 
Android: Convert "ui" package to Kotlin
 2023-06-06 13:03:02 +02:00
Charles Lombardo
f117e8a2f9 Android: Convert PlatformGamesView to Kotlin 2023-06-05 20:08:54 -04:00
Charles Lombardo
3e8d6b8aa2 Android: Convert PlatformGamesFragment to Kotlin 2023-06-05 20:08:54 -04:00
Charles Lombardo
0915bfbb30 Android: Convert Platform to Kotlin 2023-06-05 20:08:54 -04:00
Charles Lombardo
90ac08c98d Android: Convert NVidiaShieldWorkaroundView to Kotlin 2023-06-05 20:08:54 -04:00
Charles Lombardo
2434c2db59 Android: Convert TvMainActivity to Kotlin 2023-06-05 20:08:53 -04:00
Charles Lombardo
ecd62b2211 Android: Convert ThemeProvider to Kotlin 2023-06-05 20:08:53 -04:00
Charles Lombardo
b5c63b995c Android: Convert MainView to Kotlin 2023-06-05 20:08:53 -04:00
Charles Lombardo
01d4e6fe87 Android: Convert MainPresenter to Kotlin 2023-06-05 20:08:53 -04:00
Charles Lombardo
18a03e69a9 Android: Convert MainActivity to Kotlin 2023-06-05 20:08:53 -04:00
Charles Lombardo
dff2d8111c Android: Convert CustomTitleView to Kotlin 2023-06-05 20:08:52 -04:00
Charles Lombardo
a1d027fe07 Android: Convert SettingsRowPresenter to Kotlin 2023-06-05 15:44:26 -04:00
Charles Lombardo
e4935d4b12 Android: Convert PlatformPagerAdapter to Kotlin 2023-06-05 15:44:26 -04:00
Charles Lombardo
0bd0fa4f44 Android: Convert InputOverlayPointer to Kotlin 2023-06-05 14:29:48 -04:00
Charles Lombardo
ddb0de0410 Android: Convert InputOverlayDrawableJoystick to Kotlin 2023-06-05 14:29:39 -04:00
Charles Lombardo
fb60b708f5 Android: Convert InputOverlayDrawableDpad to Kotlin 2023-06-05 14:29:31 -04:00
Charles Lombardo
500f1f1861 Android: Convert InputOverlayDrawableButton to Kotlin 2023-06-05 14:29:31 -04:00
Charles Lombardo
9828ffe250 Android: Convert InputOverlay to Kotlin 2023-06-05 14:29:31 -04:00
Charles Lombardo
e6d8694cbe Android: Convert AppLinkActivity to Kotlin 2023-06-05 14:10:06 -04:00
Charles Lombardo
cbca383bd2 Android: Convert CustomFilePickerActivity to Kotlin 2023-06-05 14:10:06 -04:00
Charles Lombardo
03675f7677 Android: Convert EmulationActivity to Kotlin 2023-06-05 14:10:05 -04:00
jnaidu360
66f4902a1e Improved Skylanders Portal Window Navigation 
Adds features to improve navigation of Skylanders portal menu, includes:
-List of Skylanders and filters for searching
-Improved buttons for faster loading options
-Added default user folder for storing .sky files
 2023-06-04 18:10:08 -07:00
Admiral H. Curtiss
b3c9f49cbe
Core: Assert that only the Host thread may call PauseAndLock(). 2023-06-02 18:51:43 +02:00
JosJuice
3a81463e68 Android: Fix submenus for Wii Remote 2-4 
Accessing any of the submenus "Buttons", "Motion Simulation" or
"Motion Input" for Wii Remotes 2-4 would actually lead to the
corresponding submenu for Wii Remote 1.
 2023-06-01 20:17:50 +02:00
Charles Lombardo
faa2b28e6b
Merge pull request #11835 from JosJuice/android-analytics-race 
Android: Don't show analytics dialog for destroyed activity
 2023-05-28 17:14:36 -04:00
Joshua de Reeper
cf3e8714eb Android: Add Hashmap to IDCache 2023-05-28 19:01:21 +12:00
Joshua de Reeper
f8abc2c0e6 Android: Infinity Base UI 
Add a UI option for the Infinity Base within the Android Emulation Activity
 2023-05-28 19:01:21 +12:00
JosJuice
8a78538b2d Android: Don't show analytics dialog for destroyed activity 
Should fix one of the reported crashes on Google Play. The issue can
happen if you leave the activity during directory initialization.
 2023-05-22 11:10:13 +02:00
Admiral H. Curtiss
6a339cbdb3
IOS/ES: Split ESDevice into ESCore and ESDevice. 
ESCore implements the core functionality that can also be used outside of emulation. ESDevice implements the IOS device and is only available during emulation.
 2023-05-15 20:41:05 +02:00
Mai
1a2dcc53f2
Merge pull request #11742 from K0bin/document-provider-2 
Android: Document Provider improvements
 2023-04-16 04:21:33 -04:00
Robin Kertels
57ed5320b5
Android: Fix various issues with the DocumentProvider 
Fixes copying & deleting folders and copy conflict handling.
 2023-04-15 20:53:01 +02:00
Lioncash
e4caace6bb Common/IniFile: Move interface into Common namespace 
Gets this out of the global namespace and into the Common namespace
 2023-04-13 10:19:28 -04:00
Robin Kertels
1596b13743
Android: Give Debug and Benchmark builds unique names 
on the launcher and for the DocumentsProvider
 2023-04-08 15:56:44 +02:00
Charles Lombardo
15be899580
Merge pull request #11689 from K0bin/android-open-user-folder 
Android: Make button in the settings open user folder
 2023-03-29 10:53:48 -07:00
Robin Kertels
ee563189fd
Android: Adjust user data text to match DocumentProvider 2023-03-26 20:32:43 +02:00
Admiral H. Curtiss
9217a9eba4
JitInterface: Refactor to class, move to System. 2023-03-26 14:38:07 +02:00
Robin Kertels
43d346aba4
Android: Open DocumentProvider directly when tapping the File Manager button 2023-03-24 00:33:42 +01:00