filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,216 Commits 7 Branches 127 Tags
Commit Graph

3798 Commits

Author SHA1 Message Date
SpiritCroc
acdd4e24b9 Merge tag 'v1.3.12' into sc 
Change-Id: I66c0120371c3f52295f033ec21702c08381b5b10

Conflicts:
	build.gradle
	vector/build.gradle
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
	vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/res/drawable/highlighted_message_background.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/fragment_home_detail.xml
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/layout/fragment_room_detail.xml
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
	vector/src/main/res/layout/item_expandable_textview.xml
	vector/src/main/res/layout/item_login_header.xml
	vector/src/main/res/layout/item_radio.xml
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
	vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
	vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
	vector/src/main/res/layout/item_timeline_event_poll_stub.xml
	vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
	vector/src/main/res/layout/item_timeline_event_voice_stub.xml
	vector/src/main/res/layout/view_stub_room_profile_header.xml
	vector/src/main/res/layout/view_url_preview.xml
	vector/src/main/res/xml/vector_settings_labs.xml
	vector/src/main/res/xml/vector_settings_root.xml
 2021-12-23 14:36:13 +01:00
Benoit Marty
fa060051ed
Merge pull request #3970 from vector-im/feature/ons/fallback_keys 
Fallback keys implementation
 2021-12-13 23:36:20 +01:00
Onuray Sahin
f028f9836b Merge branch 'develop' into feature/ons/poll_timeline 
* develop: (49 commits)
  Update changelog.d/4592.bugfix
  Remove jcenter from here, let's see what the CI will say
  Common struct for each maven repo
  Rename the file to group them
  Add changelog file
  Revert PR 4592 for devtools
  Enhance include groups implementation by decoupling them to a separate file
  Cleanup
  Legals: improve API to get homeserver terms
  Legals: update setting icon
  Auto-review
  Add a help section in the settings.
  Changelog
  Color for links
  Use same height than the loading item to avoid dynamic resizing
  Legals: only display external URLs.
  Legals: Move the 2 copyrights items to the new legal screen
  Add some space between the 2 TextViews, and improve the layout
  Legals: Move the 3 element links to the new legal screen
  Rename some classes
  ...

# Conflicts:
#	vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
#	vector/src/main/res/layout/item_timeline_event_poll_stub.xml
 2021-12-13 17:44:21 +03:00
Valere
76960f8b67
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OneTimeKeysUploader.kt 
Co-authored-by: poljar <poljar@termina.org.uk>
 2021-12-10 16:12:14 +01:00
Valere
38a8e8b003
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OneTimeKeysUploader.kt 
Co-authored-by: poljar <poljar@termina.org.uk>
 2021-12-10 16:11:58 +01:00
Onuray Sahin
9b2a3cf445 Code review fixes. 2021-12-10 17:57:57 +03:00
Benoit Marty
bf7907a119 Legals: improve API to get homeserver terms 2021-12-10 15:35:46 +01:00
Benoit Marty
411fd31d4c Legals: Trick to get the homeserver policy 2021-12-10 15:34:25 +01:00
Onuray Sahin
be9e592aa5 Do not allow to vote the same option twice. 2021-12-09 16:08:59 +03:00
Onuray Sahin
04a7590804 Code review fixes. 2021-12-09 15:09:12 +03:00
Valere
a026137381 code review 2021-12-08 15:47:06 +01:00
Valere
01b8b7d57a Code review 2021-12-08 14:17:08 +01:00
Valere
5d35f02abb Support using unpublished fallback key instead of generating 
And forgetFallback after 5mn
 2021-12-07 19:56:14 +01:00
Valere
f843dddc3a Cleaning 2021-12-07 19:05:36 +01:00
Valere
10671a53a4 Quick refactor to use same mechanism as updateOneTimeKeyCount 2021-12-07 19:05:36 +01:00
Onuray Sahin
c603135398 Code review fixes. 2021-12-07 19:05:36 +01:00
Benoit Marty
4ac90f10c1 Fallback keys implementation. 
Author: Onuray - Benoit squashes the 4 commit to cancel the addition on binaries
 2021-12-07 19:05:36 +01:00
Onuray Sahin
953fadeed4 Merge branch 'develop' into feature/ons/poll_timeline 
* develop: (319 commits)
  Bump dagger from 2.40.4 to 2.40.5
  More debouncing
  Changelog
  I need the view here
  clicks() already has debouncing with conflate(), so throttleFirst is not necessary
  Use debouncedClicks where applicable
  Use `observeViewEvents` facility
  private
  use != rather that is
  Fix waring for state is not dialing or connected
  state can also be connected
  Add script to compress video and convert to gif file
  removing boolean notification version usage
  adding changelog entry
  removing unused imports and increasing enum allowance
  porting the notifications setting version to the vector features
  Add warning if unexpected state.
  setting login version via typed build config field instead of resources
  separating the SSO redirection from the login activities - adds a dedicated routing activity to proxy the uri to the login selected by the feature flags
  Removing trailing space
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
#	vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
#	vector/src/main/res/xml/vector_settings_labs.xml
 2021-12-07 18:50:52 +03:00
