mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-27 20:06:51 +03:00
Code Issues Projects Releases Packages Wiki Activity
18933 commits 161 branches 158 tags 270 MiB
Commit graph

18933 commits

This branch
This branch
All branches
Author SHA1 Message Date
Florian Renaud
14d2aec506 Start DM - Handle the local rooms within the new AppLayout 2022-09-19 15:58:14 +02:00
Florian Renaud
3c68222fd7 Do not save local room into recent rooms 2022-09-19 15:58:14 +02:00
Nikita Fedrunov
830e5ffa9f
room summary now has constant height (#7145) 2022-09-19 15:22:16 +02:00
Benoit Marty
0fea172154
Merge pull request #7169 from vector-im/feature/bma/fix_dependencies_regression 
Fix regression on our dependency, due to merge of #6788.
 2022-09-19 14:29:42 +02:00
Onuray Sahin
5902c9cd83
Merge pull request #7046 from vector-im/feature/ons/device_manager_filter 
[Device Manager] Filter Other Sessions (PSG-684)
 2022-09-19 14:24:42 +03:00
Onuray Sahin
32d7516dcb Merge branch 'develop' into feature/ons/device_manager_filter 2022-09-19 12:02:22 +03:00
Benoit Marty
874bcc117a Fix regression on our dependency, due to merge of #6788. 
We do not use `android-embedded_fcm_distributor` anymore (since #7068).
The code was compiling because `android-embedded_fcm_distributor` has a dependency on `firebase-messaging`.
 2022-09-19 10:34:39 +02:00
Benoit Marty
949f06eb00
Merge pull request #7168 from vector-im/sync-emojis 
Sync Emojis
 2022-09-19 10:18:39 +02:00
Maxime NATUREL
7b0f94b9e3
Merge pull request #7160 from vector-im/dependabot/gradle/com.google.android.gms-play-services-location-20.0.0 
Bump play-services-location from 16.0.0 to 20.0.0
 2022-09-19 09:20:40 +02:00
bmarty
925fffac45 Sync Emojis 2022-09-19 00:03:51 +00:00
dependabot[bot]
43a1bdb620
Bump play-services-location from 16.0.0 to 20.0.0 
Bumps play-services-location from 16.0.0 to 20.0.0.

---
updated-dependencies:
- dependency-name: com.google.android.gms:play-services-location
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-16 23:18:13 +00:00
Benoit Marty
734945e154
Merge pull request #7151 from vector-im/dependabot/gradle/org.owasp-dependency-check-gradle-7.2.0 
Bump dependency-check-gradle from 7.1.2 to 7.2.0
 2022-09-16 19:08:19 +02:00
Benoit Marty
73e061e472
Merge pull request #7130 from vector-im/feature/bma/fix_verification 
Fix empty verification bottom sheet
 2022-09-16 19:00:39 +02:00
Adam Brown
9a298a6e3e
Merge pull request #7157 from vector-im/feature/adm/cache-misses 
Fix build cache misses
 2022-09-16 17:19:49 +01:00
Benoit Marty
a919989fd4
Merge pull request #7132 from vector-im/bugfix/eric/dismiss-new-chat 
Adds dismissal to new chat bottom sheet actions
 2022-09-16 18:14:08 +02:00
Onuray Sahin
6823258abb Add test for view navigation. 2022-09-16 17:41:51 +03:00
Adam Brown
8bfe7b68c3
Merge pull request #7140 from vector-im/feature/adm/legacy-support-library-usages 
Excluding legacy support library annotation usages
 2022-09-16 15:14:46 +01:00
Adam Brown
1669320698 adding changelog entry 2022-09-16 15:03:24 +01:00
Adam Brown
bbdac9d1ba fix build cache misses 
- forcing the stem string template generator to be cachable, without this the templates are regenerated causing the vector module to recompile its sources (our slowest task!)
 2022-09-16 14:57:11 +01:00
Onuray Sahin
61f5f81305 Merge branch 'develop' into feature/ons/device_manager_filter 
# Conflicts:
#	library/ui-strings/src/main/res/values/strings.xml
#	vector/src/main/AndroidManifest.xml
#	vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt
#	vector/src/main/res/layout/fragment_settings_devices.xml
 2022-09-16 15:25:09 +03:00
Onuray Sahin
eb5253ab1a Refactor duplicated code. 2022-09-16 14:51:40 +03:00
Onuray Sahin
e87d4db72c Refactor duplicated code. 2022-09-16 14:42:20 +03:00
Adam Brown
11e6ca1784 moving the jitsi exclude directly to the dependency so that other modules also get the exclusion 
- also excludes the support dependency from the barcode scanner
 2022-09-16 12:16:03 +01:00
Adam Brown
ae50f5a006 adding changelog entry 2022-09-16 11:37:39 +01:00
Adam Brown
be9c9f1640 formatting 2022-09-16 11:37:39 +01:00
Adam Brown
1d8b4ce63b excluding support annotations from jsonviewer module dependency 2022-09-16 11:37:39 +01:00
Adam Brown
4e99217164 excluding jitsi's android-scalablevideoview fork's support library 
- The library exports a jetified artifact but doesn't remove the support library dependency /home/adam/dev/element/element-android/vector/build.gradle
 2022-09-16 11:37:39 +01:00
Adam Brown
c61df899b4 removing unused dependency 2022-09-16 11:37:39 +01:00
Adam Brown
ca92ad267d excluding compile time legacy support annotations from dependencies 2022-09-16 11:37:38 +01:00
Onuray Sahin
e2313ad1cd Implement unit tests. 2022-09-16 13:05:06 +03:00
Adam Brown
b05d52bb6d
Merge pull request #6788 from vector-im/feature/adm/app-level-variant-v2 
`:vector-app` level variants
 2022-09-16 10:36:58 +01:00
Benoit Marty
ad16130a94
Merge pull request #7147 from vector-im/dependabot/gradle/appDistribution-16.0.0-beta04 
Bump appDistribution from 16.0.0-beta03 to 16.0.0-beta04
 2022-09-16 09:58:02 +02:00
dependabot[bot]
b3334b3e8d
Bump dependency-check-gradle from 7.1.2 to 7.2.0 
Bumps dependency-check-gradle from 7.1.2 to 7.2.0.

---
updated-dependencies:
- dependency-name: org.owasp:dependency-check-gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-15 23:14:34 +00:00
dependabot[bot]
e86b72b8db
Bump appDistribution from 16.0.0-beta03 to 16.0.0-beta04 
Bumps `appDistribution` from 16.0.0-beta03 to 16.0.0-beta04.

Updates `firebase-appdistribution-api-ktx` from 16.0.0-beta03 to 16.0.0-beta04

Updates `firebase-appdistribution` from 16.0.0-beta03 to 16.0.0-beta04

---
updated-dependencies:
- dependency-name: com.google.firebase:firebase-appdistribution-api-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.firebase:firebase-appdistribution
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-15 23:11:49 +00:00
Florian Renaud
0ce72057dc
Merge pull request #7123 from vector-im/bugfix/fre/start_dm_room_list_glitch 
Start DM - Fix glitch in the room list
 2022-09-15 16:55:47 +02:00
Onuray Sahin
fd9dca9621 Fix existing tests. 2022-09-15 17:39:08 +03:00
Adam Brown
60b164a447 using fully qualified path to test activity, fixes missing reference 2022-09-15 15:17:11 +01:00
ericdecanini
13b1722060 Merge remote-tracking branch 'origin/develop' into bugfix/eric/dismiss-new-chat 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/list/home/NewChatBottomSheet.kt
 2022-09-15 10:05:13 -04:00
Eric Decanini
01e1d74c72
Merge pull request #7103 from vector-im/bugfix/eric/landscape-bottom-sheet-peek 
[New Layout] Adds peek height (min height) to new layout bottom sheets
 2022-09-15 10:03:11 -04:00
ericdecanini
e9b3d29128 Merge remote-tracking branch 'origin/develop' into bugfix/eric/dismiss-new-chat 2022-09-15 10:02:41 -04:00
Adam Brown
e9d15b46d8 lifting the activity alias entry to the application module 
- fixes the androidTests expecting a shortcuts xml
 2022-09-15 14:50:08 +01:00
Adam Brown
619ea819ed using debug variant for the vector CA tests, gplay only exists at the root level 2022-09-15 14:50:08 +01:00
Adam Brown
68da403f2f using the top level debug unit test task when executing tests for coverage to avoid needing to specify every module 2022-09-15 14:50:08 +01:00
Adam Brown
e9e29603de adding missing nightly source inclusions 2022-09-15 14:50:08 +01:00
Adam Brown
9e5f07a855 suppressing lint warning for constant that delegates to the correct value 2022-09-15 14:50:08 +01:00
Adam Brown
1d50bbdbda fixing manifest imports and giving androidTest its own dedicated manifest 2022-09-15 14:50:08 +01:00
Adam Brown
0c469ae079 removing extra application id declaration 2022-09-15 14:50:08 +01:00
Adam Brown
32a15bee04 adding changelog entry 2022-09-15 14:50:08 +01:00
Adam Brown
0691046601 enabling build caching by default to improve build times 2022-09-15 14:50:08 +01:00
Adam Brown
3a38898961 lifting fdroid and gplay variants to the application module 2022-09-15 14:50:08 +01:00