Commit graph

9811 commits

Author SHA1 Message Date
Marcel Hibbe
5bee52d182
Merge pull request #4327 from nextcloud/deck_card_is_shown_as_object
show deck card in messages
2024-10-23 12:57:59 +02:00
sowjanyakch
99b410f94c
ktlintFormat
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
2024-10-23 11:39:18 +02:00
sowjanyakch
81040e3eb9
modify strings
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
2024-10-23 11:36:05 +02:00
sowjanyakch
986f19a8ae
use official deck card icon and some alignment changes
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
2024-10-23 11:36:05 +02:00
sowjanyakch
bf1a426e5b
use correct deck card icon
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
2024-10-23 11:36:05 +02:00
sowjanyakch
1e826979c6
add replyable message tag
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
2024-10-23 11:36:05 +02:00
sowjanyakch
eb5cdca295
Rename outcomingDeckCardViewHolder
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
2024-10-23 11:36:04 +02:00
sowjanyakch
305a66ef5a
Add theming to deck card image
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
2024-10-23 11:36:04 +02:00
sowjanyakch
de420a3a30
include deck card name as the lastMessageDisplayText
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
2024-10-23 11:36:04 +02:00
sowjanyakch
f492ebf03d
solve contentDescription warning for Image
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
2024-10-23 11:36:04 +02:00
sowjanyakch
8b52eb4637
work on UI of IncomingDeckCardViewHolder
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
2024-10-23 11:36:04 +02:00
sowjanyakch
726fd34f2d
work on UI of OutcomingDeckCardViewHolder
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
2024-10-23 11:36:04 +02:00
sowjanyakch
c80050d8f5
Display card deck with parameters
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
2024-10-23 11:36:03 +02:00
sowjanyakch
56b0b80316
Work on Incoming and Outgoing deck card viewholder
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
2024-10-23 11:36:03 +02:00
sowjanyakch
66d2db20aa
create deck card xml layout
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
2024-10-23 11:35:59 +02:00
Nextcloud bot
417535da63
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-10-23 03:07:55 +00:00
Andy Scherzinger
bb5c21f356
Merge pull request #4367 from nextcloud/repo-sync/android-config/master
🔄 synced file(s) with nextcloud/android-config
2024-10-22 18:46:24 +02:00
nextcloud-android-bot
fa15b0f181 🔄 synced local '.github/workflows/' with remote 'config/workflows/'
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
2024-10-22 16:45:38 +00:00
Marcel Hibbe
59505c418e
Merge pull request #4359 from nextcloud/remove-dead-code-to-set-the-call-state
Remove dead code to set the call state
2024-10-22 16:58:52 +02:00
Daniel Calviño Sánchez
fdb8692b59
Remove dead code to set the call state
"IN_CONVERSATION" was set when the activity was created and "state" in
the intent extras had the value "resume". However, there is no "state"
extra set by default in Android intents, it should be explicitly set,
but as it is not set anywhere in Talk Android code that would make it
dead code and safe to remove.

