jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,436 Commits 4 Branches 3 Tags 186 MiB
Commit Graph

14436 Commits

Author SHA1 Message Date
Benoit Marty 57bee40211 Fix compilation warning (exhaustive when) 2022-03-22 16:13:06 +01:00
Benoit Marty 7502158ba9 Fix compilation warning (exhaustive when) 2022-03-22 16:13:06 +01:00
Benoit Marty ed62a2f1c9 Format file (no other change) 2022-03-22 16:13:06 +01:00
Benoit Marty f07c9bf105 Fix compilation warning (exhaustive when) 2022-03-22 16:13:06 +01:00
dependabot[bot] e169c81a2c Bump moshi from 1.12.0 to 1.13.0 
Bumps `moshi` from 1.12.0 to 1.13.0.

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

Updates `moshi-kotlin-codegen` from 1.12.0 to 1.13.0
- [Release notes](https://github.com/square/moshi/releases)
- [Changelog](https://github.com/square/moshi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/moshi/compare/moshi-parent-1.12.0...moshi-parent-1.13.0)

---
updated-dependencies:
- dependency-name: com.squareup.moshi:moshi-adapters
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.squareup.moshi:moshi-kotlin-codegen
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-22 16:13:06 +01:00
dependabot[bot] 6f55a25a30 Bump kotlin-gradle-plugin from 1.5.31 to 1.6.0 
Bumps [kotlin-gradle-plugin](https://github.com/JetBrains/kotlin) from 1.5.31 to 1.6.0.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/commits)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-22 16:13:06 +01:00
ganfra 073475854e
Merge pull request #5564 from SpiritCroc/timeline-chunk-double-linking 
Fix another case of read markers not updating: Ensure proper double linking of TimelineChunks
 2022-03-22 15:46:48 +01:00
ganfra 67804da205
Merge pull request #5604 from vector-im/feature/adm/toolbar-icon-positions 
Fixing presence icon anchoring to the middle of the room icon
 2022-03-22 15:16:17 +01:00
ganfra a2f64e7f3c
Merge pull request #5576 from vector-im/feature/aris/thread_labs_notice_users 
Threads Migration
 2022-03-22 14:57:07 +01:00
Adam Brown 1e6e8b546d fixing presence icon anchoring to the middle of the room icon 
- creates a secondary verification shield and aligns to the start of the room title when presence is present
 2022-03-22 13:43:43 +00:00
ariskotsomitopoulos c6593f0cee PR remarks 2022-03-22 13:57:20 +02:00
Adam Brown 21e46c5840
Merge pull request #5601 from vector-im/dependabot/gradle/org.json-json-20220320 
Bump json from 20211205 to 20220320
 2022-03-22 11:00:13 +00:00
ariskotsomitopoulos a431d885f0 Increase the thread summaries limit 2022-03-22 11:20:47 +02:00
dependabot[bot] c2e3c63100
Bump json from 20211205 to 20220320 
Bumps [json](https://github.com/douglascrockford/JSON-java) from 20211205 to 20220320.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-21 23:09:06 +00:00
ganfra 794131d274
Merge pull request #5551 from SpiritCroc/local-echo 
Fix local echos not being shown when re-opening rooms
 2022-03-21 19:24:07 +01:00
Michael Kaye 4a8aeadbcf
Merge pull request #5471 from vector-im/michaelk/ci_script_improvements 
CI Script improvements
 2022-03-21 15:06:11 +00:00
Benoit Marty 835497682f
Merge pull request #5572 from p1gp1g/play-sticker 
Show stickers on click
 2022-03-21 15:51:36 +01:00
Benoit Marty 579e6164d6
Merge pull request #5550 from vector-im/feature/adm/presence-theme-patch 
Presence indicator theme attribute
 2022-03-21 15:45:36 +01:00
Benoit Marty 176895a37d
Merge pull request #5589 from vector-im/sync-emojis 
Sync Emojis
 2022-03-21 15:42:43 +01:00
Michael Kaye c687252fb6
Update .github/workflows/nightly.yml 2022-03-21 14:31:17 +00:00
ariskotsomitopoulos ed2cb5f0fe Enhance text constants 2022-03-21 15:45:08 +02:00
bmarty ffb007e96d Sync Emojis 2022-03-21 00:03:12 +00:00
Adam Brown ea9c9ae490
Merge pull request #5408 from vector-im/feature/adm/onboarding-tests 
FTUE - Onboarding registration steps unit tests
 2022-03-18 15:57:38 +00:00
Maxime NATUREL 4761f7701b
Merge pull request #5579 from vector-im/feature/mna/PSF-664-5571-live-location-indicator 
#5571: Live location status bar indicator
 2022-03-18 16:30:41 +01:00
Maxime Naturel d1aba46b52 Using one line per parameter for the custom view 2022-03-18 15:58:42 +01:00
Maxime Naturel 840a224c9f Fixing coding style issue 2022-03-18 15:01:44 +01:00
Adam Brown ce2c309d72 including verification to ensure no other methods are being called 2022-03-18 14:00:56 +00:00
ariskotsomitopoulos e574fda099 Remove unused import 2022-03-18 14:55:14 +01:00
ariskotsomitopoulos 06db7e2374 Enhance migration logic & PR remarks 2022-03-18 14:51:06 +01:00
ariskotsomitopoulos fd4d99d6fc Possible NullPointerException crash fix 2022-03-18 14:50:34 +01:00
Adam Brown 7f943d37fd explicitly declaring the fake registrationb wizard as not relaxed and creating new test instances for each case 2022-03-18 13:15:14 +00:00
Maxime Naturel 526d11e912 Removing TODO 2022-03-18 14:12:55 +01:00
Maxime Naturel 56bffb2657 Adding stop button 2022-03-18 14:11:16 +01:00
Maxime Naturel 67297bbdef Custom View in timeline screen without stop button 2022-03-18 14:11:08 +01:00
Maxime Naturel 70ab5354c3 Adding strings of the view 2022-03-18 14:10:57 +01:00
Maxime Naturel 32f18d5af3 Adding changelog entry 2022-03-18 14:10:47 +01:00
Maxime NATUREL 3547c5acba
Merge pull request #5565 from vector-im/feature/mna/PSF-664-5536-permissions 
Live Location Sharing - Background permission
 2022-03-18 12:06:30 +01:00
ariskotsomitopoulos 2e5d45ec6e Format code 2022-03-18 12:03:17 +01:00
ariskotsomitopoulos f00b1f29bf Enhance text context for thread migration notice 2022-03-18 11:58:29 +01:00
Valere 189683a8a1
Merge pull request #5552 from SpiritCroc/timeline-decryptor-crash 
Fix crash when closing room during timeline decryption
 2022-03-18 11:34:27 +01:00
ariskotsomitopoulos a0e6dd5f6c Merge branch 'develop' into feature/aris/thread_labs_notice_users 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
#	vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
 2022-03-18 11:28:21 +01:00
aringenbach 1d74e34362
Merge pull request #5566 from vector-im/feature/aringenbach/presence-sync-build-config 
Add a presence sync enabling build config
 2022-03-18 09:19:45 +01:00
sim e5c04d9cc8 Show stickers on click 
Play animated stickers

Signed-off-by: sim <git@sgougeon.fr>
 2022-03-18 01:03:34 +01:00
ariskotsomitopoulos 61cb7a6ffb Prepare next RC threads migration to all users 2022-03-17 19:09:09 +01:00
ariskotsomitopoulos 2ca3387ab3 Migrate Threads and notify user 2022-03-17 18:51:54 +01:00
Adam Brown abf62aff47 extracting named function out for cancelling the email validation job, giving more context to the currentjob=null 2022-03-17 17:51:01 +00:00
Adam Brown 192d1c4f2d converting open class to sealed interface for extra type safety 2022-03-17 17:01:16 +00:00
Adam Brown ba76aac965 removing unused fake helper methods 2022-03-17 16:54:51 +00:00
Adam Brown d514751ffd avoiding shadowed lambda parameters 2022-03-17 16:52:37 +00:00
Adam Brown 5df2ae9ae2 updating with previous state helper and including javadoc to help explain its usage 2022-03-17 16:50:20 +00:00