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

10298 Commits

Author SHA1 Message Date
Benoit Marty ee7fccf072 Fix compilation issues after rebase 2022-06-09 10:16:59 +02:00
sim 7eca405693 Update UnifiedPush libs 
Signed-off-by: sim <git@sgougeon.fr>
 2022-06-09 10:16:59 +02:00
sim f774f46627 Check custom unifiedpush gateway 2022-06-09 10:16:59 +02:00
sim 1069f77bd5 Lint 2022-06-09 10:16:59 +02:00
sim f00257f461 Add UnifiedPush troubleshoot 2022-06-09 10:16:59 +02:00
sim 848adc415f Add UnifiedPush settings 2022-06-09 10:16:59 +02:00
sim 04b297b261 Add UnifiedPush support 2022-06-09 10:16:59 +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 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 ac61aeea29 Fix compilation issue after rebase. 2022-06-08 10:00:48 +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
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
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 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
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
ericdecanini 6513210904 Changes space subtitle in explore rooms from joined string to direct space parent 2022-06-07 15:02:15 +02:00
Valere d67f86a1e0 fix slow paged room list 2022-06-07 15:00:54 +02: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
Onuray Sahin 4b862be9df Changelog added. 2022-06-07 01:05:10 +03:00
Onuray Sahin e506337522 Remove labs flag for rendering location events. 2022-06-06 19:32:48 +03:00
Onuray Sahin d75bd140d9 Remove location sharing flag from preferences. 2022-06-06 15:59:46 +03:00
Adam Brown edfabb0f26 adding missing loading state when confirming password reset 
- adds reset test cases to the onboarding view model
 2022-06-06 13:59:34 +01:00
Adam Brown fa5b7c66ca adding dedicated fail event in the legacy onboarding flow when the reset password new password is not set 2022-06-06 13:59:34 +01:00
Adam Brown 32389a9b33 removing impossible case 2022-06-06 13:59:33 +01:00
Adam Brown 93a247e0ce converting if/else and try/catch to when and runCatching 2022-06-06 13:58:55 +01:00
Adam Brown cc8f17b786 moving the reset password new password to the reset confirmation step 
- the new password is moved to the in memory view model state
 2022-06-06 13:57:59 +01:00
Adam Brown e3d46cfd15 introducing a reset state for holding onto the reset inputs 2022-06-06 13:57:58 +01:00
Adam Brown a5f404f247
Merge pull request #6042 from vector-im/feature/adm/ftue-analytics 
FTUE - Sign up analytics
 2022-06-06 13:52:01 +01:00
Adam Brown db3cb42cc3 renaming getter to imply the function does more than simply get a value 2022-06-06 11:41:36 +01:00
Adam Brown 06e67a313b correctly casing github/gitlab 2022-06-06 11:39:59 +01:00
Adam Brown 49930773e7 handling the legacy onboarding complete navigation by inferring the auth description from the sign mode 
- the type is set to other as the legacy viewmodel doesn't support tracking the sso provider
 2022-06-06 11:38:29 +01:00
Onuray Sahin bae830dd03
Merge pull request #6222 from vector-im/feature/ons/fix_voice_message_stackoverflow 
Fix StackOverflowError while recording voice message [PSF-1065]
 2022-06-06 12:58:15 +03:00
Adam Brown 6fcbd24ce1 reverting instance check, no longer needed as the event no longer contains any data 
- it's part of the initialstate instead
 2022-06-06 10:23:06 +01:00
Adam Brown 5d0d177a7a including null case in the authentication when 2022-06-06 10:22:22 +01:00
Onuray Sahin 0b9db0ee6b Code review fix. 2022-06-06 12:19:09 +03:00
bmarty 0104fe70ab Sync analytics plan 2022-06-06 00:03:15 +00:00
Jorge Martin Espinosa 166d2a3ba0
Merge pull request #6151 from vector-im/feature/jorgem/outbound_presharing_keys_mode 
Allow .well-known configuration to override key sharing mode.
 2022-06-03 15:33:59 +02:00
Claire G 6ed6b49d7f fix text cropped 2022-06-03 14:41:43 +02:00
ericdecanini 7d8590d85f Disables when arrow alignment post merge with develop 2022-06-03 12:14:47 +02:00