mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-29 04:18:38 +03:00
Code Issues Projects Releases Packages Wiki Activity
16095 commits 7 branches 124 tags 230 MiB
Commit graph

121 commits

Author SHA1 Message Date
SpiritCroc
93ae1e954e Switch to schildi.chat FCM gateway 
The matrix.org one seems to be a little slow compared to a private one
recently

Change-Id: Ia9ce4f40c920657abb38aa5ebe31704cf829f4ec
 2022-03-09 11:16:22 +01:00
SpiritCroc
b30f583f13 [merge-fixup] Delete TestFirebaseToken, we use unifiedpush 
Change-Id: I62dc2801798d99cd83b2c0df97a0ab6cf2004a1c
 2021-11-20 09:41:33 +01:00
S1m
cef51619b1 Move GuardService to main 
Users using the gcm flavor without playservice will be able to
use the background sync.
 2021-11-17 21:00:09 +01:00
SpiritCroc
d9a5991559 Merge tag 'v1.3.8' into HEAD 
Change-Id: If3e3927755638ee38d8817f8504f09b0df14f309

Conflicts:
	dependencies.gradle
	vector/src/fdroid/AndroidManifest.xml
	vector/src/gplay/AndroidManifest.xml
	vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/composer/ComposerEditText.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
 2021-11-17 20:17:45 +01:00
SpiritCroc
c5f48fa4d2 Merge tag 'v1.3.7' into sc 
Change-Id: Id73c834c10e11ccd46d7d2adc8328eb95d051941

Conflicts:
	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/RoomSummaryEntity.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
	vector/build.gradle
	vector/src/fdroid/AndroidManifest.xml
	vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/main/java/im/vector/app/VectorApplication.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
	vector/src/main/java/im/vector/app/core/receiver/OnApplicationUpgradeOrRebootReceiver.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
 2021-11-17 19:01:22 +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
aa3f36b7b7 Target API 31 - Android 12 - #4262 2021-11-15 12:24:48 +01:00
Adam Brown
588958c807 moving the notifable queue adding to the queue itself and making onNotifiableEventReceived not synchronised for use within the synchronized batching 
- makes the refresh function private as all interactions now come through via update
 2021-11-08 15:24:08 +00:00
Adam Brown
c173adb783 removing google play background task starting, we should rely on play services 2021-11-04 09:45:59 +00:00
Adam Brown
56d5a38e80 reverting parts of the rapid periodic sync, unfortunately it suffers from the same issue as the one shot workers - 
the system can ignore them if the application process is in the background
 2021-11-04 09:45:59 +00:00
Adam Brown
71b27bfd5d making the guard service a noop, lifeline scheduling will be brought back if we confirm the service by itself is not enough 
- reuses the sync foreground notification for the guard foreground service
 2021-11-04 09:45:59 +00:00
Andrew Aylett
d261dd705d Periodic sync to re-kick-off rapid sync 2021-11-04 09:45:59 +00:00
Adam Brown
86b500445f updating the push gateway property to reflect that it mean the event can be replaced 
- makes the property immutable as only the creation of the event knows if it can be replace eg it came from a push or the /sync event stream
 2021-10-26 20:03:10 +01:00
Adam Brown
67211605aa removing unused commented code 2021-10-26 20:03:10 +01:00
ganfra
e6e8c7f7d1 Hilt: clean code and add changelog 2021-10-22 12:41:06 +02:00
ganfra
188b4887ba Hilt: continue migrating activities 2021-10-20 18:06:57 +02:00
Adam Brown
e24329e139 reusing the transactional logic for the current session notifications toggle 
- uses the synchronous token registering which also means we get error handling
 2021-10-12 11:39:14 +01:00
SpiritCroc
dffc0c1d65 Merge tag 'v1.3.2' into sc 
Change-Id: I7faf88b02994b10027bbbd00b7ac565a94381cc5

Conflicts:
	.gitignore
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
	vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/RoomDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.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/filtered/FilteredRoomFooterItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.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
 2021-10-11 09:55:26 +02:00
Benoit Marty
d1e9f3131a Big annoying commit: execute command ./gradlew ktlintFormat - Fix "colon-spacing" 2021-10-01 13:31:15 +02:00
Benoit Marty
2ca3c68611 Big annoying commit: execute command ./gradlew ktlintFormat - Fix "import-ordering" 2021-10-01 13:31:15 +02:00
Benoit Marty
306e3cf055 Improve log to track push and sync request 
Also change some log level from d to v
 2021-09-23 13:54:03 +02:00
