Commit graph

3230 commits

Author SHA1 Message Date
rapterjet2004
63b9e41a16 or former one to one
Signed-off-by: Julius Linus julius.linus@nextcloud.com
2023-06-27 15:01:59 +02:00
rapterjet2004
d24bd9d6a2 WIP one-to-one behaves like mentioned
Signed-off-by: Julius Linus julius.linus@nextcloud.com
2023-06-27 15:01:59 +02:00
rapterjet2004
943286ddd6 migrating from material preferences to native, squashed commit
Signed-off-by: Julius Linus julius.linus@nextcloud.com
2023-06-27 14:53:18 +02:00
Andy Scherzinger
1b43d18566 finetune preferences for M3 - DRAFT
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-06-27 14:53:18 +02:00
rapterjet2004
76f5fe91f6 migrating from material preferences to native, squashed commit
Signed-off-by: Julius Linus julius.linus@nextcloud.com
2023-06-27 14:53:18 +02:00
rapterjet2004
8158eebb4f Bug fix of issue 2780
Signed-off-by: Julius Linus julius.linus@nextcloud.com
2023-06-23 14:31:08 -05:00
rapterjet2004
8a6fc63d56 WIP filtered items persist on resumed
Signed-off-by: Julius Linus julius.linus@nextcloud.com
2023-06-21 12:34:31 +02:00
Marcel Hibbe
fdde5d2667 add option to list open conversations
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-06-19 23:42:50 +02:00
Marcel Hibbe
527ba28651 Fix to show other errors than HttpException (e.g. ConnectException)
Fix theming

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-06-19 15:10:21 +02:00
Andy Scherzinger
5a25aa1450
remove unused code
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-06-15 14:48:57 +02:00
Andy Scherzinger
0246b584fb
Optimize themeing/layout for filtering
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-06-15 14:48:56 +02:00
rapterjet2004
73dce166b9
WIP filter conversations feature, added close button + detekt issues
Signed-off-by: Julius Linus julius.linus@nextcloud.com

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-06-15 14:48:56 +02:00
rapterjet2004
715cbedcfe
WIP filter conversations feature, implemented small fixes + license
Signed-off-by: Julius Linus julius.linus@nextcloud.com

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-06-15 14:48:56 +02:00
rapterjet2004
ffdae1552d
WIP filter conversations feature, can now search through filter
Signed-off-by: Julius Linus julius.linus@nextcloud.com

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-06-15 14:48:56 +02:00
rapterjet2004
a60fce05cd
WIP filter conversations feature, UI more responsive
Signed-off-by: Julius Linus julius.linus@nextcloud.com

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-06-15 14:48:56 +02:00
rapterjet2004
cc0fd41c90
WIP filter conversations feature, last minute ui changes
Signed-off-by: Julius Linus julius.linus@nextcloud.com

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-06-15 14:48:56 +02:00
rapterjet2004
b4719bcad3
WIP filter conversations feature, functionality finished
Signed-off-by: Julius Linus julius.linus@nextcloud.com

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-06-15 14:48:55 +02:00
rapterjet2004
d209083700
WIP filter conversations feature, UI finished
Signed-off-by: Julius Linus julius.linus@nextcloud.com

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-06-15 14:48:43 +02:00
Andy Scherzinger
e1da473f72 comment on empty function block
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-06-15 11:07:22 +02:00
Marcel Hibbe
cc391d889a
check if talk is available at server selection and if version is valid
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-06-12 09:49:25 +02:00
Marcel Hibbe
deb512af91
fix to show error message on server selection screen
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-06-12 09:49:24 +02:00
Marcel Hibbe
7a30940142
handle 426 upgrade required / handle 503 Service Unavailable (+maintenance mode)
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-06-09 14:31:30 +02:00
Marcel Hibbe
7f51d45e9a
Align typing indicator to new concept
# Send start/stop typing
Send "Typing" every 10 sec when there was a change

Send stop typing:
- when input is deleted
- when there was no input during the 10s timer
- when on leaving room

# Receive start/stop typing
Clear typing for participant after 15s if no start typing-message was received.
Use userId instead sessionId to manage typing participants. This ensures participants are not shown multiple times when using multiple devices with the same user (multisession). To get the userId via websocket, SignalingMessageReceiver and WebSocketInstance had to be modified to pass the CallWebSocketMessage in case the signalingMessage.type is related to typing. Not sure if this is the best solution but didn't find any other way.

