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

19033 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Adam Brown
373a0ca4fb split commit to make debug changes to avoid files being seen as new! 2022-09-15 14:50:08 +01:00
Adam Brown
5d533d4ec9 lifting debug build type to the application module 2022-09-15 14:50:08 +01:00
Adam Brown
a947a53e14 lifting the release build type to the application module 2022-09-15 14:50:08 +01:00
Adam Brown
b72a174edf lifting nightly to the application module 2022-09-15 14:50:08 +01:00
Adam Brown
e53972cf2d adding changelog entry 2022-09-15 14:42:56 +01:00
Florian Renaud
6c9ae331e3 transform list to iterable 2022-09-15 15:16:51 +02:00
Onuray Sahin
3e0f76a362 Code review fix. 2022-09-15 15:38:37 +03:00
Onuray Sahin
e3ee59f6c1 Refactor naming of strings. 2022-09-15 15:34:59 +03:00
Onuray Sahin
81cc8ab98b Code review fixes. 2022-09-15 15:14:46 +03:00
Benoit Marty
3ddaf0c51f Ensure MatrixItem.UserItem is not null at other places 2022-09-15 11:29:38 +02:00
ericdecanini
a3fff0777d Adds changelog file 2022-09-14 17:25:38 -04:00
ericdecanini
283686a9d8 Adds dismiss to new chat bottom sheet actions 2022-09-14 17:22:55 -04:00
Nikita Fedrunov
1d3c191153
scroll recents carouse to start when item added/moved to start (#7120) 2022-09-14 22:55:01 +02:00
Nikita Fedrunov
7631c7ac9f
room leaving prompt dialog now waits user to confirm leaving before do so (#7124) 2022-09-14 22:54:40 +02:00
Benoit Marty
42fc601c59 changelog 2022-09-14 20:32:31 +02:00
Benoit Marty
92d7391232 state.otherUserMxItem cannot be null anymore. 
Ensure the User is retrieved from the network, or fallback to a default User object.
 2022-09-14 20:25:43 +02:00
Benoit Marty
6d2a9ec9d5 Prefer using state.otherUserId over nullable state.otherUserMxItem?.id 2022-09-14 19:05:38 +02:00
Florian Renaud
e792228879 Changelog 2022-09-14 16:41:09 +02:00
Florian Renaud
3b1599763c Start DM - Fix glitch by not showing the local rooms in the room list 2022-09-14 16:41:09 +02:00