Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-16 02:05:06 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,255 Commits 530 Branches 157 Tags 485 MiB
c2daab4211
Commit Graph

13255 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Onuray Sahin
c2daab4211 Code review fixes. 2022-02-02 19:33:34 +03:00
Onuray Sahin
a131d28b3e Merge branch 'develop' into feature/ons/generic_location_pin 
* develop: (146 commits)
  exhaustive not needed anymore
  Invert if condition and split long line
  Use kotlin string builder
  Same issue but in the test
  Format
  Fix a crash: java.util.IllegalFormatPrecisionException https://github.com/matrix-org/element-android-rageshakes/issues/33398
  add changelog file for threads feature
  add changelog file for threads feature
  Formatting
  Improve hidden events for threads
  Add TODO for the next Weblate sync
  ktlint format
  PR remarks
  Fix a lint false positive? Anyway this was not used. Restricted API ../../../matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt:61: ListenableWorker.getTaskExecutor can only be called from within the same library group (referenced groupId=androidx.work from groupId=element-android)
  It seems that now lint rule `MissingQuantity` is an error and not a warning by default.
  Whitelist group 'org.webjars' on MavenCentral to fix lint execution
  Fix conflicts
  Formating & remove unused comments
  Fix error in unit test
  ktlint format
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
 2022-02-02 14:35:30 +03:00
Onuray Sahin
37d35c9a7f Support generic location pin. 2022-02-02 14:25:54 +03:00
Benoit Marty
ecf356f6eb
Merge pull request #5124 from vector-im/feature/bma/fix_timber_crash 
Fix timber crash
 2022-02-02 12:25:30 +01:00
Benoit Marty
407e065b90
Merge pull request #5041 from vector-im/feature/nfe/qr_scanner_fragments_merge 
qr scanner fragments merged into one
 2022-02-02 12:24:28 +01:00
Benoit Marty
10841ab0a1 exhaustive not needed anymore 2022-02-02 12:24:02 +01:00
Benoit Marty
54fb28c912
Merge pull request #5089 from vector-im/feature/dla/fix_incorrect_call_status 
CallTileTimelineItem.CallStatus.MISSED renders both missed and reject…
 2022-02-02 12:06:11 +01:00
Benoit Marty
a78d88fc0a Invert if condition and split long line 2022-02-02 12:03:38 +01:00
Benoit Marty
2bf36c74e3 Use kotlin string builder 2022-02-02 10:46:31 +01:00
Benoit Marty
cd16d3f19b Same issue but in the test 2022-02-02 10:42:39 +01:00
Benoit Marty
581dbda2c1 Format 2022-02-02 10:34:08 +01:00
Benoit Marty
cd1171eb9d Fix a crash: java.util.IllegalFormatPrecisionException 
https://github.com/matrix-org/element-android-rageshakes/issues/33398
 2022-02-02 10:33:19 +01:00
Benoit Marty
0391684334
Merge pull request #5119 from vector-im/feature/aris/fix_github_action_merging_error 
Fix CI/CD errors after merges
 2022-02-01 17:52:06 +01:00
ariskotsomitopoulos
8e90864e1f add changelog file for threads feature 2022-02-01 17:37:05 +02:00
ariskotsomitopoulos
57f3b132cb add changelog file for threads feature 2022-02-01 16:20:14 +02:00
Aris Kotsomitopoulos
3d5f8ed7e7
Merge pull request #4746 from vector-im/feature/aris/threads 
Threads P0 Release
 2022-02-01 15:58:32 +02:00
Benoit Marty
79b4c76a09
Merge pull request #5082 from vector-im/feature/bma/agp_7_1_0 
AGP 7.1.0
 2022-02-01 13:57:15 +01:00
ariskotsomitopoulos
ed992ddc72 Formatting 2022-02-01 14:40:00 +02:00
ariskotsomitopoulos
877c9bec97 Improve hidden events for threads 2022-02-01 14:07:16 +02:00
Benoit Marty
8db5b76676 Add TODO for the next Weblate sync 2022-02-01 11:41:59 +01:00
ariskotsomitopoulos
cfa52d83b4 ktlint format 2022-02-01 12:16:52 +02:00
ariskotsomitopoulos
fcc095a239 PR remarks 2022-02-01 12:13:10 +02:00
Benoit Marty
c8ddb2e85e Fix a lint false positive? Anyway this was not used. 
Restricted API
../../../matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt:61: ListenableWorker.getTaskExecutor can only be called from within the same library group (referenced groupId=androidx.work from groupId=element-android)
 2022-02-01 00:30:30 +01:00
