mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-06 08:17:38 +03:00
Code Issues Projects Releases Packages Wiki Activity
8035 commits 7 branches 124 tags 230 MiB
Commit graph

141 commits

Author SHA1 Message Date
SpiritCroc
ca0b360875 Merge tag 'v1.1.0' into sc 
Change-Id: I73be281134a8a7ea7fdeffa9356ffae0dda8b0d6

Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.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/timeline/item/AbsBaseMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
	vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt
	vector/src/main/res/drawable/oval_positive.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/dialog_disclaimer_content.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_generic_with_value.xml
	vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
	vector/src/main/res/menu/menu_timeline.xml
	vector/src/main/res/values/array.xml
 2021-02-20 15:41:01 +01:00
Benoit Marty
cf0b4d2581 Merge branch 'develop' into feature/bca/devtools 2021-02-15 16:00:32 +01:00
Benoit Marty
1ec4424c0a Upgrade Jitsi library from 2.9.3 to 3.1.0 2021-02-10 12:15:32 +01:00
Valere
e5da026f1f Dev tools initial commit 2021-02-10 10:17:19 +01:00
SpiritCroc
c2ce787310 Merge tag 'v1.0.16' into sc 
Change-Id: Ia65e40a4acaee3f26a5680f05b3ae1bf8327d4d6

Conflicts:
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
 2021-02-04 17:10:15 +01:00
ganfra
6cd462f852 Merge branch 'develop' into feature/fga/voip_v1_start 2021-02-04 16:52:06 +01:00
Benoit Marty
bc22647b48
Merge pull request #2753 from vector-im/feature/bca/sso_reauth 
Feature/bca/sso reauth
 2021-02-03 16:12:54 +01:00
ganfra
49aed39711 Fix multiple tasks 2021-02-02 17:11:45 +01:00
Valere
8129cd0cd3 Cleaning + changelog 2021-02-02 09:32:04 +01:00
Valere
1244d00b31 SSO UIA 2021-02-01 16:39:14 +01:00
ganfra
f4fd8af3b4 Merge branch 'develop' into feature/fga/voip_v1_start 2021-01-29 18:46:19 +01:00
SpiritCroc
41e9e1e4f5 Revert "Revert "Remove empty task affinity"" 
Still issues with duplicated tasks otherwise

This reverts commit aca8715ec8.

Change-Id: Iae1f3e540fae10aa3fe2cc2f1efc418cf53d37b7
 2021-01-19 11:04:18 +01:00
SpiritCroc
aca8715ec8 Revert "Remove empty task affinity" 
Upstream found a better fix.

This reverts commit 3cb5f6087c.

Change-Id: I65a3c7628a67ed3ab2782894855c5dba38c3856f
 2021-01-16 15:00:53 +01:00
SpiritCroc
53c498b728 Merge tag 'v1.0.14' into sc 
Change-Id: I0d3df2f8c5f4e611f3268c4c4d2784f7eac89bb5

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	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/session/media/UrlsExtractor.kt
	vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt
	vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.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/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/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	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_keys_backup_setup_step3.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2021-01-16 11:21:09 +01:00