Typing is not handled when the userId is of the own user (this could happen when using multiple devices)

In case userId is null (which happens for guests), their sessionId is used as key for the typingParticipants map.

# Other
Disable setting for typing indicator when no HPB is used + Avoid crash in chat when no HPB is used.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-06-02 15:35:16 +02:00
Andy Scherzinger
832e2178e3
codacy: Avoid unused private fields such as 'TAG'
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-06-01 22:35:08 +02:00
Andy Scherzinger
7ad8e304e2
codacy: Fields should be declared at the top of the class, before any method declarations, constructors, initializers or inner classes.
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-06-01 22:27:43 +02:00
Andy Scherzinger
d4379f3c89
codacy: Unused import
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-06-01 22:27:42 +02:00
Andy Scherzinger
c084d63944
codacy: Fields should be declared at the top of the class, before any method declarations, constructors, initializers or inner classes.
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-06-01 19:10:35 +02:00
Marcel Hibbe
bd23edc9a5
check if location of cached file makes sense
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-06-01 10:36:10 +02:00
Marcel Hibbe
d49441e036
get last part after "/" also for content uris
note that this doesn't prevent path traversal as uris can be decoded

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-06-01 10:30:25 +02:00
rapterjet2004
79f317d1e6 issue-3019
Signed-off-by: Julius Linus julius.linus@nextcloud.com
2023-05-26 13:20:22 -05:00
Marcel Hibbe
d127c5401a
fix new onBackPressed handling
this commit fixes bugs from d3056ff2825e53040ca49b86b84f91f73a3eb11c and 1185dcf17a99ca62efd32f8a53c298ec4fd6c4d0

fix onBackPressed handling to use OnBackPressedCallback

remove unnecessary onBackPressedCallback's when they only finished the activity

replaced some finishAffinity methods with finish

...

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-24 15:42:09 +02:00
Ezhil Shanmugham
dff9ea5651
Fixed intendation Signed-off-by: Ezhil Shanmugham ezhil56x.contact@gmail.com
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-24 15:42:09 +02:00
Ezhil Shanmugham
64fa8e830b
Made suggested changes in FullScreenImageActivity.kt, ConversationsListActivity.kt and in some files Signed-off-by: Ezhil Shanmugham ezhil56x.contact@gmail.com
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-24 15:42:09 +02:00
Ezhil Shanmugham
d4a4472968
Removed mistakenly added authorship Signed-off-by: Ezhil Shanmugham ezhil56x.contact@gmail.com
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-24 15:42:09 +02:00
Ezhil Shanmugham
8348792313
Fixed ktlint and detekt errors
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-24 15:42:09 +02:00
Ezhil Shanmugham
7b5caf5007
fixed deprecated onBackPressed Issue-#2961
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-24 15:42:04 +02:00
rapterjet2004
93da3a9c65
Making reply length a const
Signed-off-by: Julius Linus <julius.linus@nextcloud.com>

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-24 10:40:28 +02:00
rapterjet2004
a926c27ae7
working on issue 3026
Signed-off-by: Julius Linus <julius.linus@nextcloud.com>

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-24 10:40:28 +02:00
Andy Scherzinger
984c8bff5c
further improve formatting
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-24 10:19:36 +02:00
Andy Scherzinger
c6e082c6b1
Replace any magic numbers detekt-ed
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-24 09:47:27 +02:00
Andy Scherzinger
f7e5881d87
Fix any detekt formatting issues
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-24 09:38:56 +02:00
Andy Scherzinger
5ec013143f
Migrate theme API calls - away from deprecated ones
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-24 09:08:18 +02:00
Julius Linus
528f1fd431
Merge branch 'master' into translate-message-mvvm-impl
Signed-off-by: Julius Linus <69230048+rapterjet2004@users.noreply.github.com>
2023-05-23 08:07:40 -05:00
Marcel Hibbe
0eac3a2d11
fix codacy warning
Fields should be declared at the top of the class, before any method declarations, constructors, initializers or inner classes.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-23 12:10:18 +02:00
Marcel Hibbe
9a76ce7ccd
fix to close gap between typing indicator and message input
otherwise chat content was visible in between

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-23 12:06:02 +02:00
Marcel Hibbe
5a97e90a82
improve detekt score: avoid magicNumbers...
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-23 11:34:38 +02:00
Marcel Hibbe
61859f361a
convert ConversationMessageNotifier to kt
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-23 11:16:47 +02:00
Marcel Hibbe
68799cfa24
avoid lint warning
..."Resource IDs will be non-final by default in Android Gradle Plugin version 8.0, avoid using them as annotation attributes" by using @KeyByString

