mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-12-01 12:38:43 +03:00
Code Issues Projects Releases Packages Wiki Activity
17105 commits 161 branches 158 tags 270 MiB
Commit graph

17105 commits

This branch
This branch
All branches
Author SHA1 Message Date
ericdecanini
2f9517f69d Merge remote-tracking branch 'origin/develop' into bugfix/eric/fix-upgrade-room 2022-06-08 13:17:58 +02:00
ericdecanini
87053f2c70 Reformats after merging 2022-06-08 13:01:26 +02:00
ericdecanini
6df88fba59 Merge remote-tracking branch 'origin/develop' into task/eric/when-arrow-alignment 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/GroupSyncHandler.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
#	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
#	vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/InitSyncStepFormatter.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
#	vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt
 2022-06-08 12:59:54 +02:00
Onuray Sahin
d0ab6af0b7 Remove unused import. 2022-06-08 13:03:48 +03:00
Onuray Sahin
3f491018b4
Merge pull request #6244 from vector-im/feature/ons/organize_location_settings_flags 
Re-organize location settings flags [PSF-1062]
 2022-06-08 13:03:10 +03:00
Benoit Marty
3b2f9d9404
Merge pull request #6029 from vector-im/feature/bma/sdk_sync_service 
Feature/bma/sdk sync service
 2022-06-08 11:58:38 +02:00
Onuray Sahin
adde210cfd Code review fixes. 2022-06-08 12:37:48 +03:00
Adam Brown
6ad672e04b
Merge pull request #6250 from vector-im/dependabot/gradle/com.autonomousapps.dependency-analysis-1.5.0 
Bump com.autonomousapps.dependency-analysis from 1.4.0 to 1.5.0
 2022-06-08 10:27:11 +01:00
Benoit Marty
9bc70399f1
Merge pull request #6259 from vector-im/feature/bma/release_store_status 
Release recipe: stores live status and update of F-Droid flow.
 2022-06-08 11:11:40 +02:00
Adam Brown
a4721033c8
Merge pull request #6229 from vector-im/dependabot/gradle/org.matrix.android-olm-sdk-3.2.12 
Bump olm-sdk from 3.2.11 to 3.2.12
 2022-06-08 10:04:08 +01:00
Benoit Marty
0b3dfab951 "beta" -> "open testing" PlayStore terminology and move step to update the topic once production is live to a dedicated section. Also update the diary only when production is live. 2022-06-08 10:45:26 +02:00
Benoit Marty
78da5017a9 Update about the F-Droid release flow. 2022-06-08 10:27:46 +02:00
Benoit Marty
b35a09906c Add checks to give the status of the PlayStore submission. 2022-06-08 10:23:19 +02:00
Benoit Marty
ac61aeea29 Fix compilation issue after rebase. 2022-06-08 10:00:48 +02:00
Benoit Marty
1bad8f7741 Introduce SessionState to be able to check the Session state from several places. 2022-06-08 09:55:28 +02:00
Benoit Marty
d3784c8019 Add changelog 2022-06-08 09:55:28 +02:00
Benoit Marty
de960116b3 Rename internal fun. 2022-06-08 09:55:28 +02:00
Benoit Marty
dd22cdf7f2 Rename existing SyncService to SyncAndroidService to avoid confusion 2022-06-08 09:55:28 +02:00
Benoit Marty
f62d598b79 Create a SyncService and move some methods from Session there. 
Merge SyncStatusService to SyncService, and rename some classes
 2022-06-08 09:53:33 +02:00
Maxime NATUREL
73568dbc86
Merge pull request #6212 from vector-im/fix/mna/6209-wrong-live-status 
Fix wrong status of live location sharing in timeline (PSF-1073)
 2022-06-08 09:40:33 +02:00
ericdecanini
31b245b8e3 Changes test name 2022-06-08 09:38:30 +02:00
ericdecanini
14ecdefebb Adds changelog file 2022-06-08 09:34:29 +02:00
dependabot[bot]
8030a8ceaf
Bump com.autonomousapps.dependency-analysis from 1.4.0 to 1.5.0 
Bumps com.autonomousapps.dependency-analysis from 1.4.0 to 1.5.0.

---
updated-dependencies:
- dependency-name: com.autonomousapps.dependency-analysis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-07 23:10:08 +00:00
Benoit Marty
733c2848a7
Merge pull request #6226 from vector-im/dependabot/gradle/androidx.core-core-ktx-1.8.0 
Bump core-ktx from 1.7.0 to 1.8.0
 2022-06-07 23:43:21 +02:00
Benoit Marty
7274924977
Merge pull request #6239 from vector-im/sync-analytics-plan 
Sync analytics plan
 2022-06-07 23:40:58 +02:00
