Commit Graph

7181 Commits

Author SHA1 Message Date
Marcel Hibbe
b78267d96f
try to avoid NPE for currentConversation
On gplay console the following NPE was reported for the line

participantPermissions = ParticipantPermissions(spreedCapabilities, currentConversation!!)

 E  FATAL EXCEPTION: main
          Process: com.nextcloud.talk2, PID: 6626
          java.lang.NullPointerException
          at com.nextcloud.talk.chat.ChatActivity.initObservers$lambda$13(ChatActivity.kt:583)
          at com.nextcloud.talk.chat.ChatActivity.$r8$lambda$QKH5JCFLmCzRMlSJ-EV-m4IW5ig(Unknown Source:0)

which seems that currentConversation was null. If it would have been spreedCapabilities, then the error would have been thrown in the line before..

A reason MAY BE that the observer is triggered before setData on the ViewModel is executed.
While this fix is just not executing code when currentConversation is null, it's unsure if it will follow up problems (like an empty chat) or if the observer is triggered another time when currentConversation is available.

So it's just a hotfix.
To improve the situation in the long term, we should move more logic to viewModel and only use Flow instead to mix it with LiveData.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2024-09-24 15:52:49 +02:00
Marcel Hibbe
aeacfa09b6
avoid UninitializedPropertyAccessException for spreedCapabilities
reported issue on gplay console was:

Exception kotlin.UninitializedPropertyAccessException: lateinit property spreedCapabilities has not been initialized
  at com.nextcloud.talk.chat.ChatActivity.getSpreedCapabilities (ChatActivity.kt:284)
  at com.nextcloud.talk.chat.ChatActivity.processExpiredMessages (ChatActivity.kt:2536)
  at com.nextcloud.talk.chat.ChatActivity.access$processExpiredMessages (ChatActivity.kt:204)
  at com.nextcloud.talk.chat.ChatActivity$initObservers$10$1.invokeSuspend (ChatActivity.kt:820)

This is just a hotfix while hoping processExpiredMessages is executed again while spreedCapabilities are available.

To improve the situation in the long term, we should move more logic to viewModel and have better control over sequence of actions.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2024-09-24 15:25:42 +02:00
sowjanyakch
8bf9e3552e
rename variable selectedImageUri
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
2024-09-23 16:40:06 +02:00
sowjanyakch
384ba6945f
ktlint format
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
2024-09-23 16:40:06 +02:00
sowjanyakch
4dd22d6223
Get selectedImageUri from ViewModel
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
2024-09-23 16:40:06 +02:00
sowjanyakch
bc02236801
Make Conversation name text limit to single line
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
2024-09-23 16:40:06 +02:00
sowjanyakch
317f745806
Only display delete icon when user avatar is selected
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
2024-09-23 16:40:05 +02:00
Nextcloud Android Bot
44e87dbd42 Weekly 20.1.0 Alpha 05 2024-09-23 03:12:39 +00:00
Marcel Hibbe
b080e891bb
fix to not remove call buttons for federated conversations after 30 seconds
After 30 seconds (when the capabilities were updated) the call buttons of federated conversations were removed (this was done back then when fed calls were not implemented).

However this happened not always because of the check
"if (this::spreedCapabilities.isInitialized) {...."
It seems this check sometimes is false when it's supposed to be true. This has be to further investigated and has to be be simplified/improved by a cleaner architecture.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2024-09-20 13:46:21 +02:00
renovate[bot]
bddf1361f8
Update dependency org.jetbrains.kotlinx:kotlinx-serialization-json to v1.7.3
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-19 16:56:56 +00:00
Julius Linus
5351296afd
Merge pull request #4240 from nextcloud/bugfix/4238/fixToHideMessageInputWhenNoRestriction
fix to hide messageInputFragment when user has no restriction to write
2024-09-19 18:48:25 +02:00
Nextcloud bot
663ba0a2ed
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-09-19 02:51:16 +00:00
github-actions[bot]
444dabda1e
Merge pull request #4246 from nextcloud/renovate/lifecycleversion
Update lifecycleVersion to v2.8.6
2024-09-18 23:33:12 +02:00
renovate[bot]
7c37d1f111
Update lifecycleVersion to v2.8.6
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-18 21:26:18 +00:00
renovate[bot]
d480fe3008
Update dependency androidx.lifecycle:lifecycle-viewmodel-compose to v2.8.6
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-18 21:24:09 +00:00
github-actions[bot]
cb114b64f1
Merge pull request #4244 from nextcloud/renovate/androidx.lifecycle-lifecycle-runtime-ktx-2.x
Update dependency androidx.lifecycle:lifecycle-runtime-ktx to v2.8.6
2024-09-18 22:34:32 +02:00
github-actions[bot]
5c84125aa4
Merge pull request #4243 from nextcloud/renovate/androidx.compose-compose-bom-2024.x
Update dependency androidx.compose:compose-bom to v2024.09.02
2024-09-18 22:28:47 +02:00
renovate[bot]
ef3cd824c0
Update dependency androidx.lifecycle:lifecycle-runtime-ktx to v2.8.6
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-18 20:20:43 +00:00
renovate[bot]
c1c68570b3
Update dependency androidx.compose:compose-bom to v2024.09.02
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-18 20:18:10 +00:00
renovate[bot]
bc57bb20de Update dependency androidx.compose.ui:ui-test-junit4 to v1.7.2
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-18 22:10:23 +02:00
renovate[bot]
6122650202
Update dependency androidx.compose.runtime:runtime to v1.7.2
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-18 19:56:24 +00:00
Marcel Hibbe
9e91bdeb1d
fix to hide messageInputFragment when user has no restriction to write
The messageInputFragment was hidden by checkShowMessageInputView(), but it was immediately shown again by checkLobbyState()

