Commit graph

17229 commits

Author SHA1 Message Date
SpiritCroc
fab9a100a1 [TMP] Automatic upstream merge preparation
Change-Id: I00f10005575cf818d47ea47798ff8af4f4891c06
2022-06-01 12:20:10 +02:00
SpiritCroc
9446afe0ef Automatic revert to unchanged upstream strings, pt.1
Change-Id: I6b50d340b0cf82f8d6f85e032b404a79a7e8c236
2022-06-01 12:20:10 +02:00
SpiritCroc
0393dd51c9 Bring back downstream "Update room previews once we have decryption keys"
This reverts commit 130fe7f887.
Also update to some newer decryption logic, and disable the new upstream
logic, to avoid duplicate decryption attempts.

Change-Id: Ibcea8b825d94284dfcf2d305b5f57423366601e5
2022-05-30 17:39:20 +02:00
SpiritCroc
73feba72f5 Fix some notifications never getting dismissed
Persisting notification info fails for non-null Uris:

E NotificationEventPersistence: ## Failed to save cached notification info
E NotificationEventPersistence: java.io.NotSerializableException: android.net.Uri$HierarchicalUri
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1240)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.defaultWriteFields(ObjectOutputStream.java:1604)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeSerialData(ObjectOutputStream.java:1565)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeOrdinaryObject(ObjectOutputStream.java:1488)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1234)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:354)
E NotificationEventPersistence: 	at java.util.ArrayList.writeObject(ArrayList.java:762)
E NotificationEventPersistence: 	at java.lang.reflect.Method.invoke(Native Method)
E NotificationEventPersistence: 	at java.io.ObjectStreamClass.invokeWriteObject(ObjectStreamClass.java:1036)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeSerialData(ObjectOutputStream.java:1552)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeOrdinaryObject(ObjectOutputStream.java:1488)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1234)
E NotificationEventPersistence: 	at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:354)
E NotificationEventPersistence: 	at org.matrix.android.sdk.internal.session.securestorage.SecretStoringUtils.saveSecureObjectM(SecretStoringUtils.kt:283)
E NotificationEventPersistence: 	at org.matrix.android.sdk.internal.session.securestorage.SecretStoringUtils.securelyStoreObject(SecretStoringUtils.kt:150)
E NotificationEventPersistence: 	at org.matrix.android.sdk.internal.session.securestorage.DefaultSecureStorageService.securelyStoreObject(DefaultSecureStorageService.kt:27)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationEventPersistence.persistEvents(NotificationEventPersistence.kt:58)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationDrawerManager$persistEvents$1.invoke(NotificationDrawerManager.kt:183)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationDrawerManager$persistEvents$1.invoke(NotificationDrawerManager.kt:182)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationState.queuedEvents(NotificationState.kt:55)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationDrawerManager.persistEvents(NotificationDrawerManager.kt:182)
E NotificationEventPersistence: 	at im.vector.app.features.notifications.NotificationDrawerManager.refreshNotificationDrawerBg(NotificationDrawerManager.kt:177)

Accordingly, if a notification for an image is shown, and the
notification state is loaded from storage later, none of the previously
shown notifications will get dismissed once read.

Change-Id: I2d6be497e8b92e770b680e16e42b3610add57323
2022-05-30 17:39:16 +02:00
SpiritCroc
3e58f2c254 Developer quick setting for theming
Closes https://github.com/SchildiChat/SchildiChat-android/issues/117

Change-Id: Ie8fab9b7842e695b9e59a65d2cbf09c7edfd1dd8
2022-05-30 17:39:10 +02:00
SpiritCroc
226428e0ba Developer quick setting to show hidden events
https://github.com/SchildiChat/SchildiChat-android/issues/117

Change-Id: I4d7a015f5634f555dca7dcef54653b038ce96e5d
2022-05-29 17:42:14 +02:00
SpiritCroc
086d9c08ff Increment version
Change-Id: If221cd37b10e6510ce1bc9f65de9b44c27951e70
2022-05-27 09:17:20 +02:00
Adam Brown
b9853d1aec excluding the gms play-service-location optional transistive dependency for the fdroid variant
- fixes fdroid being unable to compile the project due to a non foss dependency

Change-Id: Ia24c07337f3da0de83b952e6e0082cf18acab357
2022-05-25 10:56:35 +02:00
SpiritCroc
696c9c002f Disable floating headers when we cannot scroll
If recyclerView content is smaller then the recyclerView, we can already
see all headers.

Change-Id: I1b3b1506236701b75777d97a6fe759b2296f5db0
2022-05-25 10:52:14 +02:00
SpiritCroc
13b4fd9c33 Floatine date: fix possible OOB crash when retrieving models
Thread: main, Exception: java.lang.ArrayIndexOutOfBoundsException: length=191; index=-1
at java.util.ArrayList.get(ArrayList.java:439)
at java.util.Collections$UnmodifiableList.get(Collections.java:1356)
at com.airbnb.epoxy.EpoxyControllerAdapter.getModelAtPosition(EpoxyControllerAdapter.java:3)
at de.spiritcroc.recyclerview.StickyHeaderItemDecoration.getChildInContact(StickyHeaderItemDecoration.kt:3)
at de.spiritcroc.recyclerview.StickyHeaderItemDecoration.onDrawOver(StickyHeaderItemDecoration.kt:19)

Change-Id: I66fcaf7f4f041707534c3da4f712effec2a2df46
2022-05-25 10:14:58 +02:00
SpiritCroc
a2486fccf5 Do not fully discard chunks that start with duplicate events
If we already have some events in a previously linked chunk, that
doesn't mean we have all of them. So we still want to continue
processing later events in that case.

Change-Id: I95e864ad7e786ea71b9facdbbf52c2685b36ee26
2022-05-24 11:54:21 +02:00
SpiritCroc
d3addc24f1 Add some missing log spaces
Change-Id: I36cfbaa49f1e7703d23eacefeeafda380eb99e65
2022-05-24 11:53:38 +02:00
SpiritCroc
a95e41056d Improve room preview generation
- Also look into past chunks for previewable events
- Better timestamp guesses if not enough history loaded yet
- Update missing previews when more chunks loaded

Change-Id: I27a420b9564e091db0e322751c798e205e26fd47
2022-05-22 20:26:25 +02:00
waclaw66
bc368070c9 Translated using Weblate (Czech)
Currently translated at 100.0% (152 of 152 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
2022-05-22 13:32:36 +02:00
Linerly
fa17e2d751 Translated using Weblate (Indonesian)
Currently translated at 100.0% (152 of 152 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/id/
2022-05-22 13:32:36 +02:00
Linerly
0c25f06c82 Translated using Weblate (Indonesian)
Currently translated at 100.0% (150 of 150 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/id/
2022-05-22 13:32:35 +02:00
waclaw66
f315061a55 Translated using Weblate (Czech)
Currently translated at 100.0% (150 of 150 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
2022-05-22 13:32:35 +02:00
Linerly
3f4f3e257a Translated using Weblate (Indonesian)
Currently translated at 100.0% (148 of 148 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/id/
2022-05-22 13:32:35 +02:00
waclaw66
aa8c7b9ae1 Translated using Weblate (Czech)
Currently translated at 100.0% (148 of 148 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
2022-05-22 13:32:35 +02:00
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