filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-18 12:28:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,463 Commits 7 Branches 122 Tags 228 MiB
428942d407
Commit Graph

1223 Commits

Author SHA1 Message Date
Benoit Marty
fe7515761a
Merge pull request #6300 from vector-im/feature/bma/flipper 
Setup Flipper
 2022-06-16 16:44:05 +02:00
Benoit Marty
16ca26569f
Merge pull request #6228 from vector-im/feature/bma/unifiedPush2 
UnifiedPush
 2022-06-16 16:09:31 +02:00
Adam Brown
d37b273eee
Merge pull request #6271 from vector-im/feature/adm/full-matrix-id-homeserver-switching 
[FTUE] Switch homeserver on full matrix id entry
 2022-06-16 14:23:12 +01:00
Adam Brown
4f86ad0934
Merge pull request #6297 from vector-im/feature/adm/opt-in-screenshots-in-bug-report 
Making bug report screenshots opt in instead of opt out
 2022-06-16 12:08:25 +01:00
Adam Brown
19de43dd65 adding changelog entry 2022-06-16 11:18:38 +01:00
Eric Decanini
2f2dae89f7
Merge pull request #6290 from vector-im/bugfix/eric/fix-large-image-crash 
Fixes large images crashing when opened in timeline
 2022-06-16 11:04:00 +02:00
Adam Brown
baae7375af
Merge pull request #6296 from vector-im/feature/adm/attach-ics 
Allow sharing text mimetype content via android's share menu
 2022-06-16 09:33:21 +01:00
Benoit Marty
d5a4e764f2 Changelog 2022-06-15 21:16:57 +02:00
Onuray Sahin
934d860bea Changelog added. 2022-06-15 21:25:44 +03:00
Benoit Marty
e12103387d Setup Flipper 
Move getLastSession() to the SessionManager
Create `DebugService`
Move `logDbUsageInfo()` to `DebugService`
 2022-06-15 16:14:20 +02:00
Jorge Martín
6fc278eb2b Replace ffmpeg-kit with libopus and libopusenc. 2022-06-15 11:34:23 +02:00
Adam Brown
979dec75de making bugreport screenshots opt in instead of optout 2022-06-13 18:06:53 +01:00
Adam Brown
9725396582 allowing text content types to be shared via android share menu 2022-06-13 17:42:30 +01:00
Onuray Sahin
2fbbee2d65
Merge pull request #6264 from vector-im/feature/ons/fix_flickering_location_bottom_bar 
Fix flickering bottom bar of live location item [PSF-1057]
 2022-06-13 18:23:10 +03:00
Onuray Sahin
eb49ceb803
Merge pull request #6280 from vector-im/feature/ons/live_location_sharing_report 
Add report action for live location messages [PSF-1067]
 2022-06-13 14:23:11 +03:00
ericdecanini
2f70c1bd4d Adds changelog file 2022-06-13 12:10:38 +02:00
Nicolas Werner
a7bb0efc93
Add changelog 
Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de>
 2022-06-12 15:13:27 +02:00
Benoit Marty
990a6832bd
Merge pull request #6247 from vector-im/feature/ons/fix_static_map_copyright_size 
Fix copyright attributions of map views [PSF-1058] - [PSF-1072]
 2022-06-10 13:56:24 +02:00
Onuray Sahin
4ac314ab10 Changelog added. 2022-06-10 14:11:27 +03:00
sim
04b297b261 Add UnifiedPush support 2022-06-09 10:16:59 +02:00
Onuray Sahin
0f0d828655 Changelog added. 2022-06-08 16:06:39 +03:00
ericdecanini
2f9517f69d Merge remote-tracking branch 'origin/develop' into bugfix/eric/fix-upgrade-room 2022-06-08 13:17:58 +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
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
Benoit Marty
d3784c8019 Add changelog 2022-06-08 09:55:28 +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
14ecdefebb Adds changelog file 2022-06-08 09:34:29 +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
4b50058917 Changelog added. 2022-06-07 16:19:00 +03: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
Onuray Sahin
4b862be9df Changelog added. 2022-06-07 01:05:10 +03:00
Adam Brown
0ef67b6b64
Merge pull request #6214 from vector-im/feature/adm/homeserver-version-parsing 
Homeserver version without patch number parsing
 2022-06-06 14:54:32 +01:00