Onuray Sahin
75b544a110 Support push notification for poll creation event. 2021-12-07 12:53:35 +03:00
Benoit Marty
f1d8b9e974
Merge pull request #4637 from vector-im/feature/dla/outgoing_pstn_call_fails 
Feature/dla/outgoing pstn call fails
 2021-12-06 21:37:11 +01:00
David Langley
747030b578 use != rather that is 2021-12-06 14:37:36 +00:00
David Langley
03be698a7e Fix waring for state is not dialing or connected 2021-12-06 13:46:56 +00:00
David Langley
a6d6fd7b3b state can also be connected 2021-12-06 13:05:37 +00:00
SpiritCroc
4b63a9f939 Merge tag 'v1.3.9' into sc 
Change-Id: I26834af19e0b02887f288b6441ced6d993cb8861

Conflicts:
	vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt
	vector/src/gplay/java/im/vector/app/push/fcm/EmbeddedDistrib.kt
	vector/src/main/java/im/vector/app/VectorApplication.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewEvents.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
	vector/src/main/res/drawable/ic_shield_custom.xml
	vector/src/main/res/drawable/ic_shield_trusted.xml
 2021-12-05 13:46:55 +01:00
Benoit Marty
e60d053f84
Merge pull request #4568 from vector-im/feature/fga/fix_sdk_integration_tests 
Feature/fga/fix sdk integration tests
 2021-12-03 17:11:33 +01:00
David Langley
767ead019a Add warning if unexpected state. 2021-12-03 15:13:06 +00:00
Onuray Sahin
23ad4e5a27 Remove legacy implementation classes. 2021-12-03 16:19:19 +03:00
Benoit Marty
cd7345aa6b
Removing trailing space 2021-12-03 13:54:05 +01:00
ganfra
667bf1a848 Tests: fix internal TestMatrix 2021-12-03 12:55:32 +01:00
David Langley
de7180ef7e And remove braces 2021-12-03 11:30:28 +00:00
David Langley
0cf50e88e9 Keep guard pattern 2021-12-03 11:28:49 +00:00
David Langley
bf8b485e2c lint 2021-12-03 11:24:40 +00:00
Onuray Sahin
c62028df68 Implement poll actions bottom sheet. 2021-12-03 11:41:21 +03:00
Onuray Sahin
2a3a55894f Aggregate votes and poll end event. 2021-12-03 11:23:47 +03:00
Onuray Sahin
a3b11b223a Allow removing poll event. 2021-12-03 11:21:52 +03:00
Onuray Sahin
7c269309c2 Allow sending vote and ending poll. 2021-12-03 11:21:21 +03:00
Onuray Sahin
ebc131f492 Implement new poll content. 2021-12-03 11:18:16 +03:00
David Langley
f3b3c880d0 select answer should be used for outgoing calls. 2021-12-02 18:35:51 +00:00
ganfra
f0ecfbbab2 Tests: TestMatrix should only be used internally by sdk tests 2021-11-30 17:22:50 +01:00
ganfra
51f46d199f Tests: clean after review 2021-11-30 14:15:18 +01:00
Adam Brown
cdb5376a19 Adding support for voice drafts 
- introduces a new Voice draft and sender mode type
- initializes the voice recorder with a previously recorded file (the draft)
- renames RecordingUiStates to map to their actual UI states
 2021-11-30 10:22:25 +00:00
ganfra
30fe564a2c Throw clear error when MatrixWorkerFactory is not set up on worker configuration 2021-11-29 19:26:55 +01:00
SpiritCroc
c8abe21ec0 Apply presence to all DMs with a user 
Change-Id: I7193cb5975a6a2e20055f5f99f8fa116b8dc1470
 2021-11-27 15:33:21 +01:00
ganfra
cfaa7268a8 Tests: clean up a bit 2021-11-26 18:17:28 +01:00
ganfra
ccdeeeab4c Tests: fix timeline tests + some small others 2021-11-26 18:16:27 +01:00
ganfra
1d9da6c7d3 Tests: do some clean-up and fix bunch of them 2021-11-25 12:46:16 +01:00
Benoit Marty
32441eb81b
Merge pull request #4553 from vector-im/feature/adm/stricter-voice-file-deletion 
Unable to upload .ogg to rooms
 2021-11-24 13:55:31 +01:00
Adam Brown
31bd4fd2d0 avoiding inferred voice type check via waveform in favour of using the attachment type 2021-11-24 11:38:28 +00:00
Adam Brown
5ee379e10d including a new voice message attachment type 
- allows for us to explictly delete voice message after uploading rather than inferring that audio message with the .ogg extension are voice messages which could have caused us to delete users files
 2021-11-24 10:21:12 +00:00
Benoit Marty
bd423db98a
Merge pull request #4548 from vector-im/feature/adm/sealed-class-cleanup 
Voice related sealed class cleanup
 2021-11-24 11:10:10 +01:00