Benoit Marty
c290dd6c1d
Merge branch 'develop' into task/eric/when-arrow-alignment 2022-06-07 23:03:36 +02:00
Adam Brown
462d3071de
Merge pull request #6171 from vector-im/feature/adm/sdk-new-password-on-confirmation 
[SDK] Allow passwords to be set at the point of reset confirmation
 2022-06-07 16:43:28 +01:00
Onuray Sahin
68c6e524d2 Use dynamic height to calculate the position of the copyright attributes. 2022-06-07 18:22:09 +03:00
Michael Kaye
93bacc98fe Revert "Ignore tests." 
This reverts commit 17d85840a7.
 2022-06-07 16:02:53 +01:00
Michael Kaye
49d1c1baee Revert "Remove UI tests from connected android test run via @Ignore" 
This reverts commit 5eac30d283.
 2022-06-07 16:02:52 +01:00
Michael Kaye
2946f2ec59 Revert "Include vector connected android tests in coverage run." 
This reverts commit d43cff9d2f.
 2022-06-07 16:02:49 +01:00
Michael Kaye
17d85840a7 Ignore tests. 
All failing with
```
im.vector.app.SecurityBootstrapTest > testBasicBootstrap[Nexus_5X_API_28(AVD) - 9] FAILED
        java.lang.IllegalStateException: Method addObserver must be called on the main thread
        at androidx.lifecycle.LifecycleRegistry.enforceMainThreadIfNeeded(LifecycleRegistry.java:317)

im.vector.app.VerifySessionInteractiveTest > checkVerifyPopup[Nexus_5X_API_28(AVD) - 9] FAILED
        java.lang.IllegalStateException: Method addObserver must be called on the main thread
        at androidx.lifecycle.LifecycleRegistry.enforceMainThreadIfNeeded(LifecycleRegistry.java:317)

im.vector.app.VerifySessionPassphraseTest > checkVerifyWithPassphrase[Nexus_5X_API_28(AVD) - 9] FAILED
        java.lang.IllegalStateException: Method addObserver must be called on the main thread
        at androidx.lifecycle.LifecycleRegistry.enforceMainThreadIfNeeded(LifecycleRegistry.java:317)

```
 2022-06-07 15:44:27 +01:00
Michael Kaye
5eac30d283 Remove UI tests from connected android test run via @Ignore 2022-06-07 15:42:58 +01:00
Michael Kaye
d43cff9d2f Include vector connected android tests in coverage run. 2022-06-07 15:42:42 +01:00
Onuray Sahin
4b50058917 Changelog added. 2022-06-07 16:19:00 +03:00
Benoit Marty
4ea2b19351 Merge branch 'hotfix/v1.4.19' into main 2022-06-07 15:14:48 +02:00
Benoit Marty
c2bf6ab7e3 Merge branch 'hotfix/v1.4.19' into develop 2022-06-07 15:14:47 +02:00
Benoit Marty
26dcc9bc52 Merge hotfix 1.4.19 into develop 2022-06-07 15:14:29 +02:00
Benoit Marty
b2f67f971b Prepare v1.4.19 2022-06-07 15:11:46 +02:00
Onuray Sahin
ec1eb495a7 Fix position of the copyright on maximized map. 2022-06-07 16:06:04 +03:00
ericdecanini
6513210904 Changes space subtitle in explore rooms from joined string to direct space parent 2022-06-07 15:02:15 +02:00
Valere
a6113526d0 code review 2022-06-07 15:01:57 +02:00
Valere
2fa25f8b5e Fix param name 2022-06-07 15:01:29 +02:00
Valere
d67f86a1e0 fix slow paged room list 2022-06-07 15:00:54 +02:00
Onuray Sahin
b284b92464 Use custom TextView for map view copyright. 2022-06-07 15:11:23 +03:00
Onuray Sahin
b455bf04aa Create new styles for map view copyright text. 2022-06-07 15:07:41 +03:00
Onuray Sahin
ea714bbdaa Fix lint errors - unused string resources. 2022-06-07 13:06:09 +03:00
Adam Brown
4ffce89ef2 adding fallback locale for when the configuration locale is missing 2022-06-07 10:37:18 +01:00
ClaireG
0602f58074
Merge pull request #6234 from vector-im/cgizard/ISSUE-6232 
Text cropped: "Secure backup"
 2022-06-07 11:19:10 +02:00
Michael Kaye
10125f4738
Merge pull request #6111 from vector-im/michaelk/sonarqube_fixes 
Sonarqube including coverage on each PR.
 2022-06-07 09:44:00 +01:00