filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,874 Commits 6 Branches 119 Tags 221 MiB
Commit Graph

3232 Commits

Author SHA1 Message Date
Onuray Sahin e92edc7cb1 Fix remember to call the function. 2021-03-02 18:49:11 +01:00
Onuray Sahin ae648c3e11 Make outbound key sharing strategy configurable. 2021-03-02 18:49:11 +01:00
HelaBasa e6265c277e Added translation using Weblate (Sinhala) 2021-03-02 17:32:24 +00:00
Benoit Marty 4e2e73637a Be robust if Event.type is missing (#2946) 2021-03-02 16:14:57 +01:00
Benoit Marty b027e43615 Cleanup 2021-03-02 11:41:20 +01:00
Benoit Marty a8ba125bd2 Rename val for code clarity, and use facility 2021-03-02 11:37:13 +01:00
Benoit Marty 5d69a1ab91 Fix a last bug when all editions has been deleted 2021-03-02 11:30:30 +01:00
Benoit Marty 95395945f2 Also filter redacted events 2021-03-02 11:18:06 +01:00
Benoit Marty c33af6de6a Do not show edition from other users 2021-03-02 11:11:28 +01:00
Benoit Marty d2b39e5cb8 Convert RelationService to suspend (#2449) 2021-03-02 10:52:03 +01:00
dependabot[bot] 8c87716013
Bump libphonenumber from 8.12.18 to 8.12.19 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.18 to 8.12.19.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.18...v8.12.19)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-02 06:59:54 +00:00
Benoit Marty 097668b762 Rework edition of event management - step 2 2021-03-01 20:42:47 +01:00
Benoit Marty 1bfd78753a Ensure we do not edit an Event from another room 2021-03-01 20:42:02 +01:00
Benoit Marty bdec23f740 Rework edition of event management 2021-03-01 20:42:02 +01:00
Benoit Marty c7e7bf4d2c Move VerificationState?.toState() to a dedicated file and in the correct package 2021-03-01 15:47:22 +01:00
Benoit Marty 9a635dd906 Move VerificationState to a dedicated file and in the correct package 2021-03-01 15:47:22 +01:00
Benoit Marty de00bab1d4
Merge pull request #2912 from vector-im/dependabot/gradle/org.matrix.gitlab.matrix-org-olm-3.2.2 
Bump olm from 3.2.1 to 3.2.2
 2021-03-01 10:56:45 +01:00
Besnik Bleta f65c9cf812 Translated using Weblate (Albanian) 
Currently translated at 98.2% (222 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sq/
 2021-02-27 17:34:20 +00:00
Marcelo Filho 3d5a15fb1b Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/pt_BR/
 2021-02-27 17:34:20 +00:00
Ricardo 257fc08404 Translated using Weblate (Spanish) 
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/es/
 2021-02-27 17:34:20 +00:00
dependabot[bot] f6123d8dfd
Bump daggerVersion from 2.32 to 2.33 
Bumps `daggerVersion` from 2.32 to 2.33.

Updates `dagger` from 2.32 to 2.33
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.32...dagger-2.33)

Updates `dagger-compiler` from 2.32 to 2.33
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.32...dagger-2.33)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-26 07:14:10 +00:00
dependabot[bot] f49777ef56
Bump olm from 3.2.1 to 3.2.2 
Bumps olm from 3.2.1 to 3.2.2.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-24 07:15:07 +00:00
Benoit Marty c3192d9f7c Latest improvement 2021-02-23 10:31:19 +01:00
Benoit Marty 24e9e6bbd7 Move to dedicated package and split into several files 2021-02-23 10:31:19 +01:00
Benoit Marty b870a8b791 Create ProgressReporter interface 2021-02-23 10:31:19 +01:00
Benoit Marty 1c83ee086a More rework of DefaultInitialSyncProgressService 2021-02-23 10:31:19 +01:00
Benoit Marty 5e7b36d319 Fix issue with progress 2021-02-23 10:31:19 +01:00
Benoit Marty 4e1fcf87ae Improve DefaultInitialSyncProgressService 2021-02-23 10:31:19 +01:00
Benoit Marty a2225b3f76 Improve code about path 2021-02-23 10:31:19 +01:00
Benoit Marty e069e196af Improve log 2021-02-23 10:31:19 +01:00
Benoit Marty 440d01c552 Do not log RAM usage in release 2021-02-23 10:31:19 +01:00
Benoit Marty 218be86c68 Cleanup 2021-02-23 10:31:19 +01:00
ganfra 3633199e68 Sync : clean a bit by introducing 2 moshi adapters 2021-02-23 10:31:19 +01:00
Benoit Marty 8e2161bd9e Log free memory before starting a task 2021-02-23 10:31:19 +01:00
Benoit Marty 39e66555f4 Try to log RAM usage 2021-02-23 10:31:19 +01:00
Benoit Marty c938795576 Read init sync to a file and split into smaller files to handle it 2021-02-23 10:31:19 +01:00
Martin Johansen ae4062828d Translated using Weblate (Norwegian Bokmål (nb)) 
Currently translated at 3.9% (9 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/nb/
 2021-02-23 07:34:32 +00:00
Nikita Epifanov 8f02c52a26 Translated using Weblate (Russian) 
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/ru/
 2021-02-23 07:34:32 +00:00
XoseM dc4d2fc15d Translated using Weblate (Galician) 
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/gl/
 2021-02-23 07:34:32 +00:00
Benoit Marty b38ff46af4
Merge pull request #2896 from vector-im/feature/bma/dependabot 
Upgrade dependencies
 2021-02-22 12:22:43 +01:00
Benoit Marty e162ebdf91
Merge pull request #2831 from vector-im/feature/bma/hs_version 
Fetch homeserver type and version and display in a new setting screen and add info in rageshakes
 2021-02-22 10:29:16 +01:00
Benoit Marty bf48978065 Fix compilation issue after upgrade of realmfieldnameshelper from 1.1.1 to 2.0.0 2021-02-21 11:08:42 +01:00
dependabot[bot] fd3c41a250 Bump realmfieldnameshelper from 1.1.1 to 2.0.0 
Bumps [realmfieldnameshelper](https://github.com/cmelchior/realmfieldnameshelper) from 1.1.1 to 2.0.0.
- [Release notes](https://github.com/cmelchior/realmfieldnameshelper/releases)
- [Changelog](https://github.com/cmelchior/realmfieldnameshelper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cmelchior/realmfieldnameshelper/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-21 10:45:15 +01:00
XoseM 8250a64e34 Translated using Weblate (Galician) 
Currently translated at 85.8% (194 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/gl/
 2021-02-21 07:34:05 +00:00
waclaw66 58ab82a477 Translated using Weblate (Czech) 
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/cs/
 2021-02-21 07:34:05 +00:00
dependabot[bot] 471620c4c6
Bump robolectric from 4.3 to 4.5.1 
Bumps [robolectric](https://github.com/robolectric/robolectric) from 4.3 to 4.5.1.
- [Release notes](https://github.com/robolectric/robolectric/releases)
- [Commits](https://github.com/robolectric/robolectric/compare/robolectric-4.3...robolectric-4.5.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-20 23:12:11 +00:00
Benoit Marty 75b74eaca8
Merge pull request #2886 from vector-im/dependabot/gradle/io.mockk-mockk-android-1.10.6 
Bump mockk-android from 1.9.2.kotlin12 to 1.10.6
 2021-02-21 00:11:50 +01:00
Benoit Marty 9e33e6bc4e
Merge pull request #2882 from vector-im/dependabot/gradle/io.mockk-mockk-1.10.6 
Bump mockk from 1.9.2.kotlin12 to 1.10.6
 2021-02-21 00:11:08 +01:00
Benoit Marty 4a510d583d
Merge pull request #2876 from vector-im/dependabot/gradle/androidx.work-work-runtime-ktx-2.5.0 
Bump work-runtime-ktx from 2.4.0 to 2.5.0
 2021-02-21 00:07:28 +01:00
SpiritCroc ca0b360875 Merge tag 'v1.1.0' into sc 
Change-Id: I73be281134a8a7ea7fdeffa9356ffae0dda8b0d6

Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
	vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt
	vector/src/main/res/drawable/oval_positive.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/dialog_disclaimer_content.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_generic_with_value.xml
	vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
	vector/src/main/res/menu/menu_timeline.xml
	vector/src/main/res/values/array.xml
 2021-02-20 15:41:01 +01:00
Benoit Marty 56a787b327
Merge pull request #2862 from vector-im/dependabot/gradle/io.realm-realm-gradle-plugin-10.3.1 
Bump realm-gradle-plugin from 10.1.2 to 10.3.1
 2021-02-20 11:28:38 +01:00
Benoit Marty 4defabeecc
Merge pull request #2887 from vector-im/dependabot/gradle/com.squareup.okhttp3-okhttp-bom-4.9.1 
Bump okhttp-bom from 4.8.1 to 4.9.1
 2021-02-20 11:24:45 +01:00
Benoit Marty 273211290b
Merge pull request #2885 from vector-im/dependabot/gradle/org.matrix.gitlab.matrix-org-olm-3.2.1 
Bump olm from 3.1.2 to 3.2.1
 2021-02-20 11:23:50 +01:00
dependabot[bot] 5320d16406
Bump work-runtime-ktx from 2.4.0 to 2.5.0 
Bumps work-runtime-ktx from 2.4.0 to 2.5.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-20 10:22:58 +00:00
Benoit Marty 04e78ec2e9
Merge pull request #2867 from vector-im/dependabot/gradle/retrofit_version-2.9.0 
Bump retrofit_version from 2.6.2 to 2.9.0
 2021-02-20 11:22:06 +01:00
Benoit Marty 17ddab585a
Merge pull request #2878 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.18 
Bump libphonenumber from 8.10.23 to 8.12.18
 2021-02-20 11:19:05 +01:00
Benoit Marty e6eee47059
Merge pull request #2873 from vector-im/dependabot/gradle/androidx.exifinterface-exifinterface-1.3.2 
Bump exifinterface from 1.3.1 to 1.3.2
 2021-02-20 11:18:36 +01:00
dependabot[bot] 5aa50a6c60
Bump mockk from 1.9.2.kotlin12 to 1.10.6 
Bumps [mockk](https://github.com/mockk/mockk) from 1.9.2.kotlin12 to 1.10.6.
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.9.2.kotlin12...1.10.6)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-20 10:07:19 +00:00
dependabot[bot] f2bbfa1b0d
Bump okhttp-bom from 4.8.1 to 4.9.1 
Bumps [okhttp-bom](https://github.com/square/okhttp) from 4.8.1 to 4.9.1.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.8.1...parent-4.9.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:27:04 +00:00
dependabot[bot] 6f01e3b99b
Bump mockk-android from 1.9.2.kotlin12 to 1.10.6 
Bumps [mockk-android](https://github.com/mockk/mockk) from 1.9.2.kotlin12 to 1.10.6.
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.9.2.kotlin12...1.10.6)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:23:31 +00:00
dependabot[bot] e10dc2e5a1
Bump olm from 3.1.2 to 3.2.1 
Bumps olm from 3.1.2 to 3.2.1.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:23:28 +00:00
dependabot[bot] dfc57d1985
Bump libphonenumber from 8.10.23 to 8.12.18 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.10.23 to 8.12.18.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.10.23...v8.12.18)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:22:13 +00:00
dependabot[bot] d1c49e2a04
Bump exifinterface from 1.3.1 to 1.3.2 
Bumps exifinterface from 1.3.1 to 1.3.2.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:21:40 +00:00
dependabot[bot] bfa84e092c
Bump retrofit_version from 2.6.2 to 2.9.0 
Bumps `retrofit_version` from 2.6.2 to 2.9.0.

Updates `retrofit` from 2.6.2 to 2.9.0
- [Release notes](https://github.com/square/retrofit/releases)
- [Changelog](https://github.com/square/retrofit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/retrofit/compare/parent-2.6.2...2.9.0)

Updates `converter-moshi` from 2.6.2 to 2.9.0
- [Release notes](https://github.com/square/retrofit/releases)
- [Changelog](https://github.com/square/retrofit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/retrofit/compare/parent-2.6.2...2.9.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:21:11 +00:00
dependabot[bot] 7d287d7c63
Bump kluent-android from 1.61 to 1.65 
Bumps kluent-android from 1.61 to 1.65.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:18:28 +00:00
dependabot[bot] 6df58a796a
Bump realm-gradle-plugin from 10.1.2 to 10.3.1 
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java) from 10.1.2 to 10.3.1.
- [Release notes](https://github.com/realm/realm-java/releases)
- [Changelog](https://github.com/realm/realm-java/blob/v10.3.1/CHANGELOG.md)
- [Commits](https://github.com/realm/realm-java/compare/v10.1.2...v10.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:18:24 +00:00
Benoit Marty e50d2f7809
Merge pull request #2856 from vector-im/dependabot/gradle/junit-junit-4.13.2 
Bump junit from 4.13 to 4.13.2
 2021-02-20 00:13:21 +01:00
dependabot[bot] 2c605d9ffb
Bump junit from 4.13 to 4.13.2 
Bumps [junit](https://github.com/junit-team/junit4) from 4.13 to 4.13.2.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.2.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.13...r4.13.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 21:52:31 +00:00
dependabot[bot] 7a81eec6d8
Bump daggerVersion from 2.31 to 2.32 
Bumps `daggerVersion` from 2.31 to 2.32.

Updates `dagger` from 2.31 to 2.32
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.31...dagger-2.32)

Updates `dagger-compiler` from 2.31 to 2.32
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.31...dagger-2.32)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 21:52:23 +00:00
Benoit Marty f9f54cabdd Add upload capability on the screen and give possibility to refresh the data 2021-02-19 21:29:23 +01:00
Benoit Marty 531beb0a86 Add a screen to view details about the homeserver 2021-02-19 21:27:25 +01:00
Benoit Marty a8be5ed6b0 Create FederationModule 2021-02-19 21:27:25 +01:00
Benoit Marty 1294d211d6
Merge branch 'develop' into feature/bma/fix_redirection 2021-02-19 14:43:01 +01:00
Benoit Marty e8026c6d3f
Naming convention 2021-02-19 13:53:38 +01:00
Benoit Marty 544c1e4a6a Also fix the problem of cleanup too early (or done several times in case of bad password) for DefaultFinalizeAddingThreePidTask 2021-02-18 19:23:31 +01:00
Benoit Marty 2271ddacf8 Remove unused task and API 2021-02-18 19:05:42 +01:00
Benoit Marty 9443b80811 Fix test: ensure the session is open 2021-02-18 18:46:23 +01:00
Benoit Marty 5afdc81ce0 Moar cleanup 2021-02-18 18:43:48 +01:00
Benoit Marty 2df9b43abc Make the code a bit easier to understand (no change) 2021-02-18 18:42:55 +01:00
Benoit Marty 73e93e7d3d Doc and method signature 2021-02-18 17:56:05 +01:00
Benoit Marty c76ced68e0 Make the code a bit easier to understand (no other change) 2021-02-18 17:47:11 +01:00
Benoit Marty dea76fd81b Fix test compilation 2021-02-18 15:36:51 +01:00
LinAGKar 04c1cbd38e Translated using Weblate (Swedish) 
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sv/
 2021-02-18 03:34:08 +00:00
Jeff Huang a66f609a07 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/zh_Hant/
 2021-02-18 03:34:07 +00:00
XoseM 263b8b1e77 Translated using Weblate (Galician) 
Currently translated at 85.3% (193 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/gl/
 2021-02-18 03:34:07 +00:00
@a2sc:matrix.org ca2c4a64e9 Translated using Weblate (German) 
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/de/
 2021-02-18 03:34:07 +00:00
zer0-x 5547f11192 Translated using Weblate (Arabic) 
Currently translated at 84.5% (191 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/ar/
 2021-02-18 03:34:06 +00:00
Benoit Marty 51fd45d317 typo and doc 2021-02-17 18:18:36 +01:00
Benoit Marty 0e322630f1 Ignore url override from credential if it is not valid (#2822) 2021-02-17 18:18:36 +01:00
Benoit Marty d19cedef88 Less code 2021-02-17 18:18:36 +01:00
Benoit Marty 6aa5dc992d Migrate AuthenticationService API to coroutines (#2449) 2021-02-17 18:18:36 +01:00
Benoit Marty 373586c23e Cleanup 2021-02-17 10:25:06 +01:00
ganfra 776ebce497 Merge branch 'develop' into feature/fga/fix_some_voip_issues 2021-02-16 16:06:12 +01:00
ganfra 79acf1cc42 Fix copyright 2021-02-16 15:57:23 +01:00
Benoit Marty b3a408a34c
Merge pull request #2805 from vector-im/feature/bca/devtools 
Dev tools initial commit
 2021-02-16 09:46:49 +01:00
ganfra 3170d4428c VoIP: extract the PSTNProtocoltChecker to the SDK 2021-02-15 19:34:37 +01:00
Benoit Marty cf0b4d2581 Merge branch 'develop' into feature/bca/devtools 2021-02-15 16:00:32 +01:00
Benoit Marty 59634753b3 Code review 2021-02-15 15:03:58 +01:00
Slobodan Simić adea3ab775 Translated using Weblate (Serbian) 
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sr/
 2021-02-15 12:08:01 +00:00
random 96b46af9f5 Translated using Weblate (Italian) 
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/it/
 2021-02-15 12:07:58 +00:00
Priit Jõerüüt b3a9e20885 Translated using Weblate (Estonian) 
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/et/
 2021-02-15 12:07:57 +00:00
@a2sc:matrix.org 1f92e61d3c Translated using Weblate (German) 
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/de/
 2021-02-15 12:07:57 +00:00
Auri B. P a41b4a3621 Translated using Weblate (Catalan) 
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/ca/
 2021-02-15 12:07:57 +00:00
zer0-x 60041d433e Translated using Weblate (Arabic) 
Currently translated at 55.7% (126 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/ar/
 2021-02-15 12:07:57 +00:00
Weblate 2ac1287924 Merge branch 'origin/develop' into Weblate. 2021-02-12 10:30:37 +00:00
Andrejs 6203c393d7 Translated using Weblate (Latvian) 
Currently translated at 88.1% (194 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/lv/
 2021-02-12 10:30:25 +00:00
Benoit Marty 1978a180ff Compute WidgetUrl "onDemand" to properly handle the theme value 2021-02-10 16:10:32 +01:00
Benoit Marty 463f2a7ad7 Widget: resolve the avatar URL 2021-02-10 13:41:01 +01:00
SpiritCroc 04f4e13230 Merge tag 'v1.0.17' into sc 
Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt

Note:
Upstream added their own "pass theme to widgets" implementation, which
currently does not respect "black" themes (but treats them as "dark"
themes).
For now, let's integrate our own implementation into the new one.

Change-Id: If99f2f87e20215595fc36996bb530bf5f247b0cb
 2021-02-10 11:05:22 +01:00
Valere e5da026f1f Dev tools initial commit 2021-02-10 10:17:19 +01:00
ganfra 370b9dabff VoIP: made some minor changes after review 2021-02-09 19:42:05 +01:00
SpiritCroc 2c22f1e926 Treat manually unread chats as notifications in bottom tabs 
Change-Id: I34cea91674843d8d60285295b449d2722cb061e9
 2021-02-09 17:48:00 +01:00
Benoit Marty 2cbce016bc Add missing case in a (not used) fun 2021-02-09 12:59:23 +01:00
Benoit Marty f78c72db59 Merge branch 'develop' into feature/fga/voip_v1_start 2021-02-09 11:52:18 +01:00
ganfra 5c4cf3f7c9 VoIP: PR review remarks 2021-02-08 18:43:50 +01:00
Benoit Marty fade21de57
Merge branch 'develop' into feature/bma/jitsi_in_timeline 2021-02-08 17:43:49 +01:00
ganfra 0ed327646a Merge branch 'develop' into feature/fga/voip_v1_start 2021-02-08 16:45:15 +01:00
Benoit Marty eecb789603
Merge pull request #2765 from vector-im/feature/bma/big_e2e_rooms 
[DANGEROUS PR] Properly delete all objects from Realm, avoid orphaned
 2021-02-08 15:44:43 +01:00
Benoit Marty d2c912e5c4
Merge branch 'develop' into feature/bma/url_preview_fixes 2021-02-08 14:32:55 +01:00
Benoit Marty f2619df13d Import and cleanup 2021-02-08 14:25:33 +01:00
Benoit Marty 30be440774 Sugar: defined extensions fo deleteOnCascade() methods, as they have to be called in a transaction 2021-02-08 12:37:38 +01:00
Benoit Marty 8363eba32e Better test of a reply 2021-02-08 10:12:01 +01:00
XoseM e9e3c0d011 Translated using Weblate (Galician) 
Currently translated at 44.5% (98 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/gl/
 2021-02-08 07:33:39 +00:00
Benoit Marty b0e5d5d3e5 Copyright 2021-02-07 20:21:31 +01:00
Benoit Marty 07220d7a59 URL preview on reply fallback (#2756) 2021-02-07 15:28:07 +01:00
Benoit Marty 6ee6b0cad9 Ensure no invisible displayName will be used 2021-02-07 12:00:33 +01:00
Benoit Marty d47ba6bd11 Create a WidgetItemFactory and use it for better rendering of Jitsi widget change (video conference) 2021-02-06 16:52:46 +01:00
Benoit Marty d903dfb40b
Merge branch 'develop' into feature/bma/widget_url_robustness 2021-02-06 11:19:15 +01:00
Benoit Marty 41e4e823fb HTML unescaping for URL preview (#2766) 2021-02-05 20:40:57 +01:00
Benoit Marty ad187f99bf
Merge pull request #2779 from vector-im/feature/bca/fix_join_by_alias_deferation 
Join room other federation via alias error
 2021-02-05 18:48:23 +01:00
Benoit Marty 6ecd63bf5d Fix a new bug 2021-02-05 13:25:58 +01:00
Benoit Marty afd2ecd384 Remove duplicated method 2021-02-05 12:10:25 +01:00
Benoit Marty 557a5c715a Widget URL: properly encode parameters 2021-02-05 11:47:35 +01:00
Benoit Marty b068dc39eb Update doc 2021-02-05 11:36:12 +01:00
Benoit Marty 5b3065730e Widget: avoid empty user display name 2021-02-05 09:36:29 +01:00
Benoit Marty dd0be54b05 Fix lint issue and typo 2021-02-04 20:19:02 +01:00
Benoit Marty 0c613e36f1 Fix lint issue 2021-02-04 18:10:57 +01:00
Valere 6d5f89b65b Fixes #2778 2021-02-04 18:06:35 +01:00
SpiritCroc c2ce787310 Merge tag 'v1.0.16' into sc 
Change-Id: Ia65e40a4acaee3f26a5680f05b3ae1bf8327d4d6

Conflicts:
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
 2021-02-04 17:10:15 +01:00
ganfra 6cd462f852 Merge branch 'develop' into feature/fga/voip_v1_start 2021-02-04 16:52:06 +01:00
Weblate 63fb5809bf Merge branch 'origin/develop' into Weblate. 2021-02-03 16:36:51 +00:00
Benoit Marty 9b13381938
Merge pull request #2762 from vector-im/feature/bma/track 
Improvements
 2021-02-03 17:02:25 +01:00
Benoit Marty bc22647b48
Merge pull request #2753 from vector-im/feature/bca/sso_reauth 
Feature/bca/sso reauth
 2021-02-03 16:12:54 +01:00
Benoit Marty ad9873c565 Some cleanup 2021-02-03 14:52:58 +01:00
Valere e976100f1a Fix test compilation error 2021-02-03 14:48:43 +01:00
Valere 289a3ab21f remove dev id for now 2021-02-03 14:36:38 +01:00
Weblate cbda0ad37b Merge branch 'origin/develop' into Weblate. 2021-02-03 08:53:37 +00:00
Slobodan Simić db6fdcd098 Translated using Weblate (Serbian) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sr/
 2021-02-03 08:53:28 +00:00
Benoit Marty 424035f56f Better clearing of RealmLists 2021-02-03 09:46:35 +01:00
Valere 697b551b9b Cleaning / Code review 2021-02-02 23:10:14 +01:00
Valere 0211197c47 SSO UIA for add 3pid + refactoring move RegistrationFlow to api 2021-02-02 22:25:49 +01:00
Benoit Marty 3b65761110 Delete on cascade 2021-02-02 21:23:57 +01:00
Benoit Marty cfdfd3a8af internal 2021-02-02 21:22:54 +01:00
Benoit Marty a820443c56 Fix copyright 2021-02-02 13:05:39 +01:00
Valere 2a3962265b SSO UIA for deactivate account 2021-02-02 12:30:46 +01:00
Slobodan Simić 883a22ba83 Translated using Weblate (Serbian) 
Currently translated at 89.5% (197 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sr/
 2021-02-02 11:21:10 +00:00
sr093906 3e87534ddc Translated using Weblate (Chinese (Simplified)) 
Currently translated at 86.3% (190 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/zh_Hans/
 2021-02-02 11:21:09 +00:00
Benoit Marty e6fc605b08 Data for Worker overload (#2721) 2021-02-02 11:40:52 +01:00
Valere 8129cd0cd3 Cleaning + changelog 2021-02-02 09:32:04 +01:00
ganfra 9c9c1fa79c VoIP: make some clean up and update CHANGES 2021-02-01 19:19:46 +01:00
Valere 76b425ee8a Cleaning 2021-02-01 16:39:14 +01:00
Valere 5b8215a356 Support SSO provider brand + UI fixes 2021-02-01 16:39:14 +01:00
Valere 9c7df25862 Relax rule for e2e by default 2021-02-01 16:39:14 +01:00
Valere da16ec0af3 UIA fixes + better error support 2021-02-01 16:39:14 +01:00
Valere 1244d00b31 SSO UIA 2021-02-01 16:39:14 +01:00
Onuray Sahin 06be3e691d Support $matrix_widget_id parameter. 2021-02-01 18:13:26 +03:00
Slobodan Simić 323a0a5aeb Translated using Weblate (Serbian) 
Currently translated at 45.9% (101 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sr/
 2021-02-01 02:35:53 +00:00
Ihor Hordiichuk d4516080a2 Translated using Weblate (Ukrainian) 
Currently translated at 70.0% (154 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/uk/
 2021-02-01 02:35:53 +00:00
Flat Earth Israel Association 60d492370f Added translation using Weblate (Hebrew) 2021-01-30 21:52:40 +00:00
ganfra f4fd8af3b4 Merge branch 'develop' into feature/fga/voip_v1_start 2021-01-29 18:46:19 +01:00
ganfra 940563f663 Merge branch 'feature/fga/voip_dial_pad' into feature/fga/voip_v1_start 2021-01-29 16:37:46 +01:00
ganfra 191cef6fff VoIP: clean after PR's review 2021-01-29 16:34:30 +01:00
Slobodan Simić c9a124ba59 Translated using Weblate (Serbian) 
Currently translated at 17.2% (38 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sr/
 2021-01-29 11:36:00 +00:00
waclaw66 788406a549 Translated using Weblate (Czech) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/cs/
 2021-01-29 11:36:00 +00:00
ganfra 88e18a8640 VoIP: fix a bunch of issues 2021-01-27 16:55:34 +01:00
ganfra 1ef9ed5202 VoIP : clean code 2021-01-27 16:05:55 +01:00
Benoit Marty c794843bb2 Inject the context in the constructor 2021-01-26 17:16:55 +01:00
Benoit Marty d6a5b9fb48 fulfill assertion about eventId 2021-01-25 16:42:53 +01:00
Benoit Marty 57dba2f29a
Merge branch 'develop' into feature/ons/fix_url_preview_on_edit 2021-01-25 16:05:26 +01:00
Benoit Marty f64db7f5f3 Fix test compilation 2021-01-25 16:03:31 +01:00
Benoit Marty 128d3845b9 Small rework 2021-01-25 15:19:01 +01:00
Benoit Marty 602ea3327b URL preview: improve fix regarding message edition 2021-01-25 15:11:42 +01:00
Benoit Marty e55178612c
Merge pull request #2665 from vector-im/feature/bca/dendrite_sync_fix 
Fix Dendrite sync response support
 2021-01-25 14:23:13 +01:00
Benoit Marty 5a0d62db6f Cleanup (PR review) 
Also add some doc and add missing `internal` keyword
 2021-01-25 12:42:39 +01:00
Ihor Hordiichuk 35c59e699a Translated using Weblate (Ukrainian) 
Currently translated at 53.1% (117 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/uk/
 2021-01-24 19:36:38 +00:00
@a2sc:matrix.org 633b80c622 Translated using Weblate (German) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/de/
 2021-01-24 19:36:38 +00:00
Auri B. P b37c203885 Translated using Weblate (Catalan) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/ca/
 2021-01-24 19:36:38 +00:00
Benoit Marty b65fc4f46b rename val 2021-01-22 17:59:56 +01:00
Benoit Marty 401b5e2b7a Move private fun 2021-01-22 17:48:13 +01:00
Benoit Marty a44d00a31c Create data class. 2021-01-22 17:44:24 +01:00
Benoit Marty 267ae457ee Use const 2021-01-22 17:38:17 +01:00
Benoit Marty 887da0a3d6 Improve code #2 2021-01-22 17:37:25 +01:00
Benoit Marty 07ffd3ded3 Improve code 2021-01-22 17:32:00 +01:00
Benoit Marty 25dbb3e9ea Fix bad copy/paste 2021-01-22 17:26:10 +01:00
Benoit Marty 0a96841336
Merge branch 'develop' into develop 2021-01-22 17:20:36 +01:00
Benoit Marty 4dcd7846b0
Merge pull request #2616 from vector-im/feature/ons/android_11_migration 
Migrate to Android 11, API 30.
 2021-01-22 17:17:04 +01:00
Andrew Ferrazzutti daf019b288 Identity: Recompute hashes after M_INVALID_PEPPER 
When a new pepper is retrieved after an M_INVALID_PEPPER response,
recompute hashes with that pepper, and send those new hashes in the next
lookup attempt instead of reusing the original hashes.

Signed-off-by: Andrew Ferrazzutti <fair@miscworks.net>
 2021-01-21 21:52:19 -05:00
Onuray Sahin 5eeb545ae2 Update url preview when the event is edited. 2021-01-21 15:20:19 +03:00
Benoit Marty c75eb050df Cleanup and fix test compilation 2021-01-20 16:32:41 +01:00
Benoit Marty 4709002429 Fix clear cache issue: sometimes, after a clear cache, there is still a token, so the init sync service is not started. 
Migratiing to supend methods fixes the problem, I'm not sure why...
 2021-01-20 15:19:48 +01:00
XoseM f1390bdd29 Translated using Weblate (Galician) 
Currently translated at 36.3% (80 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/gl/
 2021-01-19 18:35:55 +00:00
ganfra 0f77c5be90 VoIP : branch dialpad in transfer call screen 2021-01-19 10:46:43 +01:00
Slobodan Simić dd7aadd01c Translated using Weblate (Serbian) 
Currently translated at 10.4% (23 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sr/
 2021-01-17 15:36:07 +00:00
MamasLT b3d102d56e Translated using Weblate (Lithuanian) 
Currently translated at 14.5% (32 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/lt/
 2021-01-17 15:36:03 +00:00
notramo ac7e13a701 Translated using Weblate (Hungarian) 
Currently translated at 80.0% (176 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/hu/
 2021-01-17 15:36:03 +00:00
Slobodan Simić 0593f2f928 Added translation using Weblate (Serbian) 2021-01-17 09:09:59 +00:00
SpiritCroc 53c498b728 Merge tag 'v1.0.14' into sc 
Change-Id: I0d3df2f8c5f4e611f3268c4c4d2784f7eac89bb5

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/UrlsExtractor.kt
	vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt
	vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2021-01-16 11:21:09 +01:00
ganfra 2c0b7ce0f4 Dagger: update to 2.31 and use new AssistedInject 2021-01-15 15:23:24 +01:00
ganfra 55fd983fd3 Merge branch 'feature/fga/voip_v1_start' into feature/fga/voip_dial_pad 2021-01-14 15:10:07 +01:00
Benoit Marty d6ef3ea08e Fix lint issues 2021-01-14 14:08:08 +01:00
ganfra 3e4a41bd73 DialPad: clean code 2021-01-14 12:35:00 +01:00
Benoit Marty 844fe2c4cd
Merge branch 'develop' into feature/bca/crypto_store_outbound 2021-01-14 10:43:38 +01:00
Benoit Marty 69efb45fb7
Merge pull request #2659 from vector-im/feature/bma/fix_init_sync 
Fix issue with delay set to 0
 2021-01-14 10:41:10 +01:00
Benoit Marty c88072e55f
Merge branch 'develop' into feature/bma/investigation 2021-01-14 10:38:56 +01:00
Weblate de73539d2b Merge branch 'origin/develop' into Weblate. 2021-01-13 15:00:03 +00:00
Valere 36b1a1471a Fix Dendrite sync response support 2021-01-13 14:23:45 +01:00
ganfra 14502573bf DialPad: integrate getThirdPartyUser with protocol and add helper for create DM 2021-01-12 20:10:52 +01:00
Benoit Marty 7446b12827 Fix request too large Uri error when joining a room 2021-01-12 18:16:35 +01:00
Benoit Marty 2ea45185d4 Ensure the service is restarted with the correct intent 2021-01-12 16:26:52 +01:00
Benoit Marty 50ba131350 More renaming 2021-01-12 16:18:29 +01:00
Benoit Marty b2df107f17 Remove unused params 2021-01-12 16:11:22 +01:00
Benoit Marty 609ceb7fa4 Avoid Magic numbers 2021-01-12 16:07:49 +01:00
Benoit Marty aac3f379a7 Add a log 2021-01-12 16:07:49 +01:00
Benoit Marty ec0a04e893 timeout -> restart without delay 2021-01-12 16:07:49 +01:00
Benoit Marty 8307245120 Fix issue with delay set to 0 2021-01-12 16:07:49 +01:00
Benoit Marty 5431584b3c
Merge pull request #2627 from vector-im/feature/bma/edit_power_level 
Edit power level
 2021-01-12 10:31:17 +01:00
Valere 426782a001 remember groupId in session cache 2021-01-12 09:48:02 +01:00
Valere 7eb9941f8c Code review 2021-01-12 09:14:30 +01:00
ganfra 268d740059 Create ThirdPartyService and move related methods into it 2021-01-11 19:38:05 +01:00
SpiritCroc 0049f48148 Also fallback to other user's avatar for 2-person-rooms not marked as DM 
Same behaviour as on desktop.

Change-Id: Ia32fad4f79c0615562b719fcf1013eca4575ee7f
 2021-01-11 11:15:27 +01:00
gkkulik 6d5e1b2285 Added translation using Weblate (Silesian) 2021-01-08 22:30:19 +00:00
ganfra dd67e8c5b5 Merge branch 'develop' into feature/fga/voip_v1_start 2021-01-08 16:30:37 +01:00
Benoit Marty 8de4b0bb20 Small formatting 2021-01-08 15:55:32 +01:00
ganfra d91ed2985d Sync: fix initial sync is not retried correctly when there is some network error. [#2632] 2021-01-08 12:42:36 +01:00
Benoit Marty 2d91865277
Merge pull request #2624 from vector-im/feature/bma/avoidEventBus2 
Remove dependency to org.greenrobot.eventbus library
 2021-01-08 10:04:38 +01:00
Benoit Marty 2a365d6776 Move interface to correct location 2021-01-07 18:28:05 +01:00
Valere afa1cf7d6c Cleaning 2021-01-07 11:18:05 +01:00
Benoit Marty a6f909b942 Add Javadoc 2021-01-07 11:04:11 +01:00
Benoit Marty ae55ee82a7 Cleanup 2021-01-07 00:07:40 +01:00
Benoit Marty 81bdf506bc Fix Int type issue when sending PowerLevelsContent to the server 2021-01-06 22:53:51 +01:00
Benoit Marty 0702eee179 Improve code 2021-01-06 18:38:06 +01:00
Benoit Marty 22c10f5ada Prefer immutable type 2021-01-06 12:24:47 +01:00
Benoit Marty 963c30a275 Remove dependency to org.greenrobot.eventbus library 2021-01-05 18:56:24 +01:00
Benoit Marty 3a9b80127f Warn user when he is leaving a not public room (#1460) 2021-01-05 11:46:59 +01:00
Valere 4ee34126bd Persist outbound group session 2021-01-05 10:04:34 +01:00
Benoit Marty c34fea2932 Do not defien Element Stuff in the SDK 2021-01-04 18:16:12 +01:00
Onuray Sahin 23623b8895 Migrate to Android 11, API 30. 2021-01-04 17:12:49 +03:00
Danial Behzadi 83f2ff5d82 Translated using Weblate (Persian) 
Currently translated at 87.7% (193 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/fa/
 2021-01-03 12:35:41 +00:00
LinAGKar 594ee61a99 Translated using Weblate (Swedish) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sv/
 2020-12-29 22:35:44 +00:00
zeritti c85b0124e3 Translated using Weblate (Czech) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/cs/
 2020-12-29 22:35:44 +00:00