Adam Brown
35163f77ba allow passing the new password when resetting passwords either upfront or as part of the confirmation step 2022-06-06 13:57:59 +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
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
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
Adam Brown
8e8d38c3bb adding changelog entry 2022-06-01 16:48:10 +01:00
Onuray Sahin
807e89521f Changelog added. 2022-06-01 17:02:17 +03:00
Adam Brown
b3841c9006 adding changelog entry 2022-06-01 10:41:37 +01:00
Adam Brown
15765166fb adding changelog entry 2022-06-01 09:11:05 +01:00
Benoit Marty
e6beb73e3d
Merge pull request #5970 from ofalvai/feature/ofa/read-receipts-design 
Make read receipt avatar list more compact
 2022-05-31 18:26:57 +02:00
Benoit Marty
8e709dbbdb
Merge pull request #5528 from SpiritCroc/chunk-modification-issue 
Fix missing/swapped/duplicated messages due to wrong TimelineChunk modifications or insertions
 2022-05-31 18:24:08 +02:00
Benoit Marty
6f7f61f33f Towncrier 2022-05-31 17:55:26 +02:00
Olivér Falvai
b5168f27dd Merge remote-tracking branch 'origin/develop' into feature/ofa/read-receipts-design 2022-05-31 17:50:02 +02:00
Olivér Falvai
3146920c04 Add changelog entry 2022-05-31 17:49:47 +02:00
Benoit Marty
5b985dc032
Merge pull request #5827 from mikonse/fix-notification-space-switch 
do not switch away from home space on notification
 2022-05-31 16:34:47 +02:00
Maxime NATUREL
de185b94f3
Merge pull request #6199 from vector-im/feature/mna/6198-remove-background-location-permission 
Remove background location permission
 2022-05-31 15:58:57 +02:00
Maxime NATUREL
9874bdeeab Adding changelog entry 2022-05-31 15:56:16 +02:00
Benoit Marty
3cc1951587
Merge pull request #6196 from vector-im/feature/bma/lao 
Make Lao language available in the in app setting.
 2022-05-31 11:42:07 +02:00
Jorge Martín
2271df9907 Add support for setting pre sharing keys mode from .well-known 2022-05-31 11:32:39 +02:00
Maxime NATUREL
e337035aec Add changelog entry 2022-05-31 11:03:49 +02:00
Jorge Martin Espinosa
2e1a11e10e
Merge pull request #6134 from vector-im/feature/jorgem/mandatory-backup-passphrase 
Add support for mandatory backup or passphrase from .well-known home server configuration
 2022-05-31 11:02:02 +02:00
Johannes Marbach
7dd5b801bb
Merge pull request #6149 from vector-im/johannes/widget-system-permissions 
Make widget web view request system permissions for camera and microphone (PSF-1061)
 2022-05-31 10:54:45 +02:00
Adam Brown
7fdf138e5a
Merge pull request #6036 from vector-im/feature/adm/ftue-deeplinks 
FTUE - Homeserver sign in/up deeplinks
 2022-05-31 09:30:17 +01:00
Jorge Martín
130ed63b03 Add support for mandatory backup or passphrase from .well-known configuration 2022-05-31 10:00:46 +02:00
Benoit Marty
9ed62ac9f7 Changelog 2022-05-31 09:58:13 +02:00
Johannes Marbach
4ebb26d3d3 Merge branch 'develop' into johannes/widget-system-permissions 2022-05-31 09:53:31 +02:00
Benoit Marty
483b1ab503
Merge pull request #6132 from jtbx/patch-1 
Fixed grammar in 2 English strings
 2022-05-30 21:18:08 +02:00