This fix will execute checkShowMessageInputView() inside checkLobbyState() in the correct order.

Additionally, the check
checkLobbyState()
has to be already executed in
GetCapabilitiesInitialLoadState
as well as
checkShowCallButtons()

Otherwise the expected behavior would only be set after 30 seconds.

An improvemnt for the future must be to improve the capabilities handling.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2024-09-18 17:34:10 +02:00
Nextcloud bot
3db9bc6247
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-09-18 02:53:40 +00:00
Marcel Hibbe
28906dd999
dont show error when fetching pending invitations failed
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2024-09-17 12:05:02 +02:00
Marcel Hibbe
5991b91460
fix to show accounts from older servers in switch account dialog
if invitations were not supported, the account did not show up

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2024-09-17 11:30:36 +02:00
Marcel Hibbe
722914fb6c
fix to show user status in conversation list
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2024-09-17 11:04:18 +02:00
Marcel Hibbe
3b51fde300
Merge pull request #4223 from nextcloud/bugfix/noid/fixNoChatForOldNcServerVersion
fix to load chat for old server version
2024-09-17 11:00:21 +02:00
Nextcloud bot
2f05ffb3d6
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-09-17 02:55:40 +00:00
Marcel Hibbe
3f06801e59
fix to load chat for old server version
With server version 23.0.12 it happened that the chat did not load because values were null. Now default values in json model are set (because that's easier than changing the entity).
Additionally a check was added in CallActivity that a callStartTime of 0 would not be used (but it should not be used anyway if it would be 0 because then capability should also not be available).

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2024-09-16 17:29:08 +02:00
Marcel Hibbe
37033af668
remove duplicated dependencies
found by the tool
https://stackblitz.com/edit/find-gradle-dependency-duplicates?file=src%2Fapp%2Fapp.component.ts

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2024-09-16 11:38:38 +02:00
Nextcloud Android Bot
911c52c37b Weekly 20.1.0 Alpha 04 2024-09-16 03:11:34 +00:00
Nextcloud bot
b99cdd2e29
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-09-16 02:45:50 +00:00
renovate[bot]
0af66a3a6e
Update dependency joda-time:joda-time to v2.13.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-15 23:15:38 +00:00
Nextcloud Android Bot
a6dcd14f4e Weekly 20.1.0 Alpha 03 2024-09-15 15:19:37 +00:00
Marcel Hibbe
3521308496
manually bump to 20.1.0 Alpha 02
As build script was not able to push to master, it failed and next time it tried to build the same version again.
Thats why Google complained the apk already exists.

The bot was now changed to have admin permissions. So this commit will bump the version number manually and in the next runs everything should work again.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2024-09-15 17:06:35 +02:00
Nextcloud bot
ee6ca8f1ae
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-09-15 03:35:39 +00:00
Nextcloud bot
c6d5d7b2d8
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-09-14 02:56:28 +00:00
Marcel Hibbe
af6e058c70
Merge pull request #4210 from nextcloud/bugfix/noid/fixConnectionLostHint
fix to show connection lost hint when internet is gone
2024-09-13 18:42:44 +02:00
Marcel Hibbe
0480ceef7f
fix to show connection lost hint when internet is gone
otherwise it showed "connection gained" with red background when loosing connection for the first time

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2024-09-13 18:41:46 +02:00
github-actions[bot]
9f53f7e631
Merge pull request #4209 from nextcloud/renovate/coroutines_version
Update dependency org.jetbrains.kotlinx:kotlinx-coroutines-test to v1.9.0
2024-09-13 17:28:34 +02:00
github-actions[bot]
e0967913b7
Merge pull request #4208 from nextcloud/renovate/org.jetbrains.kotlinx-kotlinx-coroutines-test-1.x
Update dependency org.jetbrains.kotlinx:kotlinx-coroutines-test to v1.9.0
2024-09-13 17:27:41 +02:00
Nextcloud bot
92c840f044
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-09-13 15:18:27 +00:00
renovate[bot]
80774f3d59
Update dependency org.jetbrains.kotlinx:kotlinx-coroutines-test to v1.9.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-13 15:11:25 +00:00
renovate[bot]
fa88fa4b07
Update dependency org.jetbrains.kotlinx:kotlinx-coroutines-test to v1.9.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-13 15:09:25 +00:00
Nextcloud bot
cc83e90d7f
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-09-13 15:06:36 +00:00
Marcel Hibbe
033e3e86c1
reformat code
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2024-09-13 16:56:46 +02:00
Daniel Calviño Sánchez
4cea7b2390
Provide federation values to external signaling server in chat
Otherwise the WebSocket configuration and session clashes with the one
from the CallActivity, which already uses the federated settings.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2024-09-13 15:51:21 +02:00
Daniel Calviño Sánchez
148dedbc6c
fixup! Provide federation values when joining a room in the external signaling
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2024-09-13 15:51:21 +02:00
Daniel Calviño Sánchez
c7af117f4e
fixup! Store federation properties in signaling settings
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2024-09-13 15:51:21 +02:00
Daniel Calviño Sánchez
18a0394d3b
fixup! Provide federation values when joining a room in the external signaling
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2024-09-13 15:51:20 +02:00