keys were also wrong by copy&paste and are now fixed

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-23 10:49:31 +02:00
Marcel Hibbe
f0a9a302bb
make typing indicator two lines if necessary
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-23 10:49:31 +02:00
Marcel Hibbe
7b12f27a1a
move typing indicator methods
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-23 10:49:31 +02:00
Marcel Hibbe
fa4d02e2c6
send stoppedTyping signaling message when sending chat message
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-23 10:49:31 +02:00
Marcel Hibbe
add5e518e1
use height from typingIndicator layout
no need to define it redundant...

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-23 10:49:30 +02:00
Marcel Hibbe
231cfef8c3
check capabilities to use/ignore typing indicators
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-23 10:49:30 +02:00
Marcel Hibbe
d3d8e2abef
add setting to toggle typing status privacy
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-23 10:49:30 +02:00
Marcel Hibbe
0d6e971c38
fix to use newest capabilities to update settings.
Without this refreshing of capabilites, depending settings (for now read privacy) were never updated until app was started again because the user still contained old capabilities.

This fix will also be necessary for the typing indicator setting.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-23 10:49:30 +02:00
Marcel Hibbe
ecec266765
improve typing indicator design
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-23 10:49:30 +02:00
Marcel Hibbe
6adca2395d
add handling for multiple typing participants
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-23 10:49:29 +02:00
Marcel Hibbe
85f637ca8a
WIP. update UI when typing message received
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-23 10:49:29 +02:00
Marcel Hibbe
50e7af4d04
add timer for typing logic
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-23 10:49:29 +02:00
Marcel Hibbe
16d2d3d693
add timer for typing logic
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-23 10:49:29 +02:00
Marcel Hibbe
6228ec8d75
add sending of "typing" signaling messages
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-23 10:49:28 +02:00
Marcel Hibbe
8997c3b5c7
add receiving of "typing" signaling messages
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-23 10:49:28 +02:00
Marcel Hibbe
05b57dc4c7
rename controller_chat.xml to activity_chat.xml
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-23 10:49:28 +02:00
Julius Linus
480ad8941b
Update TranslateViewModel.kt
codacy error dix