Benoit Marty
93506d18fa Display push counter on debug mode 2021-09-23 13:54:03 +02:00
Benoit Marty
1cd6ec4448 Do not log eventId 2021-09-23 13:54:03 +02:00
SpiritCroc
5b7e2fdcaa Merge remote-tracking branch 'p1gp1g/unifiedpush' into unifiedpush-2 
Change-Id: If4c64b14513d70cd376e3e1a9fbaeb1efb0ded12

Conflicts:
	vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
 2021-08-11 18:08:02 +02:00
S1m
4ac4755868 up pr: code reviewed 2021-07-07 01:49:39 +02:00
S1m
5f5b873414 different Pusher AppId 2021-06-07 13:22:07 +02:00
S1m
6c80b3a14b embedded distrib with sygnal 2021-06-04 01:23:15 +02:00
user
434739ad31 up: troubleshoot list 2021-06-02 01:14:30 +02:00
user
a3a946fb75 unifiedpush notification 2021-06-01 20:29:44 +02:00
SpiritCroc
6c06462ec9 Merge tag 'v1.1.8' into sc 
Change-Id: Ied7cd01e47a76e9d8f546ae1c2d6f10b083c4480

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.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/spaces/SpaceSummaryController.kt
 2021-05-26 10:44:19 +02:00
Benoit Marty
8211cc266f Remove usage of GlobalScope 2021-05-14 15:26:16 +02:00
SpiritCroc
39359f7d24 Merge remote-tracking branch 'upstream/develop' into spaces 
Change-Id: I10235a7a808ae66f5b00ad2e58c2aedf395e8e25

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomAggregateNotificationCount.kt
	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/room/summary/RoomSummaryDataSource.kt
	vector/build.gradle
	vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt
	vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.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/action/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.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/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.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/ui/SharedPreferencesUiStateRepository.kt
 2021-05-02 12:12:52 +02:00
Benoit Marty
c6a493848e Fix a race condition: Push can be received before the Gateway API returns 2021-04-16 16:13:16 +02:00
SpiritCroc
2ae0fb8886 Merge tag 'v1.1.6' into sc 
Change-Id: I80d2ce9bdcb22c2fcc9795d3a5c727cb5ba772a6
 2021-04-16 15:32:18 +02:00
Benoit Marty
9fc00fe6ff App crashes on "troubleshoot notifications" button (#3187) 2021-04-16 14:33:00 +02:00
SpiritCroc
0e601aa8f0 Merge tag 'v1.1.4' into sc 
Note: this merge needs more work, since upstream changed implementations
affecting following features:
- Mark unread
- Notification count badges
- Overview list filtering / combined overview
- Remember expanded categories
- Read receipt layout

Change-Id: If728bb54dd7c423b57bd3f59d23d86a1a0e5e435

Conflicts:
	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/RoomSummaryEntity.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
	vector/src/main/java/im/vector/app/core/utils/Emoji.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.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/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.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/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryController.kt
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_base_state.xml
 2021-04-13 09:28:13 +02:00
Benoit Marty
7309c1066c Move WifiDetector to the app side 
And protect the call to getEvent()
 2021-04-07 17:35:46 +02:00
Benoit Marty
dead57b9fe Cleanup 2021-04-07 17:35:46 +02:00
Benoit Marty
b89a258fdf FastLane: Only is Wifi is detected 2021-04-07 17:35:46 +02:00
Benoit Marty
9a124f7630 Done TODO 2021-04-07 17:35:46 +02:00
Benoit Marty
96153fe92a Get Event after a Push for a faster notification display in some conditions 2021-04-07 17:35:46 +02:00
Benoit Marty
e4e13aaa97 ktlint and cleanup 2021-03-31 09:25:35 +02:00
Dominic Fischer
6226938c6f Missing file 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2021-03-30 19:13:16 +01:00
Dominic Fischer
1e58767374 Missing file 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2021-03-29 20:02:03 +01:00
SpiritCroc
699ad4eaeb Merge tag 'v1.1.1' into sc 
Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
	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/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.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/MessageFileItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/res/drawable/rounded_rect_shape.xml
	vector/src/main/res/menu/menu_timeline.xml
	vector/src/main/res/values/array.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2021-03-14 10:58:57 +01:00
Benoit Marty
2d664c423d Simplify code 2021-03-02 16:21:40 +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
1058bfecf4 Kotlinification 2020-12-02 13:54:59 +01:00
Benoit Marty
f0afd5ceea Update deprecated code 2020-12-02 13:49:07 +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