Benoit Marty
c18a614e72 It seems that now lint rule MissingQuantity is an error and not a warning by default. 2022-02-01 00:26:10 +01:00
Benoit Marty
56e52fd917 Whitelist group 'org.webjars' on MavenCentral to fix lint execution 2022-01-31 23:34:56 +01:00
Benoit Marty
6213cc73c0
Merge pull request #5109 from vector-im/dependabot/gradle/com.github.yalantis-ucrop-2.2.8-native 
Bump ucrop from 2.2.7 to 2.2.8
 2022-01-31 22:58:50 +01:00
Benoit Marty
983fb598bd
Merge pull request #5110 from vector-im/feature/adm/prioritize-maven-central 
Attempting to fix missing dependabot updates
 2022-01-31 22:44:39 +01:00
Benoit Marty
3a040aaee2
Update vector/build.gradle 2022-01-31 17:17:37 +01:00
Benoit Marty
31d976ac71
Merge pull request #5108 from vector-im/bmarty-patch-1 
With the link...
 2022-01-31 17:13:27 +01:00
Adam Brown
fd2aaa8c2b prioritizing the maven central build repository as it appears that dependabot is only using the first 2 defined maven repositories for the build scans 2022-01-31 15:29:31 +00:00
dependabot[bot]
3caf81d07e
Bump ucrop from 2.2.7 to 2.2.8-native 
Bumps [ucrop](https://github.com/Yalantis/uCrop) from 2.2.7 to 2.2.8-native.
- [Release notes](https://github.com/Yalantis/uCrop/releases)
- [Commits](https://github.com/Yalantis/uCrop/compare/2.2.7...2.2.8-native)

---
updated-dependencies:
- dependency-name: com.github.yalantis:ucrop
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-31 15:22:21 +00:00
Benoit Marty
cd1693548a
With the link... 2022-01-31 16:03:21 +01:00
Benoit Marty
d3d8ea1f2d
Merge pull request #5107 from vector-im/bmarty-patch-1 
Give more visibility to the sanity test nighly by adding a badge to the README
 2022-01-31 16:02:01 +01:00
Benoit Marty
78f09e25ae
Give more visibility to the sanity test nighly by adding a badge to the README 2022-01-31 15:50:16 +01:00
ariskotsomitopoulos
15fe9edfbd Fix conflicts 2022-01-31 16:21:46 +02:00
Adam Brown
986d9f92e9
Merge pull request #5009 from vector-im/feature/adm/storing-use-case 
Storing and tracking the onboarding messaging use case
 2022-01-31 14:15:39 +00:00
ariskotsomitopoulos
d509b3324c Merge branch 'develop' into feature/aris/threads 2022-01-31 15:58:12 +02:00
Benoit Marty
7dad08654b Revert "Downgrade the version to 1.3.17 to prepare a corrective release." 
This reverts commit 2efa67e587.
 2022-01-31 14:53:43 +01:00
Benoit Marty
af83073965 Merge branch 'release/1.3.17' into develop 2022-01-31 14:52:28 +01:00
Benoit Marty
c296b076cc fastlane 2022-01-31 14:51:49 +01:00
Benoit Marty
7d463cc9bc Towncrier 2022-01-31 14:51:09 +01:00
Benoit Marty
2efa67e587 Downgrade the version to 1.3.17 to prepare a corrective release. 2022-01-31 14:48:54 +01:00
Benoit Marty
91e444ca73
Merge pull request #5084 from vector-im/feature/bma/location_crash 
Fix location crash
 2022-01-31 14:42:53 +01:00
Benoit Marty
f2d927079d
Merge pull request #5102 from vector-im/feature/adm/notification-logging 
Increased push rules logging
 2022-01-31 14:39:44 +01:00
ariskotsomitopoulos
f07c23fdda Formating & remove unused comments 2022-01-31 14:52:09 +02:00
ariskotsomitopoulos
ec9b6aa993 Fix error in unit test 2022-01-31 14:50:57 +02:00
Adam Brown
9119cf059f adding extra logging around the push rules to help determine if we're incorrectly filter out valid notifications 2022-01-31 12:06:21 +00:00
ariskotsomitopoulos
26eaa843b3 ktlint format 2022-01-31 13:56:17 +02:00
ariskotsomitopoulos
14e56b8f7d MessageComposerViewModel format 2022-01-31 13:53:49 +02:00
Benoit Marty
8ee23c1e6a Merge branch 'develop' into feature/bma/location_crash 2022-01-31 12:49:17 +01:00