Benoit Marty
5de6771547
Merge pull request #6166 from networkException/autoplay-animated-images 
[Feature] Add the option to autoplay animated images
 2022-05-30 20:42:19 +02:00
Benoit Marty
bd2cd3ad96
Merge pull request #6183 from SpiritCroc/persist-image-notification 
Fix some notifications never getting dismissed
 2022-05-30 20:24:11 +02:00
Onuray Sahin
4ccd242cbf
Merge pull request #6170 from vector-im/feature/ons/live_location_bottom_sheet 
Live Location Sharing - User List Bottom Sheet [PSF-890]
 2022-05-30 21:07:25 +03:00
networkException
fedc637dee
Changelog: Add .feature entry for pull request #6166 
Signed-off-by: networkException <git@nwex.de>
 2022-05-30 20:05:26 +02:00
Benoit Marty
ae94f45f34
Merge pull request #5952 from vector-im/feature/bma/sdk_user_story 
Sdk user story
 2022-05-30 18:30:56 +02:00
Onuray Sahin
04679ea21d Merge branch 'develop' into feature/ons/live_location_bottom_sheet 
* develop: (114 commits)
  Docs: Fix various formatting and spelling issues in notifications.md
  Fixing non necessary breaking line
  continuing to the originally supplied url when a rtl override character is detected
  splitting url detection condition into separate branches
  Cleaner code
  Create extension `String?.toActiveSpaceOrOrphanRooms()` to reduce noise.
  Add changelog
  Fix test compilation
  Add some Kdoc
  Add some Kdoc
  Create SpaceFilter.OrphanRooms to improve the API. Not 100% of the side effect. There is probably some (fixed?) bugs here.
  Rename ActiveSpaceFilter to SpaceFilter
  Remove `ActiveSpaceFilter.None` Prefer nullability for API coherency of `RoomSummaryQueryParams`
  Add some Kdoc
  Remove duplicated lines of code (the same code is done a few lines later)
  Remove `RoomCategoryFilter.ALL` Prefer nullability for API coherency of `RoomSummaryQueryParams`
  `displayName` default value is now `QueryStringValue.NoCondition`. It was working fine since in the DB we always have a name using `RoomDisplayNameFallbackProvider`, which in our current implementation always return a non empty String.
  Small rework for nicer code
  Remove duplicated code lines
  Remove `roomId` from `RoomSummaryQueryParams.Builder()`. Create a new API in RoomService to observe a room summary from a roomId.
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewFragment.kt
 2022-05-30 16:27:11 +03:00
Benoit Marty
ab651cbe50
Merge pull request #6164 from vector-im/bug/adm/link-checking 
Ask the user to confirm urls which contain unicode direction overrides
 2022-05-30 14:07:23 +02:00
SpiritCroc
292020e95d Fix some notifications never getting dismissed 
Persisting notification info fails for non-null Uris:

E NotificationEventPersistence: ## Failed to save cached notification info
E NotificationEventPersistence: java.io.NotSerializableException: android.net.Uri$HierarchicalUri
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1240)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.defaultWriteFields(ObjectOutputStream.java:1604)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeSerialData(ObjectOutputStream.java:1565)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeOrdinaryObject(ObjectOutputStream.java:1488)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1234)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:354)
E NotificationEventPersistence: 	at java.util.ArrayList.writeObject(ArrayList.java:762)
E NotificationEventPersistence: 	at java.lang.reflect.Method.invoke(Native Method)
E NotificationEventPersistence: 	at java.io.ObjectStreamClass.invokeWriteObject(ObjectStreamClass.java:1036)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeSerialData(ObjectOutputStream.java:1552)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeOrdinaryObject(ObjectOutputStream.java:1488)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1234)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:354)
E NotificationEventPersistence: 	at org.matrix.android.sdk.internal.session.securestorage.SecretStoringUtils.saveSecureObjectM(SecretStoringUtils.kt:283)
E NotificationEventPersistence: 	at org.matrix.android.sdk.internal.session.securestorage.SecretStoringUtils.securelyStoreObject(SecretStoringUtils.kt:150)
E NotificationEventPersistence: 	at org.matrix.android.sdk.internal.session.securestorage.DefaultSecureStorageService.securelyStoreObject(DefaultSecureStorageService.kt:27)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationEventPersistence.persistEvents(NotificationEventPersistence.kt:58)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationDrawerManager$persistEvents$1.invoke(NotificationDrawerManager.kt:183)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationDrawerManager$persistEvents$1.invoke(NotificationDrawerManager.kt:182)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationState.queuedEvents(NotificationState.kt:55)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationDrawerManager.persistEvents(NotificationDrawerManager.kt:182)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationDrawerManager.refreshNotificationDrawerBg(NotificationDrawerManager.kt:177)

Accordingly, if a notification for an image is shown, and the
notification state is loaded from storage later, none of the previously
shown notifications will get dismissed once read.

Likely addresses https://github.com/vector-im/element-android/issues/4862.

Change-Id: I2d6be497e8b92e770b680e16e42b3610add57323
 2022-05-30 13:06:09 +02:00
Maxime NATUREL
eeaf9fd616
Merge pull request #6129 from vector-im/feature/mna/PSF-1019-user-pins 
[Location sharing] - Show user live location pins in map view (PSF-1019)
 2022-05-30 12:32:09 +02:00
Benoit Marty
d7a1ae3a00 Add changelog 2022-05-30 11:38:03 +02:00
Eric Decanini
eeb7d60e59
Merge pull request #5860 from vector-im/feature/eric/replace-search-room-subheader 
Replaces subtitle in Search Rooms with room context rather than last event
 2022-05-30 11:13:10 +02:00
Eric Decanini
b8c0c61a4c
Merge pull request #6073 from vector-im/feature/eric/improve-back-navigation 
Adds up navigation in spaces
 2022-05-30 10:38:28 +02:00
Onuray Sahin
8bc7d3e073 Changelog added. 2022-05-27 17:55:51 +03:00
Adam Brown
913c6b0f14 warning the user when urls contain directional overrides and allowing them to confirm the url 2022-05-26 12:32:22 +01:00
Adam Brown
0675b7c16c
Merge pull request #5995 from vector-im/feature/adm/ftue-sign-in 
FTUE - Sign in
 2022-05-25 17:30:03 +01:00
Valere
136d2e330a added change log 2022-05-25 16:52:56 +02:00
Valere
52eb48d808
Merge pull request #6077 from vector-im/feature/aris/crypto_replay_attack 
Feature/aris/crypto replay attack
 2022-05-25 16:20:26 +02:00
ericdecanini
b0ce32e97e Adds changelog file 2022-05-25 15:37:31 +02:00
Maxime NATUREL
c8fb034c57
Merge pull request #6128 from vector-im/feature/mna/PSF-999-auto-refresh-db 
[Location sharing] - Update DB entity when a live is timed out (PSF-999)
 2022-05-25 14:59:54 +02:00
Adam Brown
73c93958c2 adding changelog entry 2022-05-25 13:34:08 +01:00
Maxime NATUREL
cf90ff9fd2 Adding changelog entry 2022-05-25 14:03:37 +02:00
Johannes Marbach
f5a621a6d5
Merge pull request #6140 from vector-im/johannes/widget-screen-rotation 
Prevent widget web view from reloading on screen / orientation change (PSF-1034)
 2022-05-25 13:42:24 +02:00
Johannes Marbach
946902719b Add changelog entry 2022-05-25 12:53:47 +02:00
Adam Brown
b76899a6e0 adding changelog entry 2022-05-25 10:22:27 +01:00
Adam Brown
ae9922a731
Merge pull request #6136 from vector-im/feature/adm/foss-avoid-gms-location-provider 
Excluding the gms play-service-location from maplibre for fdroid builds
 2022-05-25 08:59:18 +01:00