Moreover, the connection to the call should be initialized again in any
case rather than resumed when "onCreate" is called, as it is likely that
any previous connection would have been ended if the previous activity
instance was destroyed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2024-10-22 16:51:10 +02:00
Marcel Hibbe
ea00481031
Merge pull request #4346 from nextcloud/fix-ignored-blank-lines-in-javadocs
Fix ignored blank lines in Javadocs
2024-10-22 14:52:24 +02:00
Marcel Hibbe
4ff3702f8b
Merge pull request #4356 from nextcloud/fix-partial-path-travel-1
Adjust cacheDir based on Android version
2024-10-22 11:41:17 +02:00
Marcel Hibbe
b39db641bd
Merge pull request #4251 from nextcloud/show-temp-messages
Showing temporary messages when queued
2024-10-22 11:38:17 +02:00
Marcel Hibbe
7a7ceb8714
format code + remove unused import
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2024-10-22 11:29:51 +02:00
Marcel Hibbe
c873899a71
add empty content descriptions
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2024-10-22 11:27:27 +02:00
rapterjet2004
b192e0ec60
linter
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
2024-10-22 10:51:08 +02:00
rapterjet2004
cc717b25f6
got deleting working and added attempts logic again
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
2024-10-22 10:51:06 +02:00
rapterjet2004
df2c6cfc06
impl marcel suggestions + adding deleting cache option
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
2024-10-22 10:50:58 +02:00
rapterjet2004
9bdaf68232
fixed deletion bug, implemented Marcel's suggestions
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
2024-10-22 10:50:30 +02:00
rapterjet2004
0d9c5bfcb9
fixed some bugs
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
2024-10-22 10:49:57 +02:00
rapterjet2004
399fa7eb70
got replying working
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
2024-10-22 10:49:57 +02:00
rapterjet2004
411a4f1dce
got editing down
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
2024-10-22 10:49:56 +02:00
rapterjet2004
8cd0983088
WIP Editing
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
2024-10-22 10:49:56 +02:00
rapterjet2004
0041fb3b71
deleting works
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
2024-10-22 10:49:56 +02:00
rapterjet2004
98e0b7a270
should have fixed the UI now with lifecycle and error handling
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
2024-10-22 10:49:51 +02:00
rapterjet2004
fb9a7b8e04
added ui
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
2024-10-22 10:46:04 +02:00
rapterjet2004
498a1274d9
git
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
2024-10-22 10:46:03 +02:00
Nextcloud bot
4705469f5f
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-10-22 02:56:30 +00:00
github-actions[bot]
3f16a5aefc
Merge pull request #4358 from nextcloud/renovate/com.google.firebase-firebase-messaging-24.x
fix(deps): update dependency com.google.firebase:firebase-messaging to v24.0.3
2024-10-21 22:49:38 +02:00
renovate[bot]
9cbfe3ab6f
fix(deps): update dependency com.google.firebase:firebase-messaging to v24.0.3
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-21 20:43:10 +00:00
github-actions[bot]
90bac38a47
Merge pull request #4357 from nextcloud/renovate/junit5-monorepo
fix(deps): update dependency org.junit.vintage:junit-vintage-engine to v5.11.3
2024-10-21 17:59:56 +02:00
renovate[bot]
867d04a024
fix(deps): update dependency org.junit.vintage:junit-vintage-engine to v5.11.3
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-21 15:49:36 +00:00
Marcel Hibbe
a51875098b
Merge pull request #4300 from nextcloud/feature/4299/improveOfflineSupport
Feature/4299/improve offline support
2024-10-21 16:06:29 +02:00
Marcel Hibbe
f817c20b4e
fix to handle chats without offline messages when connection is lost
avoid NPE:

java.lang.NullPointerException
	at com.nextcloud.talk.chat.data.network.OfflineFirstChatRepository.getCappedMessagesAmountOfChatBlock(OfflineFirstChatRepository.kt:186)
	at com.nextcloud.talk.chat.data.network.OfflineFirstChatRepository.access$getCappedMessagesAmountOfChatBlock(OfflineFirstChatRepository.kt:43)
	at com.nextcloud.talk.chat.data.network.OfflineFirstChatRepository$loadInitialMessages$1.invokeSuspend(OfflineFirstChatRepository.kt:162)

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2024-10-21 15:33:25 +02:00
Marcel Hibbe
7e3a4e4a83
refactoring and logging
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2024-10-21 13:49:55 +02:00
Marcel Hibbe
c81b1fa62f
pass newestMessageIdFromDb to initMessagePolling
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2024-10-21 13:49:55 +02:00
Marcel Hibbe
7eb8b9fa70
extract getCappedMessagesAmountOfChatBlock
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2024-10-21 13:49:55 +02:00
Marcel Hibbe
adf18020c1
Fix unintended deletion of conversations (+related messages&chatBlocks)
Mistake was, that the conversations from DB and sync could differ due to values.
E.g. when a user changed the status, the conversations from DB and sync would differ. So there were conversations (+related messages&chatBlocks) deleted sometimes.
This caused bugs that when entering a chat, all data was loaded again.

In the previous implementation (before this PR), this error was only visible in the UI when you were offline (in this case, nothing was displayed!).

To fix the bug, only the internalId's are compared.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2024-10-21 13:49:55 +02:00
Marcel Hibbe
3d37cc0831
only do initial request if newestMessageIdFromDb is lower than lastReadMessage from conversation
If conversation has a newer message id than DB then an online request is necessary

If conversation has an older message id than DB then an online request is not necessary (this could happen when updating of DB is implemented for push notification, not yet done).

If conversation has the same message id like DB than request can be skipped

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2024-10-21 13:49:54 +02:00
Marcel Hibbe
dc38904d01
delay progress bar
delay progress bar for one second before showing up for slow connection

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2024-10-21 13:49:54 +02:00