mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-12-22 17:20:48 +03:00
Code Issues Projects Releases Packages Wiki Activity
16032 commits 160 branches 159 tags 271 MiB
Commit graph

16032 commits

This branch
This branch
All branches
Author SHA1 Message Date
Onuray Sahin
da764d7c9a
Merge pull request #6074 from vector-im/feature/ons/poll_refactoring 
Poll refactoring with unit tests (PSF-1020)
 2022-05-19 14:53:45 +03:00
Onuray Sahin
9adbeb8dd2 Fix import. 2022-05-19 14:04:37 +03:00
Onuray Sahin
c518f59359
Merge pull request #6098 from vector-im/live_location_labs_flag 
Labs flag for enabling live location sharing (PSF-799)
 2022-05-19 13:54:32 +03:00
Onuray Sahin
1605ae1607 Merge branch 'develop' into feature/ons/poll_refactoring 
* develop: (251 commits)
  Space explore rooms screen alignment with design in figma (#5834)
  leaving space aligned with ios (#5942)
  Fix usage of System.currentTimeMillis(). This a bit mocky but anyway it's better to use SystemClock.elapsedRealtime() for this case.
  Update TimelinePreviousLastForwardTest.kt
  Changelog.d
  Rename 'getDomain' to 'getServerName'.
  Well-known lookups should not include the port of a server.
  Ah it was used in Gplay variant. Anyway I think we can still remove this now.
  Fix parsing of location data in non encrypted room
  Additionally increment for TimelinePreviousLastForwardTest
  Notify other devices of acceptance of verification request
  Instead of using a magic number, explicitly test for the events we expect.
  Adding comments on some strings and removing non necessary plural
  Remove ShortcutBadger lib and usage (it was dead code)
  Version++
  Fastlane file
  Towncrier
  Add `.login` to get the username of the PR merger.
  Rename folder for the PlayStore
  Remove empty translations
  ...

# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
 2022-05-19 13:39:43 +03:00
Onuray Sahin
2e2dffd9c9 Merge branch 'develop' into live_location_labs_flag 
* develop:
  Space explore rooms screen alignment with design in figma (#5834)
  leaving space aligned with ios (#5942)
  Fix usage of System.currentTimeMillis(). This a bit mocky but anyway it's better to use SystemClock.elapsedRealtime() for this case.
 2022-05-19 12:52:05 +03:00
fedrunov
a30912f688
Space explore rooms screen alignment with design in figma (#5834) 2022-05-19 11:49:20 +02:00
fedrunov
18842b5e3d
leaving space aligned with ios (#5942) 2022-05-19 11:49:08 +02:00
Adam Brown
6bc97df0bb
Merge pull request #6096 from vector-im/feature/bma/use_clock 
Fix usage of System.currentTimeMillis().
 2022-05-19 10:47:10 +01:00
Onuray Sahin
5b43257f35 Changelog added. 2022-05-19 12:44:51 +03:00
Onuray Sahin
51ac6f22d7 Labs flag added for enabling live location sharing. 2022-05-19 12:01:42 +03:00
Benoit Marty
38641c88b7 Fix usage of System.currentTimeMillis(). 
This a bit mocky but anyway it's better to use SystemClock.elapsedRealtime() for this case.
 2022-05-18 20:51:41 +02:00
Michael Kaye
5260e729ac
Merge pull request #6095 from vector-im/michaelk/correct_well_known_behaviour 
Well known lookups should be to port 443 only.
 2022-05-18 16:50:43 +01:00
Michael Kaye
d57841c0d0
Merge pull request #6088 from vector-im/michaelk/fix_forward_pagination_test 
In TimelineForwardPaginationTest, explicitly test for the events we expect
 2022-05-18 16:50:09 +01:00
Michael Kaye
94411ed60e
Update TimelinePreviousLastForwardTest.kt 
Update comments in line with code changes.
 2022-05-18 16:34:39 +01:00
Michael Kaye
9c99d12c44 Changelog.d 2022-05-18 15:32:06 +01:00
Benoit Marty
12644e9915
Merge pull request #5947 from vector-im/feature/bma/renaming 
Small changes
 2022-05-18 16:27:48 +02:00
Michael Kaye
e66284fbd3 Rename 'getDomain' to 'getServerName'. 
In the context of matrix IDs, this removes the leading @name: leaving the hostname or hostname and port.
 2022-05-18 15:21:33 +01:00
Michael Kaye
7efd41e17a Well-known lookups should not include the port of a server. 2022-05-18 15:21:12 +01:00
Benoit Marty
7ae3f6ea40
Merge pull request #6083 from vector-im/feature/bma/remove_badge 
Remove ShortcutBadger lib and usage (it was dead code)
 2022-05-18 16:19:37 +02:00
Maxime NATUREL
738ce18a2f
Merge pull request #5989 from vector-im/feature/mna/PSF-884-location-view 
[Location sharing] - Message for live sharing in timeline (PSF-884)
 2022-05-18 15:39:51 +02:00
Benoit Marty
3a6c03a895 Ah it was used in Gplay variant. Anyway I think we can still remove this now. 2022-05-18 15:05:23 +02:00
Benoit Marty
99d4bbe74b Fix bad copyright 2022-05-18 14:12:44 +02:00
Benoit Marty
98221bab1c
Merge pull request #6085 from vector-im/michaelk/gha_merged_by_needs_login 
Add `.login` to get the username rather than Object in the test failure alerts.
 2022-05-18 14:11:09 +02:00
Maxime NATUREL
4ebd1ea138 Fix parsing of location data in non encrypted room 2022-05-18 13:58:42 +02:00
Michael Kaye
261dadb986 Additionally increment for TimelinePreviousLastForwardTest 2022-05-18 12:37:07 +01:00
dependabot[bot]
dc1a4ae3a2
Bump stem-plugin from 2.0.0 to 2.1.1 
Bumps [stem-plugin](https://github.com/LikeTheSalad/android-stem) from 2.0.0 to 2.1.1.
- [Release notes](https://github.com/LikeTheSalad/android-stem/releases)
- [Changelog](https://github.com/LikeTheSalad/android-stem/blob/master/CHANGELOG.md)
- [Commits](https://github.com/LikeTheSalad/android-stem/compare/2.0.0...2.1.1)

---
updated-dependencies:
- dependency-name: com.likethesalad.android:stem-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-18 11:28:16 +00:00
Onuray Sahin
3bf9ea5b06 Lint fixes. 2022-05-18 14:13:53 +03:00
Jorge Martin Espinosa
6c8e047030
Merge pull request #5916 from vector-im/defect/jmartin/5724_notify_verification_acceptance 
Notify other devices of acceptance of verification request
 2022-05-18 13:10:52 +02:00
Benoit Marty
328d834851 changelog 2022-05-18 13:09:58 +02:00
Onuray Sahin
7ce093e239 Code review fixes. 2022-05-18 13:39:12 +03:00
Jorge Martín
123ad87eda Notify other devices of acceptance of verification request 2022-05-18 12:31:32 +02:00
Benoit Marty
5c9281bc7e Ensure calling 'fail()' is not caught by the Exception handler 2022-05-18 12:26:09 +02:00
Michael Kaye
5a1545058b Instead of using a magic number, explicitly test for the events we expect. 
This permits a clear error when the events are missing / extra and while
not making the test invulnerable to future changes in events, should be
explicit on what's changed.
 2022-05-18 11:25:07 +01:00
Michael Kaye
f7303789a0
Merge pull request #6025 from vector-im/michaelk/skip_tests_failing_on_ci 
Improve test handling in CI
 2022-05-18 09:51:17 +01:00
Maxime NATUREL
e9d93194f1 Adding comments on some strings and removing non necessary plural 2022-05-18 09:48:34 +02:00
Benoit Marty
adb537006a Remove ShortcutBadger lib and usage (it was dead code) 2022-05-18 09:06:04 +02:00
Benoit Marty
8f7789f269 Version++ 2022-05-17 21:28:11 +02:00
Benoit Marty
a1044763ec Merge branch 'release/1.4.16' into develop 2022-05-17 21:27:11 +02:00
Benoit Marty
1d70004165 Fastlane file 2022-05-17 21:26:54 +02:00
Benoit Marty
e14b9a445e Towncrier 2022-05-17 21:13:08 +02:00
Michael Kaye
1c7f95c196 Add .login to get the username of the PR merger. 
I dispair at the github actions docs.
 2022-05-17 17:40:42 +01:00
Benoit Marty
86d808eb4f Rename folder for the PlayStore 2022-05-17 17:54:02 +02:00
Benoit Marty
b6c7a59afc
Merge pull request #6079 from vector-im/feature/bma/fix_strings 
Fix translation
 2022-05-17 17:41:29 +02:00
Benoit Marty
553f8aa37e Remove empty translations 2022-05-17 16:31:15 +02:00
Benoit Marty
ff46791df9 Let's keep this one even if not used. 2022-05-17 16:23:48 +02:00
Benoit Marty
b33d8fe5e1 Remove unused string location_share 2022-05-17 16:04:45 +02:00
Benoit Marty
23d86b55fe Remove unused string a11y_location_share_icon 2022-05-17 16:03:51 +02:00
Benoit Marty
d2ec615e2f Remove unused string settings_flair 2022-05-17 16:02:04 +02:00
Benoit Marty
c0c5d21d4f
Merge pull request #6075 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-05-17 15:59:37 +02:00
Benoit Marty
57ae714cbe
Merge pull request #6072 from vector-im/feature/bma/fix_typing 
Feature/bma/fix typing
 2022-05-17 15:34:15 +02:00