Michael Kaye
20422a5451 towncrier 2022-05-24 16:40:03 +01:00
Johannes Marbach
7913a42664 Add changelog file 2022-05-24 16:36:26 +02:00
Adam Brown
bec72264cd excluding the gms play-service-location optional transistive dependency for the fdroid variant 
- fixes fdroid being unable to compile the project due to a non foss dependency
 2022-05-24 10:10:03 +01:00
Jeremy
3b1a7f93cb
Create 6132.misc 2022-05-24 14:40:13 +12:00
Adam Brown
a59b8bf50c
Merge pull request #6065 from vector-im/feature/adm/matrix-org-ordering 
FTUE - Only override sign up steps for `matrix.org`
 2022-05-23 21:24:48 +01:00
Maxime NATUREL
695c234139 Adding changelog entry 2022-05-23 17:34:51 +02:00
Maxime NATUREL
9a38d59f9a
Merge pull request #6092 from vector-im/feature/mna/PSF-888-navigation 
[Location sharing] - Navigation to Map view from live location message (PSF-888)
 2022-05-23 13:54:04 +02:00
Benoit Marty
fd252dbaff
Merge pull request #5856 from ofalvai/bugfix/ofa/read-recept-text-scale 
Use fixed text size in read receipt counter
 2022-05-23 13:41:03 +02:00
Adam Brown
98999c754f
Merge pull request #5868 from vector-im/feature/adm/ftue-email-verification 
[FTUE] - Email input and verification
 2022-05-23 11:14:46 +01:00
Benoit Marty
71e14ea43b
Merge pull request #6110 from vector-im/defect/jorgem/PSE-613-fix-multi-invites-to-room 
Fix sending multiple invites to a room reaching only one or two people
 2022-05-23 09:39:47 +02:00
Jorge Martín
96e3544a47 Fix sending multiple invites to a room reaching only one or two people 2022-05-23 08:14:32 +02:00
Benoit Marty
0307e572c0 Add note about API renaming 2022-05-20 21:14:42 +02:00
Benoit Marty
268c41a0ee Changelog 2022-05-20 21:14:42 +02:00
Onuray Sahin
109b381e2e
Merge pull request #6103 from vector-im/feature/ons/fix_live_location_flickering 
Glide - Use current drawable while loading new static map image
 2022-05-20 18:36:12 +03:00
chagai95
f90078c593
Merge branch 'vector-im:develop' into native-lookup-fixes 2022-05-20 15:51:14 +02:00
ariskotsomitopoulos
e323caa233 Merge branch 'develop' into feature/aris/crypto_replay_attack 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
 2022-05-20 15:46:15 +03:00
ariskotsomitopoulos
c958d3a383 Merge branch 'develop' into feature/aris/crypto_replay_attack 2022-05-20 15:43:08 +03:00
Adam Brown
735adf0c96 adding changelog entry 2022-05-20 12:11:44 +01:00
Onuray Sahin
468cc30019 Changelog added. 2022-05-20 12:22:24 +03:00
Benoit Marty
b547a49ab3
Merge pull request #6089 from vector-im/feature/bma/real_fail 
Ensure calling 'fail()' is not caught by the Exception handler
 2022-05-20 10:33:02 +02:00