Signed-off-by: Julius Linus <69230048+rapterjet2004@users.noreply.github.com>
2023-05-22 13:12:36 -05:00
rapterjet2004
5a18a05654 fixing detekt errors :|
Signed-off-by: Julius Linus <julius.linus@nextcloud.com>
2023-05-22 11:47:14 -05:00
rapterjet2004
00f86144d8 rewriting translate feature to use MVVM
Signed-off-by: Julius Linus <julius.linus@nextcloud.com>
2023-05-22 11:18:21 -05:00
rapterjet2004
c62a904c82 WIP rewriting translate feature to use MVVM
Signed-off-by: Julius Linus <julius.linus@nextcloud.com>
2023-05-19 17:12:37 -05:00
Andy Scherzinger
8a8f6d4e71
Add copy to clipboard action and fix layout issues for landscape mode while loading
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-17 23:31:00 +02:00
Andy Scherzinger
f9e1b40a0d
improve code formatting
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-17 23:10:07 +02:00
rapterjet2004
7f33b7fdfd issue 2931 - follow up fixes
Signed-off-by: Julius Linus <juliuslinus1@gmail.com>
2023-05-17 15:43:08 -05:00
Andy Scherzinger
b779a01c27
extract URL creation and shift paramters to retrofit API
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-17 18:59:04 +02:00
Andy Scherzinger
325be4b9f6
Optimze translation layout with specific landscape layout and use of autocomplete fields instead of spinner
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-17 15:39:46 +02:00
Andy Scherzinger
cff28de8b1
hide translation option of no target languages available
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-17 13:17:34 +02:00
Andy Scherzinger
e4f94dbcfd
Only show translation menu item for text messages
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-17 12:16:33 +02:00
Andy Scherzinger
6adf741dc1
Fix detekt issues
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-17 12:11:01 +02:00
Andy Scherzinger
f1805c9ddd
convert further strings to be translatable and unify logging tag
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-17 11:29:55 +02:00
Andy Scherzinger
98690a02d1
Makes dialog strings translatable and move to themed Material dialog
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-17 11:12:15 +02:00
Andy Scherzinger
ac0f8608a7
Add licence headers and optimize/theme translation layout
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-17 10:53:52 +02:00
rapterjet2004
5bc0f82398
issue 2931 progress - final push I hope
Signed-off-by: Julius Linus <juliuslinus1@gmail.com>

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-17 10:53:52 +02:00
rapterjet2004
0f8aa7f9e6
issue 2931 progress - pretty much done with the functionality, just got a couple small adjustments
Signed-off-by: Julius Linus <juliuslinus1@gmail.com>

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-17 10:53:52 +02:00
rapterjet2004
c6eacd30ea
issue 2931 progress - finally got most functionality + looks decent
Signed-off-by: Julius Linus <juliuslinus1@gmail.com>

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-17 10:53:52 +02:00
rapterjet2004
b91e17ca3d
issue 2931 progress
Signed-off-by: Julius Linus <juliuslinus1@gmail.com>

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-17 10:53:52 +02:00
rapterjet2004
9e9c6e81b9
issue 2931 progress
Signed-off-by: Julius Linus <juliuslinus1@gmail.com>

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-17 10:53:52 +02:00
rapterjet2004
0168be395a
issue 2931 progress
Signed-off-by: Julius Linus <juliuslinus1@gmail.com>

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-17 10:53:52 +02:00
rapterjet2004
8cdd8e9d8f
issue 2931 progress
Signed-off-by: Julius Linus <juliuslinus1@gmail.com>

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-17 10:53:52 +02:00
Marcel Hibbe
6be93ad2cd
fix to keep entered text when app is in background
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-12 15:54:57 +02:00
Marcel Hibbe
998f6c11d9
fix conversation avatars for NC26
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-05 15:08:31 +02:00
Marcel Hibbe
cafb8b649a
send call reactions
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-04 16:49:47 +02:00
Marcel Hibbe
6d735dd537
show call reactions from other participants
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-04 16:49:46 +02:00
Marcel Hibbe
c379630610
add animated emoji reactions to calls (no signaling yet)
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-04 16:49:46 +02:00
Andy Scherzinger
2ce57f4956
Merge pull request #2997 from nextcloud/feature/noid/emojiAvatars
hide delete button if no custom avatar is set
2023-05-04 16:39:11 +02:00
Daniel Calviño Sánchez
efab4cb664
Handle raised hands from the call participants rather than the signaling
Although listening from the signaling was working fine and this
unfortunately adds a lot of extra code it is conceptually "more
correct", as the UI should not directly deal with the signaling if there
is a higher abstraction available. Nevertheless, this should ease adding
other similar changes, like reactions.

Note that although there were already listeners for
CallParticipantModel.Observer in the CallActivity they were not reused,
as they handle totally unrelated things.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2023-05-04 15:15:36 +02:00
Daniel Calviño Sánchez
92d655080d
Add "reaction" event to CallParticipantModel observer
The CallParticipantModel observer now also emits one-time events that
are not reflected in the model state.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2023-05-04 15:15:36 +02:00
Daniel Calviño Sánchez
0a54fd6127
Add listener for "reaction" signaling message
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2023-05-04 15:15:35 +02:00
Marcel Hibbe
579b3b5ab4
handle emoji avatars
hide delete option from conversation info edit view if no custom avatar is set

remove themed avatars (This is the price of being able to have emoji avatars)

fix dark mode url

remove avatarVersion from url if it's null

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-04 14:43:29 +02:00
Marcel Hibbe
7518fdbcd9
fix screen locking feature
Since most controllers were replaced by activities, the screen locking was temporarily broken. This commit fixes the screen locking to also work with the activities.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-04 10:33:11 +02:00
Marcel Hibbe
b2e75a070c
remove userManager!!.users.subscribe for "share to"
i don't know why this was necessary in the past (inside the MainActivity). It works without as well.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-01 19:17:32 +02:00
Marcel Hibbe
6c2c15cd89
fix shareTo feature
it was broken since ConversationsList was migrated to Activity

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-01 19:17:32 +02:00
Andy Scherzinger
248aa69be7
Reformat java code
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-05-01 17:04:31 +02:00
Marcel Hibbe
1301d627dd
remove conversation avatar from chatActivity.
only show users avatars.
conversation avatars were removed again for now, because this would need more work to add custom view to the supportActionBar in order to show themed drawables.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-05-01 12:25:28 +02:00