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

72 commits

Author SHA1 Message Date
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
cb1addd5e3 Push test now does not display notification anymore. Add a dedicated test to do it 2020-10-09 20:10:55 +02:00
Benoit Marty
3714e4e787 Add a Waiting for user state 2020-10-08 22:08:48 +02:00
Benoit Marty
ab9bbe9a48 Cleanup and cancel request properly 2020-10-08 22:08:48 +02:00
Benoit Marty
dbb77d9dc1 Push test: success if user click on the notification 2020-10-08 22:08:48 +02:00
Benoit Marty
f860cfd8a3 Fix compilation issue after rebase 2020-10-08 22:08:48 +02:00
Benoit Marty
48ca1384f8 Do some renaming, Sygnal is an implementation of a PushGateway. 2020-10-08 22:08:48 +02:00
Benoit Marty
02f1dab9b2 Push test: better error handling 2020-10-08 22:08:48 +02:00
Benoit Marty
7d53dfeca4 Add Sygnal API implementation to test is Push are correctly received 2020-10-08 22:08:48 +02:00
Benoit Marty
cb33b9f158 cleanup 2020-10-08 22:08:25 +02:00
Benoit Marty
bc339191ea Fix Copyright mention 2020-10-08 15:11:01 +02:00
Benoit Marty
573ec29829 ktlint cleanup 2020-10-07 19:10:53 +02:00
Benoit Marty
29d25c377b Do not use deprecated Activity.startActivityForResult anymore - step 2 2020-10-07 18:07:04 +02:00
SpiritCroc
2e9195df2b Merge remote-tracking branch 'upstream/master' into sc_1.0.7 
Change-Id: Iccb1b1f0bee6b77c9f15d917c8073910841b6ff8

Conflicts:
	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
	vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
 2020-09-17 12:03:17 +02:00
Valere
971b425e17 F-Droid background sync modes 2020-09-10 17:10:47 +02:00
Benoit Marty
b9e8d7187c
Merge pull request #2075 from vector-im/feature/strict_mode_tracking 
Feature/strict mode tracking
 2020-09-10 13:46:44 +02:00
Onuray Sahin
0cba8f3aa1 Start background sync even if the eventId or roomId is null. 2020-09-10 12:08:05 +03:00
ganfra
fa381cc06d Use a singleton for default shared pref 2020-09-09 11:45:47 +02:00
SpiritCroc
bdd71769a0 Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: Ibdd2790a7f2a8a1f126ef7af2032fe72f7dd777e
 2020-09-08 18:52:59 +02:00
Benoit Marty
bf7a096a18 Refactor: Remove duplicated declaration for Actions 2020-08-25 17:01:55 +02:00
SpiritCroc
27a6b3c79e Merge commit '11b5512cb86369a9c3b50e5b469a8182cce79f52' into sc 
Merge v1.0.5 pt. 6

Conflicts:
	matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStoreMigration.kt
	matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/summary/RoomSummaryUpdater.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
 2020-08-22 11:00:23 +02:00
SpiritCroc
7ddae5726b Merge commit '05b849de13dcabb6a90b4ec9b28fe0c5a57ad3e4' into sc 
Merge v1.0.5 pt. 3
 2020-08-22 10:29:39 +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
Benoit Marty
11b5512cb8 Rename package of SDK modules 2020-08-13 12:50:58 +02:00
SpiritCroc
5888c018e0 Adapt google-services.json package ids 2020-08-09 13:39:12 +02:00
Benoit Marty
05b849de13 Rename package im.vector.riotx to im.vector.app (IDE, other variants) 2020-08-03 18:46:29 +02:00
Benoit Marty
a1f90abcd2 Rename package im.vector.riotx to im.vector.app (IDE) 2020-08-03 18:46:29 +02:00
Benoit Marty
629c73e630 Change applicationId from "im.vector.riotx" to "im.vector.app" 2020-06-26 16:19:05 +02:00
Tobias Preuss
e24785015d Use SharedPreferences#edit extension function consistently. 
+ Add "androidx.core:core-ktx:1.1.0" to "matrix-sdk-android" module which
  was already used in "vector" module.
+ Sources: https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-preference-release/core/core-ktx/src/main/java/androidx/core/content/SharedPreferences.kt.
 2020-06-24 15:40:00 +02:00
onurays
f7cbc01023 Replace deprecated PreferenceManager with androidx version. 2020-03-26 15:56:33 +03:00
Benoit Marty
4261b0e78a Fix pusher issue. It was set by mistake when the notification for this device was disabled 2020-03-06 17:19:48 +01:00
Benoit Marty
3462df405c Fix GPlay build issue 2020-02-29 09:42:35 +01:00
Benoit Marty
6a69c6356d PushersService.pushers() has been renamed to PushersService.getPushers() 2020-02-13 07:04:54 +01:00
Benoit Marty
2b8ecae8e3 Fix CI 2020-01-08 18:05:26 +01:00
Benoit Marty
d662b4a9b4 Exclude play-services-oss-licenses library from F-Droid build (#814) 2020-01-08 15:57:35 +01:00
Benoit Marty
4204ab262c Fix compilation issue 2019-10-22 12:42:01 +02:00
Dominic Fischer
e28e2dadb9 Some more clean up 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2019-10-12 15:37:20 +01:00
Benoit Marty
fbb23dfb66 ktlint: fix (no-empty-first-line-in-method-block) issues 2019-10-09 16:43:12 +02:00
Benoit Marty
15dc4d6369 Fix ktlint issue automatically by running ./ktlint --android -v -F 2019-10-09 15:24:05 +02:00
Benoit Marty
119e4c0d32 Fix warnings in the App 2019-10-09 12:49:00 +02:00
Benoit Marty
d6c278288d upgrade google play services plugin 2019-10-07 16:21:18 +02:00
Benoit Marty
4ad86a13a0 Upgrade the dependencies to the latest version 2019-10-07 16:21:18 +02:00
Benoit Marty
7da9cafcc2 Remove any notification of a redacted event (#563) 
Also do some cleanup and kotlinification on the code
 2019-09-19 13:01:00 +02:00
Benoit Marty
468bd5bcc9 Message Editing: Update notifications (#128) 2019-09-19 12:57:58 +02:00
Benoit Marty
0a73887c70 Daggerization of VectorPreferences 2019-08-08 11:52:50 +02:00
Benoit Marty
81c7f694d6 Import Strings form Riot 2019-08-07 16:10:50 +02:00
Benoit Marty
0f7a56d005 Use Session.myUserId whereas it's possible 2019-07-16 15:54:00 +02:00
Benoit Marty
919dec4a56 Add ".debug" to the applicationId to be able to install the app along with the prod version 2019-07-11 17:59:07 +02:00
Benoit Marty
8a0c9ae9b0 Rename PreferencesManager to VectorPreferences for code clarity 2019-07-09 16:29:24 +02:00
Benoit Marty
0919b9460d Code quality: split long lines 2019-07-09 15:26:32 +02:00