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

16663 Commits

Author SHA1 Message Date
ClaireG b379ef46ec
Revert: Use member name instead of room name in DM creation item (#6049) 2022-05-19 14:14:58 +00:00
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
Michael Kaye a4fa65b4fd Fix linting 2022-05-19 12:37:41 +01:00
Michael Kaye fe793798fa Ignore E2eeSanityTests. 
They fail infrequently, but in a way that takes the entire test framework down,
so ignore them for now and open an issue to fix.
 2022-05-19 12:06:54 +01: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
Olivér Falvai f036d35829 Merge branch 'develop' into dependency-cleanup 2022-05-19 12:27:09 +02:00
Olivér Falvai 4290945118 Enable parallelism 2022-05-19 12:09:45 +02:00
Olivér Falvai bc050d3030 Tweak JVM memory settings 2022-05-19 12:08:17 +02: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
Michael Kaye 28c4abb505 Track number of retries of tests, and retry KeysBackupTest 2022-05-19 10:34:38 +01:00
Olivér Falvai 464735f829 Move dependency analysis to its own job 2022-05-19 11:31:32 +02:00
Onuray Sahin 51ac6f22d7 Labs flag added for enabling live location sharing. 2022-05-19 12:01:42 +03:00
Olivér Falvai c093b3476f Limit parallel Gradle tasks 2022-05-19 10:57:06 +02:00
ericdecanini 93264812c0 Adds back navigation to spaces 2022-05-19 10:20:46 +02: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
Olivér Falvai 86663ec073 Fine tune dependency analysis, add CI workflow 2022-05-18 18:47:52 +02:00
Olivér Falvai 6c569e6f9d Bring back a false positive 2022-05-18 18:22:36 +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
Maxime NATUREL 5265856772 Remove unused imports 2022-05-18 14:44:44 +02:00
Maxime NATUREL 4864980a5a Enable navigation only from running state item 2022-05-18 14:44:44 +02:00
Maxime NATUREL 23e8cad10f Rollback to Fragment to be able to use Maverick capabilities 2022-05-18 14:44:44 +02:00
Maxime NATUREL 26cddd2d0d Use SupportMapFragment instead of custom fragment 2022-05-18 14:44:44 +02:00
Maxime NATUREL 54d7d47dfc Updating the title of the map view screen 2022-05-18 14:44:44 +02:00
Maxime NATUREL 52c0fa41c6 Creation of map view screen and basic navigation 2022-05-18 14:44:44 +02:00
Maxime NATUREL b2765e4b63 Adding changelog entry 2022-05-18 14:44:44 +02:00
Olivér Falvai 388e35e828 Remove even more deps 2022-05-18 14:19:11 +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
ariskotsomitopoulos 5532e7dfa1 Fix copyright 2022-05-18 14:57:50 +03: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