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

17210 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
93b9facbd2 Fix duplicated re-register UP distributor call 
Second call is unnecessary, and can cause issues in the distributor:
https://github.com/binwiederhier/ntfy/issues/230

Change-Id: I53f8ea38b424e8b4cc27b76001cd182429fa9439
 2022-05-22 13:28:13 +02:00
SpiritCroc
8a1da1c02f Avoid mismatch between hasUnread and notificationCount because of unreadCount 
With MSC2654 unread counts, it is possible such count is zero while the
notification count isn't. So also respect the notification count when
deciding if a chat has unread messages.

Change-Id: I1b9f6ae907eb468c27fc0bb75b711db04268560a
 2022-05-22 13:12:46 +02:00
SpiritCroc
c214e5daf1 Avoid missing timestamps due to missing previewable event 
Just use a non-previewable event instead.
Improves sorting of the room list: don't drop rooms to the bottom
because of too much un-previewable activity.

Change-Id: Ib1ad8050caae85a3e7c8a686c2fa63a2924db890
 2022-05-22 12:23:11 +02:00
SpiritCroc
d74b8b76e8 Hide "can contact me" button for internal builds 
Change-Id: I0002c43ff5223270a658320d1aafbd275358a30a
 2022-05-20 15:28:25 +02:00
SpiritCroc
088657168f Avoid missing messages when trying to add event to chunk twice 
Change-Id: I98ae8e7a5254e6f93fd2a38498b7f8e173ccd565
 2022-05-19 22:36:02 +02:00
SpiritCroc
00fb32a156 Hide floating date after scroll inactivity 
Change-Id: I31cc34f98579c3ab23a9d4eb4cb5d16d2c6a5586
 2022-05-18 17:16:50 +02:00
SpiritCroc
9879659df7 Fade animation when temporarily hiding the floating header 
Change-Id: I29cae2ef7b8d537205f413b68bebe9cd0ecebd8b
 2022-05-18 17:10:15 +02:00
SpiritCroc
8c414b48d9 increment_version.sh: also exclude .md changes from changelog 
Change-Id: I20454009a9a078239f279170618debbabbec5d84
 2022-05-18 10:21:16 +02:00
SpiritCroc
77ca4c801d FEATURES.md: upstream reverted onlyAlertOnce behavior, but we have a setting 
Change-Id: I81f98b9d34b9fac08dc05c758adbad028fb20484
 2022-05-18 10:19:40 +02:00
SpiritCroc
7091d7e670 Automatic SchildiChat string correction 
Change-Id: Id32ab1e0825f3e6d3b1ff017379de47c2c069095
 2022-05-18 10:00:21 +02:00
SpiritCroc
e7ffd128dc Automatic upstream merge postprocessing 
Change-Id: Id00a9dd26823196ffca4fbd64513875011bd2969
 2022-05-18 10:00:20 +02:00
SpiritCroc
4f60963741 Merge tag 'v1.4.16' into sc 
Change-Id: Ibfb03ebf80dc1403fa438a390f609f2201602ba9

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.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/session/room/timeline/DefaultTimeline.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.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/roommemberprofile/RoomMemberProfileController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/res/drawable/ic_settings_root_flair.xml
	vector/src/main/res/layout/fragment_timeline.xml
	vector/src/main/res/xml/vector_settings_labs.xml
 2022-05-18 09:59:01 +02:00
SpiritCroc
360f469c4c [TMP] Automatic upstream merge preparation 
Change-Id: Idb8470d85e1279feb5fdf4f891aaf91c47b78dbc
 2022-05-17 22:06:28 +02:00
SpiritCroc
dee1b0d6ec Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I3b53cdcd58a9a5dc4f30b3cfa29cb7503d90c552
 2022-05-17 22:06:28 +02:00
Benoit Marty
4184aaba76 Merge branch 'release/1.4.16' into main 2022-05-17 21:27:12 +02:00
Benoit Marty
1d70004165 Fastlane file 2022-05-17 21:26:54 +02:00
Benoit Marty
e14b9a445e Towncrier 2022-05-17 21:13:08 +02:00
Benoit Marty
86d808eb4f Rename folder for the PlayStore 2022-05-17 17:54:02 +02:00
Benoit Marty
b6c7a59afc
Merge pull request #6079 from vector-im/feature/bma/fix_strings 
Fix translation
 2022-05-17 17:41:29 +02:00