Benoit Marty
e21c8792e6 Fix switch theme issue, and white field issue (#2599, #2528) 
Remove some workarounds. I cannot reproduce the bug of signout which does not destroy the HomeActivityViewModel...
 2021-01-08 15:55:32 +01:00
ganfra
22c981d8bf VoIP: start adding UI for call transfer 2020-12-22 16:44:39 +01:00
ganfra
14288b545b Merge branch 'develop' into feature/fga/voip_v1_start 2020-12-22 11:38:41 +01:00
SpiritCroc
8da4044de6 Merge tag 'v1.0.13' into sc 
Change-Id: Ica0f7dfed8acda02772a90e30bfba3f9d284c538
 2020-12-22 09:24:31 +01:00
Benoit Marty
68cd06f1fb Improve redirect url, which can be visible to the user: "element://element" -> "element://connect" 2020-12-17 12:11:30 +01:00
SpiritCroc
38b82fb823 Merge tag 'v1.0.12' into sc 
Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.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/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
	vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/res/drawable/ic_attachment.xml
	vector/src/main/res/layout/item_bottom_sheet_action.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
	vector/src/main/res/values-v23/theme_status.xml
	vector/src/main/res/values/array.xml
	vector/src/main/res/values/theme_status.xml

Note to self: need to check if URL preview works with wrap_content

Change-Id: I028b2873a33bb1a770f2da96d576b97202b5bcf9
 2020-12-15 15:55:14 +01:00
Benoit Marty
5461fd4060 Some cleanup up 2020-12-11 16:35:04 +01:00
Valere
bd9da8eaa6 element:// support + basic peeking + fix join via server 2020-12-11 15:06:39 +01:00
ganfra
efec711ced Merge branch 'develop' into feature/fga/voip_v1_start 2020-12-03 13:01:54 +01:00
ganfra
131afcebf1 VoIP: exclude call activity from recents 2020-12-02 12:18:15 +01:00
SpiritCroc
3cb5f6087c Remove empty task affinity 
By default, all activities of the app share the same task affinity. By
setting it to "" for this activity, on launch the splash screen and the
home activity are launched as two separate tasks (tested on Android 11).

Change-Id: I60e3791017b6c33288d152cf97c5af04ae8979eb
 2020-11-29 18:27:37 +01:00
SpiritCroc
0b4f56d7a0 Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: Icb4d672fc9d301803b300d6ac25b348780f11e6c

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
	vector/src/main/res/layout/fragment_known_users.xml
	vector/src/main/res/layout/fragment_user_list.xml
 2020-11-29 12:51:43 +01:00
Valere
804afc9a1d Fix issues with matrix.to deep linking 2020-11-26 09:09:27 +01:00
SpiritCroc
d850c7ac42 Simplified mode setting 
- Hide public room functionality (rationale: people chatting with strangers on the internet can be considered advanced users)
    - Clicking on + / Rooms goes directly to "Create new room" instead of the intermediate step which allows joining public rooms
    - The "New room" screen would hide the setting to make the room public and publish it in the room directory
    - Hide room address settings in the room settings
- Hide encryption settings (rationale: encryption is hard to explain to users without background knowledge)

Closes https://github.com/SpiritCroc/SchildiChat-android/issues/23

Change-Id: If1a7f16880ca2f4333270ec29cc1d27f70a9132d
 2020-11-22 17:42:08 +01:00
Benoit Marty
1070c23608 QR code invite flow support - invite friends 
Author: Valere
 2020-11-20 14:50:21 +01:00
SpiritCroc
58d99e10a0 Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: I004362e70c17eba5828e10ec9bf8b37568f64f01

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/res/menu/menu_timeline.xml
 2020-11-05 13:15:55 +01:00
Benoit Marty
b15fa7c0d7 Two elements in the task switcher (#2299) 2020-11-04 14:32:54 +01:00
SpiritCroc
44d3c0118a Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: If0e38334e7e479134cd05283f857e4871bb7692f

Conflicts:
	vector/build.gradle
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/RoomListDisplayMode.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/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/res/drawable/ic_settings_root_advanced.xml
	vector/src/main/res/drawable/ic_settings_root_call.xml
	vector/src/main/res/drawable/ic_settings_root_flair.xml
	vector/src/main/res/drawable/ic_settings_root_general.xml
	vector/src/main/res/drawable/ic_settings_root_help_about.xml
	vector/src/main/res/drawable/ic_settings_root_ignored_users.xml
	vector/src/main/res/drawable/ic_settings_root_labs.xml
	vector/src/main/res/drawable/ic_settings_root_legacy.xml
	vector/src/main/res/drawable/ic_settings_root_notification.xml
	vector/src/main/res/drawable/ic_settings_root_preferences.xml
	vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
	vector/src/main/res/layout/fragment_home_drawer.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_bottom_sheet_action.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/view_avatar_selector.xml
 2020-10-17 15:28:18 +02:00
Benoit Marty
f68eb449bd Be robust against StrandHogg task injection 2020-10-15 15:55:55 +02:00
Constantin Wartenburger
afe55ae57e
Merge remote-tracking branch 'upstream/develop' into direct_share 2020-10-13 20:26:07 +02:00
Benoit Marty
ca99a52545 Remove dead code 2020-10-13 14:40:23 +02:00
Constantin Wartenburger
741f3f4066
Merge remote-tracking branch 'upstream/develop' into direct_share 2020-10-12 17:52:01 +02:00
Benoit Marty
6f709a1e7c
Merge pull request #2203 from vector-im/feature/bma/pusher_data 
Feature/bma/pusher data
 2020-10-12 14:51:15 +02:00
Benoit Marty
17f0c29264 Fix lint false positive 2020-10-12 14:12:44 +02:00
Constantin Wartenburger
7e5ee8f951
Made it backwards compatible 2020-10-11 22:09:19 +02:00
Constantin Wartenburger
0ae7242e17
Added direct share 2020-10-11 21:09:36 +02:00
Benoit Marty
dbb77d9dc1 Push test: success if user click on the notification 2020-10-08 22:08:48 +02:00
Benoit Marty
6872a488de Fix the latest lint issue (will modify the pipeline to let the test compilation pass 2020-10-08 13:04:55 +02:00
Onuray Sahin
f54504e871 Create search UI classes. 2020-10-01 14:48:55 +02:00
SpiritCroc
bdd71769a0 Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: Ibdd2790a7f2a8a1f126ef7af2032fe72f7dd777e
 2020-09-08 18:52:59 +02:00
Onuray Sahin
fc51097ed8 develop and staging subdomains are added. 2020-09-07 17:17:58 +03:00
Onuray Sahin
4d7cd7319b Handle new mobile config url. 2020-09-07 12:19:34 +03:00
Onuray Sahin
a151f42495 Handle room, user, group links by converting them to permalinks. 2020-09-02 18:26:08 +03:00
SpiritCroc
7b4b5be759 Merge tag 'v1.0.5' into sc 
Conflicts:
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_timeline_event_file_stub.xml
	vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
	vector/src/main/res/values-v21/styles_login.xml
	vector/src/main/res/values/theme_dark.xml
	vector/src/main/res/values/theme_light.xml
	vector/src/main/res/values/theme_status.xml
 2020-08-22 11:23:45 +02:00
SpiritCroc
cbd22a1257 Merge commit 'a1f90abcd20d2100e02767a6fd2cfb9969f12a4d' into sc 
Merge v1.0.5 pt. 2

Conflicts:
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
	vector/src/main/java/im/vector/app/core/resources/ColorProvider.kt
	vector/src/main/java/im/vector/app/core/ui/views/WrapWidthTextView.kt
	vector/src/main/java/im/vector/app/core/utils/UserColor.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/RoomColor.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/timeline/item/AbsMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/RedactedMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListActivity.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
	vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginHeaderItem.kt
	vector/src/main/java/im/vector/app/features/themes/BubbleThemeUtils.kt
	vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_base_state.xml
	vector/src/main/res/xml/vector_settings_advanced_settings.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2020-08-22 10:29:31 +02:00
SpiritCroc
c2e1a33864 Merge commit '67fc2feacb8e2563cc25f61ed6da48cb4de57ed7' into sc 
Merge v1.0.5 pt. 1

Conflicts:
	vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/values/theme_dark.xml
	vector/src/main/res/values/theme_light.xml
 2020-08-22 09:52:54 +02:00