ClaireG
b379ef46ec
Revert: Use member name instead of room name in DM creation item (#6049) 2022-05-19 14:14:58 +00:00
chagai95
8c783f9414
Create 6101.bugfix 2022-05-19 15:12:04 +02:00
Onuray Sahin
da764d7c9a
Merge pull request #6074 from vector-im/feature/ons/poll_refactoring 
Poll refactoring with unit tests (PSF-1020)
 2022-05-19 14:53:45 +03:00
Onuray Sahin
1605ae1607 Merge branch 'develop' into feature/ons/poll_refactoring 
* develop: (251 commits)
  Space explore rooms screen alignment with design in figma (#5834)
  leaving space aligned with ios (#5942)
  Fix usage of System.currentTimeMillis(). This a bit mocky but anyway it's better to use SystemClock.elapsedRealtime() for this case.
  Update TimelinePreviousLastForwardTest.kt
  Changelog.d
  Rename 'getDomain' to 'getServerName'.
  Well-known lookups should not include the port of a server.
  Ah it was used in Gplay variant. Anyway I think we can still remove this now.
  Fix parsing of location data in non encrypted room
  Additionally increment for TimelinePreviousLastForwardTest
  Notify other devices of acceptance of verification request
  Instead of using a magic number, explicitly test for the events we expect.
  Adding comments on some strings and removing non necessary plural
  Remove ShortcutBadger lib and usage (it was dead code)
  Version++
  Fastlane file
  Towncrier
  Add `.login` to get the username of the PR merger.
  Rename folder for the PlayStore
  Remove empty translations
  ...

# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
 2022-05-19 13:39:43 +03:00
Onuray Sahin
2e2dffd9c9 Merge branch 'develop' into live_location_labs_flag 
* develop:
  Space explore rooms screen alignment with design in figma (#5834)
  leaving space aligned with ios (#5942)
  Fix usage of System.currentTimeMillis(). This a bit mocky but anyway it's better to use SystemClock.elapsedRealtime() for this case.
 2022-05-19 12:52:05 +03:00
fedrunov
a30912f688
Space explore rooms screen alignment with design in figma (#5834) 2022-05-19 11:49:20 +02:00
fedrunov
18842b5e3d
leaving space aligned with ios (#5942) 2022-05-19 11:49:08 +02:00
Onuray Sahin
5b43257f35 Changelog added. 2022-05-19 12:44:51 +03:00
Michael Kaye
5260e729ac
Merge pull request #6095 from vector-im/michaelk/correct_well_known_behaviour 
Well known lookups should be to port 443 only.
 2022-05-18 16:50:43 +01:00
Michael Kaye
9c99d12c44 Changelog.d 2022-05-18 15:32:06 +01:00
Benoit Marty
7ae3f6ea40
Merge pull request #6083 from vector-im/feature/bma/remove_badge 
Remove ShortcutBadger lib and usage (it was dead code)
 2022-05-18 16:19:37 +02:00
Maxime NATUREL
738ce18a2f
Merge pull request #5989 from vector-im/feature/mna/PSF-884-location-view 
[Location sharing] - Message for live sharing in timeline (PSF-884)
 2022-05-18 15:39:51 +02:00
Maxime NATUREL
b2765e4b63 Adding changelog entry 2022-05-18 14:44:44 +02:00
Benoit Marty
328d834851 changelog 2022-05-18 13:09:58 +02:00
Jorge Martín
123ad87eda Notify other devices of acceptance of verification request 2022-05-18 12:31:32 +02:00
Michael Kaye
f7303789a0
Merge pull request #6025 from vector-im/michaelk/skip_tests_failing_on_ci 
Improve test handling in CI
 2022-05-18 09:51:17 +01:00
Benoit Marty
adb537006a Remove ShortcutBadger lib and usage (it was dead code) 2022-05-18 09:06:04 +02:00
Benoit Marty
e14b9a445e Towncrier 2022-05-17 21:13:08 +02:00
ariskotsomitopoulos
abbc57429a Add changelog 2022-05-17 17:16:27 +03:00
Onuray Sahin
edd35872f3 Fix ending poll power level condition. 2022-05-17 15:44:39 +03:00
Benoit Marty
46e8737426
Merge pull request #6039 from vector-im/feature/dla/fix-sip-on-unhold 
Direction and track need to be set for hold/unhold
 2022-05-17 14:33:02 +02:00
ericdecanini
b12549831e Merge remote-tracking branch 'origin/develop' into bugfix/eric/softlogout-ux-broken 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/SessionParamsMapper.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
#	vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
#	vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
#	vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
 2022-05-17 14:24:35 +02:00
ericdecanini
520c3e474c Adds changelog file 2022-05-17 12:02:29 +02:00
ariskotsomitopoulos
324856d700 Merge branch 'develop' into feature/aris/threads_post_release_ui_improvements 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
 2022-05-17 11:55:07 +03:00
Michael Kaye
012b20fca6 changelog.d 2022-05-16 15:59:41 +01:00
Benoit Marty
afd2804ed3
Merge branch 'develop' into feature/mna/PSF-884-location-view 2022-05-16 14:42:38 +02:00
Adam Brown
a893f5acdb applying the manual reordering of the sign up stages only when matrix.org is selected 
- lifts the logic up to the view model
 2022-05-16 12:33:54 +01:00
Benoit Marty
5387c9101e Changelog 2022-05-16 12:23:10 +02:00
Benoit Marty
15366f8d2a
Merge pull request #5973 from vector-im/michaelk/document_public_baseurl_requirement 
Document need for public_baseurl to be correctly set.
 2022-05-16 11:27:31 +02:00
Benoit Marty
90035de5f2
Merge pull request #6047 from chagai95/add-presence-indicator-busy-and-away 
add presence indicator busy and away
 2022-05-16 11:26:11 +02:00
Benoit Marty
9234c60155
Merge pull request #6038 from vector-im/feature/bma/detekt 
Detekt
 2022-05-13 23:40:53 +02:00
chagai95
491b3c351b
Create 6047.feature 2022-05-13 14:00:32 +02:00
Benoit Marty
d17a273cb4 Changelog 2022-05-12 22:56:09 +02:00
Valere
22e0506814 Prevent 4S / megolm backup desync + sign with MSK 2022-05-12 18:45:35 +02:00
David Langley
44e8974c02 direction and track need to be set for hold/unhold 2022-05-12 17:01:44 +01:00
Ahmed Radhouane Belkilani
6a523ccc38 Allow using the latest user avatar and display name for all messages in the timeline 
Signed-off-by: Jorge Martín Espinosa <jorgem@element.io>
 2022-05-12 15:43:20 +02:00
ericdecanini
52c404ac9c Merge remote-tracking branch 'origin/develop' into feature/eric/replace-search-room-subheader 2022-05-12 14:36:04 +02:00
ariskotsomitopoulos
40de685f1a Merge branch 'develop' into feature/aris/threads_post_release_ui_improvements 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
 2022-05-12 14:41:38 +03:00
Benoit Marty
cd509accdb
Merge pull request #5936 from hanthor/develop 
Added themed icon for Android 13
 2022-05-11 17:34:38 +02:00
Valere
304cb07858
Merge pull request #5559 from vector-im/feature/bca/crypto_better_key_share 
Update/Revise SDK to implement reference flowchart for key sharing/forwarding + use backup
 2022-05-11 12:05:58 +02:00
Travis Ralston
019ec6c1c8
Merge pull request #5997 from vector-im/travis/spec/v1.3-edit/nothreads 
Remove spec v1.3 check for threads
 2022-05-10 14:47:48 -06:00
Travis Ralston
f1de116eff add changelog 2022-05-10 13:18:12 -06:00
Valere
12ab4787f1 Merge branch 'develop' into feature/bca/crypto_better_key_share 2022-05-10 19:30:52 +02:00
Benoit Marty
eafe65b417
Merge pull request #5831 from emotionalamoeba/develop 
Updated copy and moved override in profile screen
 2022-05-10 14:40:40 +02:00
Adam Brown
ece48baa9d
Merge pull request #5965 from vector-im/feature/adm/matrix-id-certificate 
Handling SSL/TLS errors during WellKnown lookup
 2022-05-10 12:17:48 +01:00