mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-12-22 17:20:48 +03:00
Code Issues Projects Releases Packages Wiki Activity
13380 commits 160 branches 159 tags 271 MiB
Commit graph

171 commits

Author SHA1 Message Date
ariskotsomitopoulos
b2a2fe2710 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
#	tools/check/forbidden_strings_in_code.txt
#	vector/build.gradle
#	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
#	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/command/CommandParser.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.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/search/SearchResultItem.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
#	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
#	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
#	vector/src/main/res/layout/fragment_timeline.xml
#	vector/src/main/res/xml/vector_settings_labs.xml
 2022-01-27 17:11:26 +02:00
Benoit Marty
b619f70904 Merge branch 'develop' into feature/ons/static_location 2022-01-25 14:29:13 +01:00
ariskotsomitopoulos
636474b748 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.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/command/Command.kt
#	vector/src/main/java/im/vector/app/features/command/CommandParser.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
 2022-01-18 12:41:40 +02:00
Adam Brown
7eb83301b3 enabling resizable activities which should in turn allow desktop mode android to resize windows 2022-01-13 17:27:13 +00:00
Onuray Sahin
9ea30445ef Merge branch 'develop' into feature/ons/static_location 
* develop: (281 commits)
  Add a comment about the workaround
  Remove deprecated restricted lab option (#4889)
  Bump actions/github-script from 3 to 5.1.0
  Add some missing language in the change language screen
  Workaround to not to reuse poll option cells.
  Olm lib is now hosted in MavenCentral. Upgrade to 3.2.10
  Changelog
  Test: Fix test after change on OnBoarding screens
  Test: Analytics opt-in
  Cleanup
  Revert "Disable automatic opt-in screen display."
  - Do not add GitHub comments on successful ktlint runs  - Remove already existing comments when ktlint succeed
  restore deprecated lab preference
  Update nb of enum classes
  Change autoUisi label + rename matching_issue
  code review
  Fix enabling was broken
  Simple rate limiting of RS sending
  use flow instead of reactivex
  Fix UISIS preference listener
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
#	vector/src/main/res/layout/view_attachment_type_selector.xml
#	vector/src/main/res/values/strings.xml
 2022-01-11 14:42:11 +03:00
ariskotsomitopoulos
ac5caccdf9 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
#	tools/check/forbidden_strings_in_code.txt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/res/menu/menu_timeline.xml
 2022-01-07 13:29:43 +02:00
Adam Brown
98078da13d renaming the ftue domain to onboarding and ftue to ftue auth 2022-01-05 10:32:31 +00:00
ariskotsomitopoulos
694b8de034 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	library/ui-styles/src/main/res/values/dimens.xml
 2022-01-03 11:08:22 +02:00
Benoit Marty
bb0725b2e2
Merge pull request #4656 from vector-im/feature/adm/dynamic-login-flow 
Feature based FTUE flows
 2021-12-30 10:29:52 +01:00
Onuray Sahin
bf48617fc6 Create base UI components of location sharing screen. 2021-12-15 00:13:52 +03:00
ariskotsomitopoulos
cd95fc41e4 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	library/ui-styles/src/main/res/values/dimens.xml
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
#	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
#	vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.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/timeline/action/MessageActionsViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.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/notifications/NotificationUtils.kt
#	vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
#	vector/src/main/res/layout/fragment_room_detail.xml
 2021-12-14 20:18:54 +02:00
Onuray Sahin
03a4194047 Add location attachment icon with required permissions. 2021-12-14 14:44:09 +03:00
Adam Brown
74594d8fc3 porting the LoginActivty2 to a dynamic FTUE activity 
- supports switching between a copied legacy flow (DefaultFTUE) and the WIP variant
- this will allow us to make iterative changes to the default ftue flow without affecting the legacy flow/forks
 2021-12-14 09:06:15 +00:00
Benoit Marty
f4cfb5d6d3
Merge pull request #4559 from vector-im/feature/bma/posthog 
Analytics
 2021-12-14 09:31:55 +01:00
Benoit Marty
df3f8bd88e Use emoji2 library 2021-12-13 12:36:46 +01:00
Benoit Marty
673cbb29de Merge branch 'develop' into feature/bma/posthog 2021-12-07 14:26:31 +01:00
Benoit Marty
8c794b1059 Analytics: Opt-in screen logic + remove from SplashScreen 2021-12-06 11:13:49 +01:00
Adam Brown
8007654e2a setting login version via typed build config field instead of resources 2021-12-03 15:11:31 +00:00
Adam Brown
54c45d3e71 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
 2021-12-03 14:51:20 +00:00
ariskotsomitopoulos
586b3d8caa - Add specific toolbar for threads 
- Renamed RoomDetailFragment to TimelineFragment while it should be reused from threads
 - View root thread message in room functionality
 2021-11-22 14:02:17 +02:00
Benoit Marty
e233915c0f Jitsi android-sdk-3.1.0 -> android-sdk-3.10.0 2021-11-18 15:58:40 +01:00
Benoit Marty
be3aafeef2
Merge pull request #4433 from vector-im/feature/bma/android12 
Android12
 2021-11-16 13:27:33 +01:00
Benoit Marty
31809a595c Temporary fix for Android 12. android:exported has to be explicitly set when targeting Android 12 
Do it for services coming from dependencies
 2021-11-15 12:24:48 +01:00
Benoit Marty
aa3f36b7b7 Target API 31 - Android 12 - #4262 2021-11-15 12:24:48 +01:00
Onuray Sahin
40aa0175d0 Code review fixes. 2021-10-29 16:54:54 +03:00
Onuray Sahin
4af42902a0 Create poll screen components implemented. 2021-10-25 16:41:37 +03:00
ariskotsomitopoulos
ab87937e5b Threads init commit 2021-10-20 18:39:59 +03:00
thomcatdotrocks
32658f6651
Re-enable Android Auto 
Commit to complete #4247 after #4222 has been merged.
 2021-10-14 10:45:59 -05:00
Benoit Marty
d309c71d83 Disable Android Auto supports see https://github.com/vector-im/element-android/issues/4205 2021-10-11 10:21:42 +02:00
ariskotsomitopoulos
f21d89eb29 Minimize the use of exported="true" in android Manifest 
- Add comments on Add exported="true" attributes
 - Disable manifest exporting for:
      - (service) VectorConnectionService
      - (receiver) MediaButtonReceiver
 2021-10-05 13:57:01 +03:00
Benoit Marty
3719382569
Merge pull request #3953 from vector-im/dependabot/gradle/androidx.work-work-runtime-ktx-2.6.0 
Bump work-runtime-ktx from 2.5.0 to 2.6.0
 2021-09-30 14:25:43 +02:00
Benoit Marty
3f7e810f14 Handle change from WorkManager 2.6.0. 
https://developer.android.com/jetpack/androidx/releases/work#2.6.0
 2021-09-30 12:06:57 +02:00
Benoit Marty
5d51431c60
Merge pull request #4078 from abaker/android_auto 
Add Android Auto notification support
 2021-09-30 11:29:58 +02:00
Alex Baker
09a25cce4e Add Android Auto notification support 
Signed-off-by: Alex Baker <alex@beeper.com>
 2021-09-24 16:43:00 -05:00
Florian Renaud
fa3abecf8f Fix review 2021-09-20 15:18:06 +02:00
Florian Renaud
e37fb313c0 Permalink: Merge LinkHandlerActivity with PermalinkHandlerActivity 
Also convert links to matrix.to before permalink parsing
 2021-09-17 17:19:32 +02:00
Valere
9a9a3d8cc6 Cherry pick room on leave space 2021-09-16 09:20:25 +02:00
ganfra
bcc9a75bdb Merge branch 'develop' into feature/fga/new_voip_design 2021-08-11 12:37:54 +02:00
Valere
6c2a917d9f WIP 2021-07-30 18:43:34 +02:00
ganfra
5c1bf92514 WebRtcCall: start using PiP 2021-07-13 10:44:34 +02:00
Benoit Marty
1a898f0404 Rename themes follow Android conventions 2021-06-16 12:34:14 +02:00
Benoit Marty
a7c1dc5cd9
Merge branch 'develop' into feature/bma/login_v2 2021-05-20 15:18:18 +02:00
Valere
99d4471799 space beta people screen 2021-05-05 17:54:56 +02:00
Benoit Marty
faef2fba9a Enable login v2 by default, but keep the possibility to use v1 2021-04-29 15:57:52 +02:00
Benoit Marty
408a0fc010 Login UX flow v2 2021-04-29 15:57:22 +02:00
Benoit Marty
751efb57fc
Merge pull request #2840 from vector-im/feature/bca/spaces_sdk 
Spaces support - beta
 2021-04-29 10:18:31 +02:00
Benoit Marty
c40476aa94 Add ability to install APK from directly from Element (#2381) 
And cleanup `data class OpenFile`
 2021-04-28 15:55:21 +02:00
Benoit Marty
9cb19c0581 Fix issues on Android 11 (#3067) 
Add <queries> tag in manifest to be able to open file using external app and to use full feature of CustomTab
 2021-04-28 14:04:27 +02:00
Valere
8146d8ab1e Add Rooms to space 2021-04-28 11:15:58 +02:00
Benoit Marty
eac8938186 Cleanup 2021-04-28 11:15:58 +02:00