Benoit Marty
553f8aa37e Remove empty translations 2022-05-17 16:31:15 +02:00
Benoit Marty
ff46791df9 Let's keep this one even if not used. 2022-05-17 16:23:48 +02:00
Benoit Marty
b33d8fe5e1 Remove unused string location_share 2022-05-17 16:04:45 +02:00
Benoit Marty
23d86b55fe Remove unused string a11y_location_share_icon 2022-05-17 16:03:51 +02:00
Benoit Marty
d2ec615e2f Remove unused string settings_flair 2022-05-17 16:02:04 +02:00
Benoit Marty
c0c5d21d4f
Merge pull request #6075 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-05-17 15:59:37 +02:00
Benoit Marty
57ae714cbe
Merge pull request #6072 from vector-im/feature/bma/fix_typing 
Feature/bma/fix typing
 2022-05-17 15:34:15 +02:00
Weblate
52a1fcb397 Merge branch 'origin/develop' into Weblate. 2022-05-17 12:51:46 +00:00
Szimszon
bc567fd45c Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2224 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2022-05-17 12:51:38 +00:00
Benoit Marty
5df0488cf2 Apply ouchadam's suggestion. It's only accessed by the main thread. 2022-05-17 14:44:43 +02:00
Benoit Marty
46e8737426
Merge pull request #6039 from vector-im/feature/dla/fix-sip-on-unhold 
Direction and track need to be set for hold/unhold
 2022-05-17 14:33:02 +02:00
Benoit Marty
32573881e4 Renames ids for clarity 2022-05-17 13:42:53 +02:00
Aris Kotsomitopoulos
424fb5556d
Merge pull request #5959 from vector-im/feature/aris/threads_post_release_ui_improvements 
Feature/aris/threads post release improvements
 2022-05-17 13:24:19 +03:00
Benoit Marty
2e189a1ab0 Fix typing rendering #6063 2022-05-17 11:53:44 +02:00
ariskotsomitopoulos
324856d700 Merge branch 'develop' into feature/aris/threads_post_release_ui_improvements 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
 2022-05-17 11:55:07 +03:00
SpiritCroc
91cff797f0 unifiedpush/FCM: also allow FCM for SERVICE_VERSION_UPDATE_REQUIRED 
To fix inbuilt FCM on Android 7

Change-Id: Ia2aca76b5718cce3c7828b00a604d58cf9f3676e
 2022-05-17 10:38:55 +02:00
Benoit Marty
ea1607cf3f Improve preview of the layout in the IDE 2022-05-17 10:28:02 +02:00
SpiritCroc
1eed611f4e Allow shorter bug report messages for internal / debug builds 
Change-Id: I0dd84bcca6d28ce9615ae40c06020a65d2401eea
 2022-05-17 10:11:50 +02:00
Auri B. P
2f03526d37 Translated using Weblate (Catalan) 
Currently translated at 81.8% (1821 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
 2022-05-17 02:56:52 +00:00
John Doe
41edd88d03 Translated using Weblate (Spanish) 
Currently translated at 99.8% (2221 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/es/
 2022-05-16 17:59:45 +00:00
Ihor Hordiichuk
baa5c1319d Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (2224 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2022-05-16 17:59:44 +00:00
Benoit Marty
3674ae7e63
Merge pull request #6064 from vector-im/feature/bma/detekt_end_period 
Detekt: fix end period
 2022-05-16 14:24:55 +02:00
Benoit Marty
12eb23b198
Merge branch 'develop' into feature/bma/detekt_end_period 2022-05-16 13:14:37 +02:00
Benoit Marty
955f366690
Merge pull request #5887 from vector-im/feature/bma/Matrix 
Improve Matrix class
 2022-05-16 13:08:15 +02:00
Benoit Marty
dcbc85484c Remove ambiguity 2022-05-16 13:05:26 +02:00
ariskotsomitopoulos
72a945ac13 PR remarks 2022-05-16 13:32:30 +03:00
Benoit Marty
0ed647d379 Add missing end period. 2022-05-16 12:25:10 +02:00
Benoit Marty
5387c9101e Changelog 2022-05-16 12:23:10 +02:00
Benoit Marty
ebb9538372 Fix warning and typo 2022-05-16 12:23:10 +02:00
Benoit Marty
fce1552349 Fix link 2022-05-16 12:23:10 +02:00
Benoit Marty
480a60a655 Exclude some files from check 2022-05-16 12:23:10 +02:00