Commit graph

3230 commits

Author SHA1 Message Date
Tim Krüger
b3a3277aa2
Merge pull request #2395 from nextcloud/show-message-in-call-state-when-the-publisher-failed
Show message in call state when the publisher failed
2022-09-19 15:43:06 +02:00
Tim Krüger
5bbd26028f
Merge pull request #2392 from nextcloud/fix-disposing-local-stream-when-the-call-activity-is-not-being-left
Fix disposing local stream when the call activity is not being left
2022-09-19 15:17:59 +02:00
Tim Krüger
109124fb3b
Merge pull request #2391 from nextcloud/fix-checking-lobby-state-from-chat-controller-while-in-a-call
Fix checking lobby state from chat controller while in a call
2022-09-19 15:08:54 +02:00
Tim Krüger
e47de0afc9
Merge pull request #2390 from nextcloud/provide-visual-feeback-when-a-participant-is-not-connected
Provide visual feeback when a participant is not connected
2022-09-19 13:56:07 +02:00
Tim Krüger
eb18231e25
Merge pull request #2389 from nextcloud/fix-self-video-size-after-coming-back-from-pip-mode
Fix self video size after coming back from pip mode
2022-09-19 11:05:51 +02:00
Tim Krüger
9712d05843
Merge pull request #2394 from nextcloud/fix-call-not-joined-again-if-reconnecting-while-in-pip-mode
Fix call not joined again if reconnecting while in PiP mode
2022-09-19 10:48:57 +02:00
Tim Krüger
615e67296d
Merge pull request #2388 from nextcloud/fix-issues-when-leaving-calls
Fix issues when leaving calls
2022-09-19 10:25:38 +02:00
Andy Scherzinger
679b601844
Merge pull request #2387 from nextcloud/fix-crash-after-hangup-due-to-modifying-a-list-while-iterating-over-it
Fix crash after hangup due to modifying a list while iterating over it
2022-09-19 09:33:44 +02:00
Daniel Calviño Sánchez
8364877f38
Fix crash after hangup due to modifying a list while iterating over it
"endPeerConnection()" removes the item from the list, so neither a
for-each loop nor an iterator can be used to traverse the list (as a
"ConcurrentModificationException" would be thrown). To solve that now
the list of connections is first traversed to get all the sessions, and
then the list of sessions is traversed to end the connections.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2022-09-19 09:17:12 +02:00
Daniel Calviño Sánchez
13a04808d9 Ignore signaling messages when the call activity is closing
The call activity unregisters from the event bus events when stopped.
However, when the call activity is being closed the new activity can
start before the call activity is stopped; if the new activity causes
new signaling messages to be sent those messages were handled by the
call activity too.

The chat controller joins the conversation again when it is attached,
and the call activity automatically joins the call when it receives a
"roomJoined" event. Due to all that, when the call activity was closed
and the chat controller was opened the call was joined again (and then
left once the call activity was finally destroyed).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2022-09-19 05:52:34 +02:00
Daniel Calviño Sánchez
fdbcc3b16d Close the call activity when leaving the call only if remotely triggered
If the local participant leaves the call the participant list will be
updated with the new call flags. However, that does not necessarily mean
that a moderator ended the call; the call could have been left too by
the Android app due to a forced reconnection or a time out when starting
the call. In those cases the call activity should be kept open, and only
when the local participant left the call due to a remote action the call
activity should be closed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2022-09-19 04:29:04 +02:00
Daniel Calviño Sánchez
f94db44b4d Enforce leaving state when shutting down the activity
When the view is shutting down the call is always left, so the status
should be accordingly set.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2022-09-19 04:27:03 +02:00
Daniel Calviño Sánchez
c21e1d7360 Show message in call state when the publisher failed
When the HPB is used and the publisher fails (which is a disconnection
that can not be automatically solved by itself) a forced reconnection is
triggered. This restarts the call, so some feedback should be provided
in the UI about it.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2022-09-19 01:57:25 +02:00
Daniel Calviño Sánchez
c3f1f6c3a8 Show participant as soon as found rather than once connected
As the participants that are not connected yet are clearly marked as
such now the participants are shown as soon as they are found rather
than waiting for a connection to be established.

There is a drawback, however; if a participant will never have a
connection (for example, if the HPB is used and that participant does
not have publishing permissions) the participant will be endlessly shown
with the progress bar. Nevertheless, before they were not shown at all,
which was probably even more puzzling.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2022-09-19 01:46:41 +02:00
Daniel Calviño Sánchez
2f44e6fd19 Show progress bar on local participant when not connected
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2022-09-18 23:26:26 +02:00
Daniel Calviño Sánchez
a76e519219 Show progress bar on remote participant when not connected
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2022-09-18 23:26:26 +02:00
Daniel Calviño Sánchez
c2ef651ce3 Store whether a participant is connected or not
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2022-09-18 23:26:26 +02:00
Daniel Calviño Sánchez
719797b1d1 Notify a data set change only if the properties are set
Note that this still notifies a data set change if the properties are
set to the same value that they had already, but at least it is not
notified when no data was actually changed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2022-09-18 23:26:26 +02:00
Daniel Calviño Sánchez
9f445efc1c Post event when a participant is connected and disconnected
RTCPeerConnections have several states but, for simplicity, for now the
events posted reflect only if the connection is fully established or
not (which includes both a broken connection or an established
connection that is unstable or being updated), which is enough for a
basic information about the connection state in the UI.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2022-09-18 23:25:57 +02:00
Daniel Calviño Sánchez
6481399293 Fix disposing local stream when the call activity is not being left
The local stream is set only when the activity is created. However, it
was disposed when hanging up, which happens not only when closing the
activity, but also in cases in which the call activity is kept open and
the participant reconnects to the call (for example, when starting the
call times out), which caused the local stream to freeze. Now the local
stream is disposed only when the call activity is destroyed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2022-09-18 14:26:58 +02:00
Daniel Calviño Sánchez
c01c052181 Fix call not joined again if reconnecting while in pip mode
When a publisher fails during a call a reconnection is triggered, which
first leaves the call and then initiates it again. Initiating a video
call first request the permissions, but it seems that the request hangs
when done while in PiP mode. Due to this if the publisher fails while in
PiP mode and the call is initiated again the call will be simply left,
without reconnecting to it.

The problem is specific to video calls, as in voice only calls
"onMicrophoneClick" is used instead, and it explicitly checks if the
permissions are already granted. Checking if the permissions are already
granted before requesting them is also recommended in the Android
developer guide, and as the permissions are requested during the
original call initialization it is expected that they will be already
granted if the call is changed to PiP mode, so the problem is work
arounded that way (but if the permissions are not granted when the
publisher fails in PiP mode the problem would still happen, although
that should be quite uncommon).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2022-09-18 14:25:23 +02:00
Daniel Calviño Sánchez
5513f9c88f Fix checking lobby state from chat controller while in a call
The chat controller gets the room information again and again to check
whether the lobby is enabled and update the UI as needed. This loop is
stopped when the chat controller is detached, but only if no call is
active; if a call is active the room information will still be got again
and again, even if the chat controller is detached.

To solve that now getting the room information is simply stopped when
the chat controller is detached, no matter if there is an active call or
not, and started again when joining the room, which is done when the
chat controller is attached.

However, this is just a quick fix that does not solve the issue in all
cases; the loop can still continue during calls, for example if the
request to get the information is sent before detaching the controller
and the response is received once the controller was detached, as that
would start the timer again.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2022-09-18 14:24:26 +02:00
Andy Scherzinger
713fc1f10d
Merge pull request #2371 from nextcloud/dependabot/gradle/com.android.tools.build-gradle-7.3.0
Bump gradle from 7.2.2 to 7.3.0
2022-09-16 16:36:33 +02:00
Marcel Hibbe
93da361bf1
fix to keep notification channels
new notification channels must not be deleted. for this an enum was created, so that in removeOldNotificationChannels there is no manual work to do

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-09-16 15:10:15 +02:00
Andy Scherzinger
5a2b04740b
move streams to utilize "use"
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-09-16 14:48:23 +02:00
Andy Scherzinger
928b9d5aa3
Remove unneeded nonNull annotations in kotlin
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-09-16 13:35:45 +02:00
Andy Scherzinger
8acb646383
close streams after use
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-09-16 13:35:10 +02:00
Daniel Calviño Sánchez
892ffe87dd Fix self video size after coming back from PiP mode
When coming back from PiP mode the self video occupied the full height
of the window. Now the height is set to the default value set in the
layout, so it matches the size used when starting the call activity.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2022-09-15 23:41:24 +02:00
Daniel Calviño Sánchez
a605c5df9f Rename dimension to better describe its purpose
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2022-09-15 23:34:49 +02:00
Marcel Hibbe
d230d0faf2
add chunked upload for files
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-09-15 16:22:59 +02:00
Marcel Hibbe
b064190d35
add direct video upload
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-09-15 16:22:57 +02:00
Andy Scherzinger
0f35e36047
Improve chat bubble sizes
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-09-13 10:58:44 +02:00
Tim Krüger
0c06c8b2eb
Rename and reduce complexity of function 'processMessages'
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-09-07 12:31:03 +02:00
Tim Krüger
ae0a9d6aae
Reduce complexity for 'ChatController#processMessagesFromTheFuture'
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-09-07 12:19:06 +02:00
Tim Krüger
d0df4039c6
Fix to deeply nested function processHeaderChatLastGiven
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-09-07 11:34:59 +02:00
Tim Krüger
5bb63fd58d
Reduce nested block depth for updateReadStatusOfAllMessages
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-09-07 10:51:09 +02:00
Tim Krüger
57ddf9af60
Extract duplicated code to function
The newly created function 'ChatController#determinePreviousMessageIds'
contains now the duplicated code from functions
'ChatCtonroller#processMessagesFromTheFuture' and
'ChatController#processMessagesNotFromTheFuture'.

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-09-07 10:34:45 +02:00
Tim Krüger
4cab75f6ed
Reduce complexity for function 'ChatController#processMessages'
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-09-07 08:56:35 +02:00
Tim Krüger
f762d0c9e5
Remove unused parameter 'timeout' from 'ChatController#processMessages'
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-09-06 18:04:03 +02:00
Tim Krüger
2d5969964d
Make properties private if possible
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-09-06 17:58:11 +02:00
Tim Krüger
69eea8f568
Use indexing insteat of 'Map#get'
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-09-06 17:52:51 +02:00
Tim Krüger
7b1eda1b85
Replace 'Integer#toString' with Kotlin functions
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-09-06 17:52:07 +02:00
Tim Krüger
7dec6dd4dd
Fix some spelling issues
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-09-06 17:50:18 +02:00
Tim Krüger
bb4bccbd08
Simplify boolean expressions
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-09-06 17:44:37 +02:00
Tim Krüger
7c8722bfe4
Convert string concatination to template
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-09-06 17:39:23 +02:00
Tim Krüger
a543bdc7a7
Remove assingments from 'if' clauses
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-09-06 17:35:13 +02:00
Tim Krüger
f347fe1255
Remove unnecessary elvis operator (?:)
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-09-06 17:31:27 +02:00
Tim Krüger
8f6e759d48
Remove unnecessary safe calls and non-null assertions
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-09-06 17:26:09 +02:00
Andy Scherzinger
ffdbead0f7
make system message items smaller in size and end-align the timestamp
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-09-01 09:29:10 +02:00
Álvaro Brey
e5879eb4be
Minor fixes after rebase
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-31 19:54:06 +02:00
Álvaro Brey
704df25a6d
Refactor and extract ViewThemeUtils to common library
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-31 19:54:05 +02:00
Álvaro Brey
009634da53
Extract MaterialSchemesImpl and ColorUtil to commons lib
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-31 19:54:05 +02:00
Álvaro Brey
d18fc7c9f8
Use common library for theming
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-31 19:54:02 +02:00
Tim Krüger
f10d74f0ed
Replace 'List.get(i)' with iterator to loop over list
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-08-29 19:30:01 +02:00
Andy Scherzinger
62fa8c9645
Improve dialog theming for M3
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-29 19:04:27 +02:00
Tim Krüger
1d0ff0bade
Change to not deprecated 'WorkManager.getInstance'
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-08-29 18:58:06 +02:00
Tim Krüger
d8f37bec42
Replace unused lambda parameters by '_'
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-08-29 18:57:59 +02:00
Tim Krüger
84116e4cb2
Add guests access preferences to conversation info
Currently a conversation can be made public via the bottom sheet menu in
the conversation list.

With this commit this is added to the conversation info to align with Talk web
and iOS. The functionality is removed from the bottom sheet menu in the
conversation list.

Resolves: #2134

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-08-29 18:42:56 +02:00
Marcel Hibbe
4b88effb72
add theming for categoryConversationSettings
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-08-24 12:01:20 +02:00
Marcel Hibbe
e43fe4774e
show explanation for expire messages
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-08-24 12:01:20 +02:00
Marcel Hibbe
4bdb78372e
add expiring messages option in conversation info screen
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-08-24 12:01:20 +02:00
Marcel Hibbe
77f69a676b
add system messages for message expiration
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-08-24 12:01:19 +02:00
Marcel Hibbe
b40fab9826
delete expired messages
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-08-24 12:01:19 +02:00
Andy Scherzinger
6f7756a34e prevent NPE if UI has already been teared down
Resolves #2321

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-23 14:18:17 +00:00
Andy Scherzinger
1ed9033aef
Replace lovelyDialogs with Material 3 in conversation info controller
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-19 00:52:43 +02:00
Andy Scherzinger
7124b60a3c
Update authors-list
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-18 23:40:53 +02:00
Andy Scherzinger
d1ec786907
improve detekt score
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-18 23:39:20 +02:00
Álvaro Brey
4c5bacc4eb
Rename NewBaseController to just BaseController
Old BaseController is no more!

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-18 17:20:40 +02:00
Álvaro Brey
447be67caf
Get rid of BaseController, ButterknifeController, and ButterKnife
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-18 17:19:08 +02:00
Álvaro Brey
f148c0e3c0
ConversationsListController: clean up a bit
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-18 17:13:36 +02:00
Álvaro Brey
929d6b3964
ConversationListController: use NewBaseController + viewBinding
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-18 16:58:42 +02:00
Álvaro Brey
6315032e77
ConversationsListController: convert to Kotlin step 2
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-18 16:36:45 +02:00
Álvaro Brey
dc7337d510
ConversationsListController: convert to Kotlin step 1
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-18 15:30:06 +02:00
Andy Scherzinger
9621f1daf3
Migrate dialogs on ConversationList to Material3
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-18 13:40:09 +02:00
Andy Scherzinger
c13b01da33
remove remaining traces of lovelyDialog from settings controller
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-18 13:40:09 +02:00
Tim Krüger
4ef911d045
Load higher resoliton avatars in conversation list (2)
Supplement to commit 546a174f4.

Resolves: #2302

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-08-16 09:41:08 +02:00
Tim Krüger
546a174f48
Load higher resoliton avatars in conversation list
Instead of a 64px avatar now the 512px version is loaded for
conversation lists. For avatars in a single conversation that was
already the case.

Resolves: #2302

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-08-15 12:16:05 +02:00
Álvaro Brey
d86622588a
Fix a bunch of easy detekt issues
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-12 14:46:15 +02:00
Tim Krüger
b85ec904c1
Merge pull request #2289 from nextcloud/bugfix/2287/fixSwipeToReply
Make sure to set swipe-to-reply after the room info has been loaded
2022-08-12 09:54:12 +02:00
Andy Scherzinger
5d545d6913
make sure to set swipe-to-reply after the room info has been loaded
Resolves #2287

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 18:17:02 +02:00
Andy Scherzinger
a8422e665a
Add MaterialSchemes and remove any in-line color theming to be replaced with a themeUtils call
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 18:14:03 +02:00
Andy Scherzinger
9298de0d43
replace lovelyDialog with MaterialAlert
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 16:31:05 +02:00
Andy Scherzinger
53f0779a44
replace any use of getElement
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 16:03:57 +02:00
Andy Scherzinger
89a7c5e400
move disabled color calculation to ColorUtil class
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 15:36:11 +02:00
Andy Scherzinger
5f1f34bdfa
dagger injection init moved to onCreate
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 15:29:50 +02:00
Andy Scherzinger
2332c3568c
theme progress bars and remainign alert dialogs
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:51:01 +02:00
Andy Scherzinger
b4530a2e85
Theme preview loader for messages
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:51:01 +02:00
Andy Scherzinger
8027252572
repackage to follow original structure for easy c&p replacements in the future
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:51:00 +02:00
Álvaro Brey
5636d4354b
Put material color utilities in a separate Gradle module
This avoids polluting our main sourceset and makes it easier to substitute for a proper Gradle dependency in the future

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-11 09:51:00 +02:00
Andy Scherzinger
5b983d0ce4
theme link-joining like creation fab-styled imageview
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:51:00 +02:00
Andy Scherzinger
8f812a0841
codacy: shorten UI initialization method
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:51:00 +02:00
Andy Scherzinger
a484d2ab85
codacy: shorten long method by extracting common logic
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:59 +02:00
Andy Scherzinger
5dc248e425
organize imports and remove blank lines
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:59 +02:00
Andy Scherzinger
bb4f073eb3
theme contact chat messages for Material 3
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:59 +02:00
Andy Scherzinger
ed452f1747
fixes after rebase
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:59 +02:00
Andy Scherzinger
14ac0cb1f5
replace LovelyDialog with material version
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:58 +02:00
Andy Scherzinger
fc577dccdf
cleanup themeUtils
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:58 +02:00
Andy Scherzinger
e57eb4442f
Make upload confirmation dialog a material one
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:57 +02:00
Andy Scherzinger
cca35c32af
fixes and cleanup after rebase
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:57 +02:00
Andy Scherzinger
53b5db4f19
remove unused imports
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:56 +02:00
Andy Scherzinger
e76669439f
Migrate to a new, updated popup bubble based on MaterialButton
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:56 +02:00
Andy Scherzinger
2e8ea52e89
further optimize material coloring for messages, especially time, quotes and read status
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:56 +02:00
Andy Scherzinger
006c893318
Theme call spotlight based on server theme / material 3
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:56 +02:00
Andy Scherzinger
46f6e729a1
Theme info messages primary color
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:55 +02:00
Andy Scherzinger
34d6da68a1
properly theme adapter filter highlighting
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:55 +02:00
Andy Scherzinger
8c266fe229
reformat kotlin code
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:55 +02:00
Andy Scherzinger
fa82641f31
theme toolbar icons including overflow icon and search field
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:54 +02:00
Andy Scherzinger
365a7502b4
unify tab layout theming on surface
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:54 +02:00
Andy Scherzinger
1d776ed6bd
tint dialog menu items based onSurface
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:54 +02:00
Andy Scherzinger
cb44a707a9
fix status icon background tint to match dialog background color (surface)
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:54 +02:00
Andy Scherzinger
7e8213d78b
unread chip style now material3 (while not typical chip coloring)
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:53 +02:00
Andy Scherzinger
4c9f5bec2e
proper material 3 reactions theming
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:53 +02:00
Andy Scherzinger
fd49b13b14
theme checked reactions
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:53 +02:00
Andy Scherzinger
b2e21aef7c
correct themeing for reactions bottom sheet
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:53 +02:00
Andy Scherzinger
02e18046cf
improve outgoing message theming
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:52 +02:00
Andy Scherzinger
9eb3cbc280
proper chip theming for you-mentions
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:52 +02:00
Andy Scherzinger
9a2d7ee1ff
extend tab layout theming for text / states and ripple effect
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:52 +02:00
Andy Scherzinger
37d88b7ea5
theme Mentions filter
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:52 +02:00
Andy Scherzinger
9a7ef3ca6c
theme generic avatars for Material 3
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:52 +02:00
Andy Scherzinger
1b82d14fbb
theme account switcher button's ripple effect
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:51 +02:00
Andy Scherzinger
e629932262
theme text buttons's ripple color for Material 3
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:51 +02:00
Andy Scherzinger
0d52e8a882
remove unused import
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:51 +02:00
Andy Scherzinger
1ee504870e
Add todo for generic avatar theming
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:51 +02:00
Andy Scherzinger
f6e215ad63
theme quote deletion image button
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:51 +02:00
Andy Scherzinger
d27f0e2222
preoperly theme quoted messages for Material 3 including alignment
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:50 +02:00
Andy Scherzinger
e3f305c804
Dialogs and bottom sheet to Material 3 background
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:50 +02:00
Andy Scherzinger
2f71a33c05
convert image buttons to fab
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:50 +02:00
Andy Scherzinger
4b4bd2bb6f
remove unneeded divider
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:50 +02:00
Andy Scherzinger
11f78b75fe
Make status dialog more Material 3 aligned
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:49 +02:00
Andy Scherzinger
a53bf16f72
Move chat messages to Material 3
switch to high and mid emphasis color for text in chat bubbles
centralize bubble coloring

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:49 +02:00
Andy Scherzinger
822970f8e8
improve color state calculation for all button types with primary color style
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:49 +02:00
Andy Scherzinger
51cf6061c3
cleanup text theming methods, migrate image button theming
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:49 +02:00
Andy Scherzinger
ab14d9afff
make font size value a constant
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:49 +02:00
Andy Scherzinger
c10a0a7c65
make filled buttons Material 3
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:48 +02:00
Andy Scherzinger
4d93a2099f
Move theme utils reference to base class and use new status bar coloring in all relevant places
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:48 +02:00
Andy Scherzinger
6075191bc5
TextInputLayout now supports Material 3
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:48 +02:00
Andy Scherzinger
0c4513678d
improve search toolbar theming
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:48 +02:00
Andy Scherzinger
53168d1953
theme account chooser dialog
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:48 +02:00
Andy Scherzinger
a6ba545aef
material 3 theming for search bar, toolbar and fab
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:47 +02:00
Andy Scherzinger
0f997b433d
make theme ship schemes and utilize them in themeing util
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:47 +02:00
Andy Scherzinger
58dc6a9aae
add material 3 color calculation/scheme classes
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-11 09:50:47 +02:00
Andy Scherzinger
ddb033c288
remove unused import
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:23:53 +02:00
Andy Scherzinger
65049b2d2d
accept many functions within utility classes
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:22:04 +02:00
Andy Scherzinger
11463ea55f
shorten number of return statements
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:22:04 +02:00
Álvaro Brey
501b75309b
Fix ktlint after rebase
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-10 19:22:03 +02:00
Álvaro Brey
c817d091bf
ViewThemeUtils: remove obsolete TODO
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-10 19:22:03 +02:00
Álvaro Brey
eec323cba8
ThemingCapability: remove obsolete TODO
it works

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-10 19:22:03 +02:00
Álvaro Brey
4abc3839e5
ViewThemeUtils: move things that do not belong in this class
Color calculations go to ColorUtil, checking if dark theme goes to PlatformThemeUtil

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-10 19:22:02 +02:00
Álvaro Brey
a1a91c5c0f
Move current user listening logic out of UserModule and into a new CurrentUserProvider
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-10 19:22:02 +02:00
Álvaro Brey
a45166a9db
Make ColorUtil an injectable and clean up a little
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-10 19:22:02 +02:00
Andy Scherzinger
3a9009231d
fix binding changes
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:22:02 +02:00
Andy Scherzinger
3c865364ac
let current user be null-able
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:22:01 +02:00
Andy Scherzinger
209c1a90ba
reuse color state list definitions
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:22:01 +02:00
Andy Scherzinger
b34765ccf4
migrate profile fields to input layouts for Material3
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:22:01 +02:00
Andy Scherzinger
23d436f314
fix input layout theming dark/light
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:22:01 +02:00
Andy Scherzinger
6e42a52a9a
fix entry menu bottom sheet input layout text color
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:22:00 +02:00
Andy Scherzinger
8f02558a8d
Add caching
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:22:00 +02:00
Andy Scherzinger
96c29260ab
set link colors correctly
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:21:59 +02:00
Andy Scherzinger
e3c535722d
theme all swipe to refresh layouts
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:21:59 +02:00
Andy Scherzinger
b9e9c35df5
don't tint status icons on cardViews
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:21:59 +02:00
Andy Scherzinger
eb967fbf7d
harden theming calculations to handle null values
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:21:59 +02:00
Andy Scherzinger
d4c07f1278
safeguard theme values in case of null values
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:21:58 +02:00
Andy Scherzinger
d9c59b6f87
organize imports
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:21:58 +02:00
Andy Scherzinger
278aaa437f
fix ktlint issues
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:21:58 +02:00
Andy Scherzinger
9eac0d3615
theme audio device list
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:21:57 +02:00
Andy Scherzinger
234e97502b
theme reactions bottomsheet
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:21:57 +02:00
Andy Scherzinger
e9d304a79b
theme outgoing voice message seekbar
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:21:57 +02:00
Andy Scherzinger
b7006230b8
theme incoming voice message
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:21:57 +02:00
Andy Scherzinger
f68384e69d
theme folder/archive icon
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:21:57 +02:00
Andy Scherzinger
641744ec56
extend outgoing messages' theming
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:21:56 +02:00
Andy Scherzinger
0f94b8c473
theme outgoing poll bubble
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:21:56 +02:00
Andy Scherzinger
a907b1ba51
fix theming for poll button
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:21:56 +02:00
Andy Scherzinger
9aabb8804e
extend button theming for primary actions to respect states and also cover icons
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:21:56 +02:00
Andy Scherzinger
e54abe63f1
theme polls and add further theming functions to the utils
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:21:55 +02:00
Andy Scherzinger
0463a39bfb
Add EditText coloring
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:21:55 +02:00
Andy Scherzinger
28aae00641
extend text input layout theming
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:21:55 +02:00
Andy Scherzinger
907386e9b7
add proper button-state coloring for button text/icon
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:21:55 +02:00
Andy Scherzinger
aef9b69175
add proper checkbox- state coloring
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:21:55 +02:00
Andy Scherzinger
7ec78e53f0
first steps to theme poll creation
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:21:54 +02:00
Andy Scherzinger
9be4358ae0
theme contacts selector icon
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:21:54 +02:00
Andy Scherzinger
d1a562cf80
fix after rebase
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-10 19:21:54 +02:00
Álvaro Brey
e5bf5ec261
WIP: theme chat controller and message viewholders
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-10 19:21:54 +02:00
Álvaro Brey
3283e5b4f6
ConversationItem: theme unread message bubbles
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-10 19:21:54 +02:00
Álvaro Brey
4de7d06e8e
Theme SharedItemsActivity
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-10 19:21:53 +02:00
Álvaro Brey
94479d0943
Theme TakePhotoActivity
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-10 19:17:36 +02:00
Álvaro Brey
b66ec4a150
Theme ConversationInfoController
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-10 19:17:36 +02:00
Álvaro Brey
b4ed79dc38
Theme EntryMenuController
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-10 19:17:36 +02:00
Álvaro Brey
49f9e0ffc4
Theme RemoteFileBrowser
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-10 19:17:35 +02:00
Álvaro Brey
a4c01978a8
Theme ProfileController
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-10 19:17:35 +02:00
Álvaro Brey
4c31f6f2e9
SettingsController: theme switch preferences
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-10 19:17:35 +02:00
Álvaro Brey
5abdacab25
SettingsController: color section headers
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-10 19:17:35 +02:00
Álvaro Brey
d60fdd03c5
Color SetStatusDialog and ChooseAccountDialog
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-10 19:17:35 +02:00
Álvaro Brey
4af491c7df
Color search highlights
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-10 19:17:34 +02:00
Álvaro Brey
54d1ac9de7
ContactsController: tint "public conversation" button
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-10 19:17:34 +02:00
Álvaro Brey
5ec18780ff
Color list headers
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-10 19:17:34 +02:00
Álvaro Brey
a8e99862f1
Automatically update current user with room observable
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-10 19:17:34 +02:00
Álvaro Brey
9bbeb9b420
Base framework for server theming
Includes PoC with ConversationListController's FAB

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-10 19:17:30 +02:00
Andy Scherzinger
768cb06999
Merge pull request #2283 from nextcloud/feature/2029/more-tabs-in-shared-items-view-2
Add tab for deck cards
2022-08-10 18:07:08 +02:00
Álvaro Brey
cdc818b720
ChatController: fix crash when opening conversation from notification
This happens because there is no Conversation object available in the Controller when coming from a notification.

This patch means that when opening a notification for a poll, it will always look like the user is not the owner of the poll even if they are.
This is unfortunately difficult to fix as the initialization logic for ChatController is all kinds of messed up: ideally we'd always load the Conversation object before showing any kind of UI but that's too big of a change to do without tests.

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-08-10 13:10:30 +02:00
Andy Scherzinger
53bdd951ad
Add deck icon
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-09 23:24:27 +02:00
Tim Krüger
aae7e851c9
Reduce number of return statements
Codacy reported:

  Function itemFromObject has 4 return statements which exceeds the limit of 2.

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-08-09 18:48:25 +02:00
Tim Krüger
43f2d1badf
Shared items: Add tab for deck cards
Deck cards will be opened in the web browser because no specific view
exists.

Resolves: #2029

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-08-09 18:26:48 +02:00
Tim Krüger
4c8c8ac98a
Shared items: Show actor and date-time
For all item types it will now shown who (actor) and when (date-time)
the item was shared.

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-08-09 18:09:54 +02:00
drone
ed0e9c2374 Merge commit '81a3e8216dd947abfe1038a5ab040f9c67d3a62b' 2022-08-09 12:00:54 +00:00
Tim Krüger
81a3e8216d
Shared items: Add tab for other
Resolves: #2029

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-08-09 14:00:00 +02:00
Tim Krüger
26fde13292
Shared items: Add tab for locations
Resolves: #2029

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-08-08 18:52:11 +02:00
Tim Krüger
d5214ee29c
Replace '@JvmField' with 'lateinit'
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-08-08 18:52:11 +02:00
Tim Krüger
00f06c6ef2
Shared items: Add tab for polls
Resolves: #2029

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-08-08 18:51:56 +02:00
Andy Scherzinger
9fc7182790
Migrate to updated popup bubble
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-05 16:40:59 +02:00
Andy Scherzinger
9df00a8562
make equals null-safe in case no status set
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-05 16:17:04 +02:00
Tim Krüger
84f2cf432c
Use singular and plural for vote(s) string
Resolves: #2265

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-08-05 10:27:03 +02:00
Andy Scherzinger
3ca3f35e3e
Update app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java
Co-authored-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-04 12:29:24 +02:00
tobiasKaminsky
d1e474e402
Fix status visibility in conversation list
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2022-08-03 08:24:10 +02:00
Andy Scherzinger
0a3e0230c9
fix avatar voter border
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-01 13:43:05 +02:00
Andy Scherzinger
09ddc86c40
Optimize layout and make it accessible
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-01 13:43:05 +02:00
Andy Scherzinger
d999815ffa
remove unused java imports
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-26 22:24:18 +02:00
Andy Scherzinger
9b48bfedf6
remove unused imports
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-26 22:13:06 +02:00
Andy Scherzinger
f951336d0d
remove unused persistence methods
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-26 21:55:03 +02:00
Andy Scherzinger
66b2d44739
finish migration to room: remove requery
Resolves #2244

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-26 21:16:38 +02:00
Andy Scherzinger
125d6770b4
plug cipher migration hook into room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-26 20:33:47 +02:00
Andy Scherzinger
520dbdbdec
organize imports
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-25 10:59:08 +02:00
Andy Scherzinger
9ab4c58b41
remove all legacy code except basic requery implementation still needed for the cypher upgrade
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-24 14:19:20 +02:00
Andy Scherzinger
99049e01d7
remove all methods of legacy arbitrary storage persistence
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-24 13:41:35 +02:00
Andy Scherzinger
b5040f2d55
Migrate ArbitraryStorageUtils to ArbitraryStorageManager use
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-24 13:41:34 +02:00
Andy Scherzinger
5c6fe628f1
Migrate ArbitraryStorageUtils to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 18:40:32 +02:00
Andy Scherzinger
516b9190ad
fix codacy issues
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 18:27:14 +02:00
Andy Scherzinger
8f6bb87761
remove legacy current user provider and make all methods of legacy user utils private
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:43:17 +02:00
Andy Scherzinger
4d935920d0
Migrate RemoteFileBrowser and UnifiedSearch classes to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:38:05 +02:00
Andy Scherzinger
1a20bd3a3b
Migrate to new current user provider
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:33:45 +02:00
Andy Scherzinger
f3d31bf8c1
add license header and empty line at file end
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:29:13 +02:00
Andy Scherzinger
93dacd25c4
Deprecate CurrentUserProvider
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:27:34 +02:00
Andy Scherzinger
3e08781872
Add removal todo for upcoming major version(s)
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:27:18 +02:00
Andy Scherzinger
bcb728a0d1
Migrate PushUtils from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:21:40 +02:00
Andy Scherzinger
285b9cff03
Make signaling db updates use a subscribing consumer
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:21:03 +02:00
Andy Scherzinger
7593efd43f
Migrate WebsocketConnectionsWorker from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:13:39 +02:00
Andy Scherzinger
70d777ec3b
Migrate AddParticipantsToConversation from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:13:25 +02:00
Andy Scherzinger
67318883d0
Migrate SignalingSettingsWorker from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:05:48 +02:00
Andy Scherzinger
22ef1457ee
Migrate LeaveConversationWorker from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:05:30 +02:00
Andy Scherzinger
24ddaf4ec4
Migrate ShareOperationWorker from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:05:07 +02:00
Andy Scherzinger
2dfd4731af
Migrate DeleteConversationWorker from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:04:47 +02:00
Andy Scherzinger
5b8c352947
Migrate ContactAddressBookWorker from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:04:22 +02:00
Andy Scherzinger
d7654f8476
Add generic save method
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:03:43 +02:00
Andy Scherzinger
c4c183ac39
Add UserIdUtils for generic no primary key situation handling
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:02:56 +02:00
Andy Scherzinger
1cec9045ee
Migrate CapabilitiesWorker from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 14:58:08 +02:00
Andy Scherzinger
d4b84635f1
Migrate DownloadFileToCacheWorker from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 14:57:50 +02:00
Andy Scherzinger
27017aac9e
Migrate AccountRemovalWorker from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 14:29:41 +02:00
Andy Scherzinger
7ea37b9ee3
migrate poll view model from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 14:14:48 +02:00
Andy Scherzinger
4513866c1d
migrate key manager from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 14:09:08 +02:00
Andy Scherzinger
70ae6eb27d
migrate mention auto complete from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 14:08:45 +02:00
Marcel Hibbe
34686dd581 avoid to divide by zero
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
8dfb6ca5aa add loading screen
this also avoids to doubleclick on end poll button

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
06d9b6f886 rename close poll to end poll in code
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
c3472de802 move checkboxes to left
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
c1fd78d29a static text for poll messages
= remove api call. it was decided in talk team to remove this to avoid so many requests. downside is that it's not possible anymore to see if the poll is closed or not.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
b2e47d885c show overlapped mini avatars in results overview
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
64412a1876 toggle details view on click on avatar views
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
20dabf3a72 wip. toggle between voters overview and voters details
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
c7014fd063 hide system message "You voted on the poll ..."
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
58739b8f14 disable buttons while waiting for response
avoids doubleclick and doubled data

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
f46d2d28f5 close dialog when voted for hidden poll
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
82ffd1f83c add Options in init method
this avoids adding them again on screen rotation...

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
ba6cc7170b initially add 2 option fields and focus question field
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
ca0c045e8d initialize viewModel in onCreate
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
dca7e39905 get variables from parentViewModel
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
139c4412ad move variables from fragment to PollMainViewModel
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
6dfed0e5e7 avoid unnecessary null checks in PollMessageViewHolders
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
880c656be2 enable/disable submit button by liveData
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
3267fc2f47 remove nullable from PollRepository return types
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
87fdd7017d replace @JvmField with lateinit vars
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
bfcab7cb49 fix copyright
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
4b6a314514 remove unused viewState
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
4388d66b23 use CurrentUserProviderNew and User for polls
use CurrentUserProviderNew and User instead of CurrentUserProvider and UserEntity

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
41d64aa740 add copyrights
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
feaf041685 fix cursor jumping to end when editing question
setting the cursor to the end was just a (buggy) workaround when the question was of type liveData. As it's not liveData anymore, this workaround was now useless

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
6b8c83f553 add dismiss button for edit votes mode
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
2ac1567f5d delete empty options on poll creation
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
9afe4e44d6 fix LiveData value assignment nullability mismatch
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
f10b76d430 check talk-polls capability
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
3b4be83ea7 calculate percent with voters instead votes
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
a8afb61745 always focus new empty poll option in poll create dialog
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
40f20c56d6 update poll UI for moderators etc
- allow to end poll for moderators

- allow to see voters amount for voting screen for moderators and creators of the poll

- replace UserEntity with User

- show numVoters instead of votes

- minor refactoring

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
c848659fda fix text of submit button
+ rename variables

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
cedbcaefee fix percentage calculation for multiselect polls
for multiselect polls the total votes must be taken instead amount of voters (one voter can have more than 1 votes..)

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
9e8dbb70f3 remove livedata where it's not needed
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
2988b667fe solve detekt warnings 2
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
2b8ee4953b solve detekt warnings
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
1b13812202 solve klint warnings
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
4c6e4b1c4c add copyright headers
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
23bf072326 fix InstantiationException for more fragments
followup to a12692ec + get parentViewModel by ViewModelProvider

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
38256fc25d fix compile error from commit a12692ec
(temporarily...)

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
1a000859bf fix InstantiationException for fragments
fragments must have a public, no-arg constructor.
extra information must be passed as arguments.

With a constructor that receives the data, the following error occurs:

Fragment$InstantiationException: Unable to instantiate fragment ..... could not find Fragment constructor

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
3224ae1e1f improve klint score, minor refactoring
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
b347fbf1b5 rename close poll to end poll (in code)
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
bd99245c26 add confirm dialog to end poll
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
01f7016ae2 convert "votes" map
see https://github.com/nextcloud/spreed/pull/7500

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
73d48a395c show detailed list of voters
+ refactoring adapter and viewholders for result screen

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
909ee07ce6 wip2: styling of poll bars
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
318549a63a wip: show user avatars for closed public polls
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
6447b82969 disable vote button when selection is not changed compared to own votes
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
167aa43ca0 make own votes bold in result screen
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
a95c0d997b make own votes bold in voting screen
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
782d74bfb9 restrict multiselection to maxVotes
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
a4c48b11d6 fix radiobuttons
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
2da4c37a52 remove liveData for selectedOptions
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
acda3d283b add multiselect for poll options
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
8541ebbfc0 add ability to close poll in PollVoteFragment
this adds duplicate button logic atm. might need to be improved..

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
8c898404d1 move details text to PollMainViewModel
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
fbd5e5f5ed show voting screen for open private polls
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
b504af1cd9 add UI logic + close poll system message
add close poll button (wip/temporarily?)
add "close poll" system message
add UI related logic to PollMainViewModel
add placeholder for pollDetails in UI

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
ea0b7d07cc poll creation: add logic to enable/disable buttons
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
8148bfaa65 add poll system message, klint fixes
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
9f90e9c4c6 wip: create poll using multiple livedata fields
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
b140cc8751 wip: create poll using livedata
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
af427f8300 wip: create poll. show outgoing polls
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
0388f3e3f6 fix to show vote results if only "poll.votes" are available
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
d31a9b1ade fix to send votes
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
5a070f5e1b wip: view poll results
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
7d8aebe234 wip: vote on poll
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
81666829b5 fetch poll to set subtitle in message
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
ae80a4e2ad pass roomToken to MessageViewHolders
wrap roomToken and ProfileBottomSheet in data class MessagePayload

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
c7e9721809 wip: get poll from API
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Álvaro Brey
42324419cd wip: Poll view model work
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
01f18d7eca add API poll details
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
e605546925 fix klint warnings
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
bf05445561 open poll dialog
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
f2025332ab add data classes for polls (WIP)
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Andy Scherzinger
00f55f1949
use correct primary key to search for any other users in the DB and use current value from user attributes object
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-22 19:50:29 +02:00
Andy Scherzinger
6a8cafec22
migrate location picker from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-22 13:52:34 +02:00
Andy Scherzinger
dac99a5db8
Remove unused (legacy) UserUtils
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-22 13:52:34 +02:00
Andy Scherzinger
e7756003d7
remove variable shadowing
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-22 13:52:33 +02:00
Álvaro Brey
a3b99e9010
UserManager: fix rx logic for scheduleUserForDeletionWithId
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-07-22 13:52:33 +02:00
Andy Scherzinger
e7c258e2f8
fix detekt issues
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-22 13:52:33 +02:00
Andy Scherzinger
9bdd0c7a4e
Fix user manager db result processing
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-22 13:52:32 +02:00
Andy Scherzinger
6e05056b2e
Migrate AccountVerificationController from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-22 13:52:32 +02:00
Andy Scherzinger
8d87d5486b
update to latest API changes for storing users
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-22 13:52:32 +02:00
Andy Scherzinger
036e67027c
Migrate web view login from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-22 13:52:31 +02:00
Andy Scherzinger
fe8c7d468a
Migrate server selection from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-22 13:52:31 +02:00
Álvaro Brey
da6ca10cb8
PushRegistrationWorker: fix missing injection causing NPE during login
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-07-22 10:16:37 +02:00
Andy Scherzinger
5eab5f86f7 push token recover is should not use the standard httpClient object and its cookieStore
Resolves #2218

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-22 06:48:40 +00:00
Andy Scherzinger
7ce5746969
rename updateUser to updateOrCreateUser
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-18 18:52:51 +02:00
Andy Scherzinger
96910c02a1
simplify call logic
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-18 18:52:51 +02:00
Andy Scherzinger
480122d648
rename entity to user
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-18 18:52:51 +02:00
Andy Scherzinger
7568ccdbb1
split account matcher code for better readability
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-18 18:52:50 +02:00
Andy Scherzinger
8efbd14fe0
Migrate switching accounts from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-18 18:52:50 +02:00
Andy Scherzinger
ac7652b5de
Migrate Settings and Profile controller from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-18 18:52:49 +02:00
Andy Scherzinger
80570e59b4
rename user var to better reflect its type
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-16 16:01:15 +02:00
Andy Scherzinger
f4cde24f8e
Migrate contacts and creation of talk rooms from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-16 15:52:01 +02:00
Andy Scherzinger
4bdc2c1081
Migrate recieving calls from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-16 14:51:07 +02:00
Andy Scherzinger
cbe4658632
add method to update external signaling information
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-16 14:39:18 +02:00
Andy Scherzinger
75aa5c9379
reformat code
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-16 14:33:55 +02:00
drone
5e2bd3c12d Merge commit 'fde2667fe79a09e6b267a26bb61c06730d43d7d5' 2022-07-14 16:40:05 +00:00
Andy Scherzinger
fde2667fe7
Migrate Call Activity and used classes/methods from requery to room
Resolves #2216

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-14 18:19:43 +02:00
Marcel Hibbe
95f3d776db
fix switching conversation titles
This reverts a change from a24f49c7

Before a24f49c7 in onDestroy() the disposables were not disposed. Instead this was "only" done in onComplete() of leaveRoom().
See a24f49c#diff-6b47d0e9875a7f7d5c1e6b80feab998e92d29b0cda8ac9bbf427aab99e56d209R1827
Because with a24f49c7 was now executed in onDestroy() , the leaveRoom() method is not executed successfully because it's destroyed too early. This results in multiple calls of getRoomInfo() with different roomTokens.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-14 10:21:13 +02:00
Andy Scherzinger
f2fe776603
Deprecate legacy method
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-13 00:22:24 +02:00
Andy Scherzinger
835cac8189
organize imports
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-13 00:22:24 +02:00
Andy Scherzinger
7230f81cf5
Migrate conversations list and next hop controllers to use the room user entity
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-13 00:22:03 +02:00
Andy Scherzinger
110e8a76b7
make getImageRequestForUrl accept user or userEntity and have a variant without a user
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-13 00:22:02 +02:00
Andy Scherzinger
9b28a8cfe3
make hasChatPermission accept user and userEntity
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-13 00:22:02 +02:00
Andy Scherzinger
9fb176dc88
make helper methods easy to access from java code
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-13 00:21:59 +02:00
Andy Scherzinger
0fe26b6d08
Merge pull request #2199 from nextcloud/feature/noid/markAsRead
Mark as read via notification
2022-07-13 00:20:43 +02:00
Andy Scherzinger
ea849281e5
Merge pull request #2210 from nextcloud/chore/noid/with-nullable-binding
Add method in NewBaseController to handle NPE catches for viewbinding
2022-07-12 16:31:55 +02:00
Dariusz Olszewski
dafa1bfb2e Mark as read - reduce scope of try/catch
NumberFormatException is expected only inside parseMessageId. To avoid masking other errors accidentally, seems better to have try/catch only around parseMessageId call.

Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-07-12 12:51:03 +00:00
Dariusz Olszewski
97ea95c30f Mark as read - SpotBugs
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-07-12 12:51:03 +00:00
Andy Scherzinger
f91d45e2db Improve message id parsing
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-12 12:51:03 +00:00
Dariusz Olszewski
9a247b48ac Mark as read - correct error message
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-07-12 12:51:03 +00:00
Dariusz Olszewski
c3a31da6a9 Mark as read - extract buildIntentForAction function
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-07-12 12:51:03 +00:00
Dariusz Olszewski
7243142676 Mark as read - use message ID retrieved from server
Minimal set of changes, to be cleaned-up.

Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-07-12 12:51:03 +00:00
Andy Scherzinger
f977b566a5 Implement mark as read via notification
Resolves #2164

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-12 12:51:03 +00:00
Álvaro Brey
e7222529c1
Make private broadcast permission depend on applicationId
Otherwise we can't install QA and normal app side by side

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-07-12 13:16:35 +02:00
Álvaro Brey
8e3dc066b2
Add method in NewBaseController to handle NPE catches for viewbinding
This is really a symptom of unreliable design around the async logic in Controllers. The data async calls should have been separate from the controller,
so that the only asynchronicity the Controller has to deal with is UI-related, and can be cancelled safely on destroyView.

In the future as those controllers are converted to something that has a separate ViewModel, this kind of catch should be completely unneeded.

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-07-12 12:46:10 +02:00
Marcel Hibbe
1f5807b8de fix NPE for binding in onEmojiClickListener
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-11 17:24:56 +00:00
Marcel Hibbe
d983c62589 fix crash when changing status during call
"call" is not contained in predefinedStatusesList so it crashed when searching for it with predefinedStatusesList.first()

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-11 17:09:06 +00:00
Andy Scherzinger
82dbadc028
Merge pull request #2201 from nextcloud/bugfix/2198/fixNpeViewBindingTogglePublicConversation
catch NPE for binding in toggleCallHeader
2022-07-11 18:26:39 +02:00
Marcel Hibbe
0dbe8c0f2c
catch NPE for binding (loadCurrentStatus#onError)
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-11 13:44:24 +02:00
Marcel Hibbe
04c96dd400
catch NPE for binding
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-11 13:32:54 +02:00
Álvaro Brey
a24f49c737
Introduce DisposableSet to handle multiple disposables at once
This should be used in places where multiple Disposables are handled simultaneously as a simple way of
ensuring that all disposables are cleared on exit. For example on ViewModels and Controllers should likely use one
of these and clear it on their respective lifecycle end.

I've included an example use in ChatController, where it replaces an existing `ArrayList<Disposable>`, but the benefit
should be more visible in places where Disposables are currently handled separately.

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-07-07 16:47:17 +02:00
Andy Scherzinger
30cbe0f43c
set/read matching user context
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-07 14:29:33 +02:00
Andy Scherzinger
7b4b1b7e84
Revert "read matching user context"
This reverts commit 07c57bcfd1.

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-07 14:03:25 +02:00
Andy Scherzinger
07c57bcfd1
read matching user context
Resolves #2180

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-07 13:58:15 +02:00
Álvaro Brey
95119ba9d6
ProfileController: code cleanup
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-07-07 13:51:56 +02:00
Álvaro Brey
cb2ee730fa
WIP: upload profile picture from camera
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-07-07 13:51:55 +02:00
Andy Scherzinger
c151da3080
safeguard mapper for null values on fields that need to be json-parsed
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:23 +02:00
Álvaro Brey
886a3d0df2
UsersDao: make setUserAsActiveWithId blocking
Room won't accept non-blocking @Transactions, which makes sense

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-07-01 08:59:22 +02:00
Álvaro Brey
0ac26f557b
UsersDao/Repository: get rid of suspend functions
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-07-01 08:59:22 +02:00
Álvaro Brey
f339648875
UsersDao: fix race condition in setUserAsActiveWithId
Make the method return a Single instead, and don't make it a suspend function

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-07-01 08:59:22 +02:00
Andy Scherzinger
205292f9b0
fix review comments
Co-authored-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:21 +02:00
Andy Scherzinger
12f793567e
add arbitrary storage business layer
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:21 +02:00
Andy Scherzinger
ad223155d7
Deprecate UserUtils
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:21 +02:00
Andy Scherzinger
a99a173612
fix getUsersScheduledForDeletion query
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:21 +02:00
Andy Scherzinger
3ccf41d1a6
fix getUsers query
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:20 +02:00
Andy Scherzinger
f1dff03188
fix upsert logic for users
Co-authored-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:20 +02:00
Andy Scherzinger
dc83403606
Move from Single to Maybe
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:20 +02:00
Andy Scherzinger
6497c2d9b1
fix crash when navigating back from chat to conversation list
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:19 +02:00
Andy Scherzinger
85012e1acb
remove unused variable
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:18 +02:00
Andy Scherzinger
5742927ae8
remove unused method
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:18 +02:00
Andy Scherzinger
1e753e0250
Deprecate old interfaces and util classes and reference new one
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:17 +02:00
Andy Scherzinger
9f43eb5278
Rename CapabilitiesNgNew to CapabilitiesUtilNew and mark old one as deprecated
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:17 +02:00
Andy Scherzinger
9b55241881
remove unneeded @Serializable
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:17 +02:00
Andy Scherzinger
3b1d4b86a9
Add model to ArbitraryStorage db layer
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:16 +02:00
Andy Scherzinger
a207ad7b97
Rename ArbitraryStorageNgEntity to ArbitraryStorageEntity
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:16 +02:00
Andy Scherzinger
84c1874284
simplify call chain
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:16 +02:00
Andy Scherzinger
443110557c
further renames for UserEntity
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:16 +02:00
Andy Scherzinger
9d4b6b4392
remove serializable annotation on room entities
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:15 +02:00
Andy Scherzinger
4233e1bbc1
Rename UserNgEntity to UserEntity
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:15 +02:00
Andy Scherzinger
25a5346435
unify room converter's json handling to always use LoganSquare
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:15 +02:00
Andy Scherzinger
2a0ee1c90d
move extension functions to methods
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:14 +02:00
Andy Scherzinger
c9ba0fe870
annotate JvmStatic for more idiomatic access from Java
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:14 +02:00
Andy Scherzinger
74fc56fa7e
Replace Observable with Single, let Repositories serve Models
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:14 +02:00
Andy Scherzinger
359104d6ba
rename to isDbRoomMigrated and setDbRoomMigrated for proper kotlin interoperability
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:13 +02:00
Álvaro Brey
afbec06ad3
WIP improvements during pair programming call
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-07-01 08:59:13 +02:00
Andy Scherzinger
5881e5021c
make disposal of searchViewDisposable null-safe
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:13 +02:00
Andy Scherzinger
d3286bf6bc
update test cases
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:12 +02:00
Andy Scherzinger
925691299a
ignore spotbugs correctness for an android api array access with fixed index
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:12 +02:00
Andy Scherzinger
565903b956
remove flow and use rx
...to stay in line with currently used concepts

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:11 +02:00
Álvaro Brey
f7786e1b93
Fix flow listening in SettingsController
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-07-01 08:59:11 +02:00
Andy Scherzinger
27d5059e92
trying to extract flow value
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:10 +02:00
Andy Scherzinger
f7ca1ec804
DB version switcher for requery
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:10 +02:00
Andy Scherzinger
d55c3fa68e
Log db migrations
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:10 +02:00
Andy Scherzinger
8c27b54377
move everything to flows
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:09 +02:00
Andy Scherzinger
730aeb2944
fix detekt and ktlint issues
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:09 +02:00
Andy Scherzinger
5ffa3c44fd
create new capabilities util add license header and format kotlin code
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:08 +02:00
Andy Scherzinger
75c8625aee
run user repo call in coroutine
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:08 +02:00
Andy Scherzinger
349d5fe19b
dual-mode of DB fpr requery and room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:08 +02:00
Andy Scherzinger
05db482d06
adding arbitrary storage implementation, initial steps towards new util classes
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:59:07 +02:00
Andy Scherzinger
db1dd66204
port room database layer from master-broken to up-to-date master
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-01 08:58:56 +02:00
Álvaro Brey
e176b38d8b
NewBaseController: Inject kotlin fields without @JvmField and nullable type
These do not need to be nullable as they will be injected immediately.
This will make child controllers code much cleaner.

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-06-28 17:00:01 +02:00
Tim Krüger
834d310eb8
Use simple class name for logging
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-06-23 15:35:42 +02:00
Tim Krüger
f87e0a2d85
Set PendingIntent flag immutable
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-06-23 15:34:11 +02:00
Tim Krüger
174a7e53d8
Remove unneeded '@SuppressLint("InlinedApi")'
The annotation '@RequiresApi' was already set correctly.

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-06-23 15:24:28 +02:00
Tim Krüger
10a4521af9
Rename 'WebRtcAudioManger' to 'WebRtcAudioManager'
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-06-23 15:20:32 +02:00
drone
272f2e839c Merge commit '58c40e6ee244e6b78cc8754e8cc621e8400507d7' 2022-06-23 08:59:34 +00:00
Andy Scherzinger
331309405d
Set intent flag required by Android 12 (SDK 31)
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-23 10:21:03 +02:00
Álvaro Brey
c4d9105613
Merge pull request #2148 from nextcloud/fix/callactivity-receiver
Use custom permission for unfiltered broadcast receiver in CallActivity
2022-06-23 09:36:00 +02:00
Tim Krüger
f366c75f68
Add mandetory intent flags
Since SDK 31 for an 'PendingIntent' the intent flags 'FLAG_IMMUTABLE' or
'FLAG_IMMUTABLE' are mandetory.

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-06-22 15:33:26 +02:00
Andy Scherzinger
3096d90bc6
only set intent flag for sdk>=31
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-22 11:21:46 +02:00
drone
4b67a71ff4 Merge commit '1f936cb677ed17f93fba461ae59ac84bda5e99db' 2022-06-22 09:00:28 +00:00
Andy Scherzinger
1f936cb677
migrate to sdk=31
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-22 10:59:38 +02:00
Tim Krüger
6e4841ae3a
Rename 'MagicAudioManager' and 'MagicBluetoothManager'
It's not magic but WebRtc related.

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-06-21 15:13:47 +02:00
Tim Krüger
e14f00fae7
Request 'BLUETOOTH_CONNECT' permissions
Request the 'BLUETOOTH_CONNECT' permissions if not already granted.

If the permission is be granted in this request, the
'MagicBluetoothManger' will be started.

See: #2132

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-06-21 15:13:40 +02:00
Andy Scherzinger
205d00d443
harmonize license header in java/kt files
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-18 16:42:53 +02:00
Andy Scherzinger
0b2b0cca51
Use proper Android logger
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-18 16:36:02 +02:00
Andy Scherzinger
49792ecf1e
rename blacklist/whitelist variables to include/exclude sets to reflect their collection type
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-18 16:29:57 +02:00
Andy Scherzinger
61ec38dd5e
replace deprecated listener due to update to exoplayer 2.18.0
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-18 16:25:27 +02:00
Andy Scherzinger
993e50dbdb
rename variable to reflect its collection type
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-18 15:37:42 +02:00
Andy Scherzinger
34f8bb5ab7
use fixed strings where possible to limit lint score bump
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-18 15:25:11 +02:00
Andy Scherzinger
cd44de757c
code reformatting
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-18 15:17:08 +02:00
Andy Scherzinger
08f5274af9
add cipher migration for version 4 of sqlcipher
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-18 14:44:45 +02:00
Tim Krüger
dedbe40cc0
Launch 'MagicBluetoothManager' independently
This change is needed to make the 'MagicBluetoothManager' startable
after the from Android SDK 31 introduced BLUETOOTH_CONNECT is granted by
the user.

Before this change the 'MagicBluetoothManager' was only started in
'MagicAudioManager#start'. Now the new method
'MagicAudioManager#startBluetoothManager' can be used to start the
'MagicBluetoothManager'.

This change is also a preperation to fix #1309 and #2114.

See: #2132, #1309, #2124

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-06-17 15:51:44 +02:00
Tim Krüger
4821b02729
Add Android build switch for checking bluetooth permissions
Refactored method 'hasPermission' to 'hasNoBluetoothPermission'. The new method
respect the in SKD 31 introduced permission BLUETOOTH_CONNECT. For older SDK
versions the permission BLUETOOTH will be used.

Additionaly make methods private which need bluetooth permissions and only
called locally. For public methods which need bluetooth permissions the method
'hasNoBluetoothPermission' is called to check them.
Also add suppress lint annotation for 'MissingPermission'.

From SDK 30 to SDK 31 the bluetooth related permissions changed and it
is suggested to add the attribute 'android:maxSdkVersion="30"' to the
legacy BLUETOOTH permission in the 'AndroidManifest.xml' [1]:

> For your legacy Bluetooth-related permission declarations, set
> android:maxSdkVersion to 30. This app compatibility step helps the system
> grant your app only the Bluetooth permissions that it needs when installed
> on devices that run Android 12 or higher.

This is explicitly not done here!

During runtime (on Android 12) while starting the 'MagicBluetoothManger' the
following part in 'android.bluetooth.BluetootHeadset' constructor will be
executed and results in the previous exception:

  // Preserve legacy compatibility where apps were depending on
  // registerStateChangeCallback() performing a permissions check which
  // has been relaxed in modern platform versions
  if (context.getApplicationInfo().targetSdkVersion <= Build.VERSION_CODES.R
           && context.checkSelfPermission(android.Manifest.permission.BLUETOOTH)
                   != PackageManager.PERMISSION_GRANTED) {
     throw new SecurityException("Need BLUETOOTH permission");
 }

In the 'build.gradle' the 'targetSdkVersion 30' and 'compileSdkVersion 31' is
configured. Because the 'MagicBluetoothManager' checks for the 'targetSdkVersion'
instead of 'Build.VERSION.SDK_INT' also on a Android 12 (SDK 31) the 'BLUETOOTH'
permission is needed.

So the solution is to don't set `android:maxSdkVersion="30"' for the BLUETOOTH
permission and request the BLUETOOTH_CONNECT permission.

Resolves: #2132
See:
  [1] https://web.archive.org/web/20220416121005/https://developer.android.com/guide/topics/connectivity/bluetooth/permissions#declare-android12-or-higher

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-06-17 15:51:44 +02:00
Marcel Hibbe
c628c23557 fix to load conversation list (restricted user status)
when the user status app on server is restricted to only some groups, the capabilities for users that are excluded still contains the "user_status" capability.
For the android talk app, this caused that the conversations were not shown.
With this fix, the conversations will be loaded also if the "user_status" is mistakenly set. Additionally, the option to set the status will be hidden.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-06-15 13:45:53 +00:00
Álvaro Brey
bb7e82fbcb
Use custom permission for unfiltered broadcast receiver in CallActivity
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-06-14 15:51:04 +02:00
Andy Scherzinger
dd129b4e6c
further centralize mimetype definitions
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-10 13:13:37 +02:00
Andy Scherzinger
444ff05cf5
centralize mime type definitions
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-09 21:02:31 +02:00
Álvaro Brey
49d2f40e3f ProfileController: fix non-exhaustive when
Crashes Kotlin 1.7.0

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-06-09 17:57:01 +00:00
Andy Scherzinger
3e99dc065b
improve code base from review comments
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-09 12:03:03 +02:00
Andy Scherzinger
3d0f154d7d
simplify worker call
Co-authored-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-09 12:03:03 +02:00
Andy Scherzinger
d96ca1eb67
block selection of encrypted files as well as files that are not allowed to be re-shared
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-09 00:18:27 +02:00
Andy Scherzinger
df61a4df87
replace share files remote item chooser with new implementation and remove any legacy implementation
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-08 23:40:09 +02:00
Andy Scherzinger
41694b64bb
fix copyright year in header
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-08 18:16:37 +02:00
Andy Scherzinger
aa353f064f
fix selection on click for new implementation, move sorting dialog references to new sorting class references
... needs duplication of the layout file

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-08 18:15:39 +02:00
Andy Scherzinger
7f85a2f228
Rename ReadFilesystemOperation
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-08 18:15:39 +02:00
Andy Scherzinger
3330df3b66
rename to ReadFolderListingOperation
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-08 18:15:38 +02:00
Andy Scherzinger
4f234032aa
remove now obsolete BrowserForAvatarController
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-08 18:15:38 +02:00
Andy Scherzinger
5bf90157bc
remove legacy references and fix avatar upload permission issues
...by using a different location and remove previous avatars upfront

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-08 18:15:38 +02:00
Andy Scherzinger
80eccf3176
create narrow(er) interface for file selection
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-08 18:15:37 +02:00
Andy Scherzinger
ed09934c7a
reformat kotlin
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-08 18:15:37 +02:00
Andy Scherzinger
f2119770bc
migrate sorter classes to kotlin
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-08 18:15:37 +02:00
Andy Scherzinger
c5c52f2f6e
remove "New" suffix from classes
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-08 18:15:36 +02:00
Andy Scherzinger
c71d1da334
mark deprecated and rename legacy sort implementation
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-08 18:15:36 +02:00
Álvaro Brey
57ef995543
RemoteFileBrowser viewmodel: don't filter out root dir
The relevant operation no longer returns the current path

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-06-08 18:15:36 +02:00
Andy Scherzinger
9da5b57804
remove self path from dav result
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-08 18:15:35 +02:00
Álvaro Brey
eba697b8f2
RemoteFileBrowser: move selected paths from activity to viewmodel
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-06-08 18:15:35 +02:00
Álvaro Brey
ffdadc6c01
RemoteFileBrowser: move currentPath to viewmodel, and fix title bar
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-06-08 18:15:35 +02:00
Álvaro Brey
2fd97856d8
RemoteFileBrowser: fix file filtering and move it to viewmodel
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-06-08 18:15:34 +02:00
Álvaro Brey
9d4745ee9b
RemoteFileBrowser: do sorting in ViewModel, not activity
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-06-08 18:15:34 +02:00
Andy Scherzinger
a41d14c33a
Reimplement BrowserController with new architecture pattern
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-08 18:15:21 +02:00
Dariusz Olszewski
f1dfb00ae0 Use unique request code to make sure that a new PendingIntent gets created for each notification
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-06-07 15:43:09 +00:00
Álvaro Brey
1ee92e39dd
ChatController: fix scroll to unread messages
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-06-07 11:39:34 +02:00
Andy Scherzinger
ad60de30c6
enforce not null
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-06-03 13:38:53 +02:00
Álvaro Brey
b097e3aac4
Message search: disable feature if unified search capability not present
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-06-01 17:42:59 +02:00
Álvaro Brey
eddb90d31b
Message search: avoid passing user entity to repository, inject userProvider instead
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-06-01 16:49:20 +02:00
Álvaro Brey
c10c45630c
Fix some lint issues
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-06-01 16:49:19 +02:00
Álvaro Brey
232334efac
Fix spotbugs
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-06-01 16:49:19 +02:00
Álvaro Brey
1f00f426c7
MessageSearchActivity: don't skip viewmodel when selecting message
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-06-01 16:49:19 +02:00
Álvaro Brey
0d21ce4f17
MessageSearchActivity: add loading animation + swipe to refresh
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-06-01 16:49:19 +02:00
Álvaro Brey
dd55ab5741
Add ability to scroll to message selected in search results
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-06-01 16:49:19 +02:00
Álvaro Brey
b5d8f6ee95
Implement search in specific chat
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-06-01 16:49:19 +02:00
Álvaro Brey
d1d61e87a9
Use rxjava to debounce search instead of custom debouncer
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-06-01 16:49:19 +02:00
Álvaro Brey
b10ea2f41f
Add unit tests for MessageSearchHelper
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-06-01 16:49:19 +02:00
Álvaro Brey
1d632f3c96
Implement global message search
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-06-01 16:49:10 +02:00
Andy Scherzinger
fcf20e3362
Merge pull request #1939 from nextcloud/dependabot/gradle/org.mockito-mockito-core-4.5.1
Bump mockito-core from 3.12.4 to 4.5.1
2022-05-27 19:43:09 +02:00
Marcel Hibbe
2435d8d296
Add GenericOCS
responses contain "ocs" which was deleted by aab00c5e8f

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-27 16:02:46 +02:00
Álvaro Brey
820db1e167
Convert ShareUtils to Kotlin so no TextUtils static mock is needed in tests, and re-enable relevant tests
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-05-27 14:40:45 +02:00
Álvaro Brey
fd4b7080cc
DoNotDisturbUtils: refactor to avoid mocking static stuff
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-05-27 14:26:00 +02:00
Tim Krüger
964dc2a76d
Catch RuntimeException thrown by NotificationManager
In case anything goes wront during calling
'NotificationManger#activeNotification' an 'RuntimeException' will be
thrown. This results in a crash if not catched.

Resolves: #2078

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-05-27 12:15:09 +02:00
Marcel Hibbe
a23d4ef692 add silent call feature
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-25 09:58:57 +00:00
Álvaro Brey
1c9730f909
Fix state handling in SharedItemsActivity
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-05-23 17:35:17 +02:00
Álvaro Brey
05340fc466
SharedItems: show loading state when initially loading a tab, and clear remaining TODOs
Co-authored-by: Tim Krüger <t@timkrueger.me>
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-05-23 17:35:15 +02:00
Álvaro Brey
5310ed3f3d
SharedItems: show empty state when there are no shared items
Co-authored-by: Tim Krüger <t@timkrueger.me>
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-05-23 17:35:14 +02:00
Álvaro Brey
ae65de6cce
SharedItemsViewModel: use unified state livedata
Co-authored-by: Tim Krüger <t@timkrueger.me>
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-05-23 17:35:13 +02:00
Tim Krüger
10857114f5
Avoid NPE when 'sharedItems' is null
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-05-23 17:35:12 +02:00
Tim Krüger
e5b38856eb
Add missing license headers
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-05-23 17:35:10 +02:00
Tim Krüger
52ec1b76fa
Add comment for refactoring FileViewerUtils
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-05-23 17:35:09 +02:00
Tim Krüger
0d65824fa6
Remove 'UserEntity' from 'SharedItem' model
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-05-23 17:35:08 +02:00
Tim Krüger
6b9ab738cb
Introduce interface for 'SharedItemsRepository'
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-05-23 17:35:07 +02:00
Tim Krüger
b2f59ccb6c
Merge 'SharedItemsListAdapter' and 'SharedItemsGridAdapter'
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-05-23 17:35:06 +02:00
Tim Krüger
fd76f8231d
Move 'Shared items' related classes to own package
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-05-23 17:35:05 +02:00
Álvaro Brey
716dcfe01d
DI: Setup viewmodel injection
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-05-23 17:35:04 +02:00
Tim Krüger
6716726ff1
Move currentTab from activity to viewmodel
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-05-23 17:35:03 +02:00
Tim Krüger
36769e4fbe
Remove constand BATCH_SIZE from SharedItemsViewModel
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-05-23 17:35:02 +02:00
Tim Krüger
6a27dc7dba
Pass needed parameters during every call to repository
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-05-23 17:34:59 +02:00
Tim Krüger
577357011e
Let repository not expose API responses
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-05-23 17:34:29 +02:00
Andy Scherzinger
96711e7349
format kotlin classes
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-20 16:11:11 +02:00
Andy Scherzinger
b33a4d1265
Upgrade code to latest API changes for Emojis
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-20 16:01:49 +02:00
Andy Scherzinger
602c197dae
Update to coil 2.x API
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-20 13:38:58 +02:00
Andy Scherzinger
28e4e19917
Update Interface after updating to exoplayer 2.17.1
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-20 10:57:43 +02:00
Andy Scherzinger
6386bb05d7
remove permission LOCAL_MAC_ADDRESS need
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-19 18:21:38 +02:00
Andy Scherzinger
a5e9b8d91f
replace getColumnIndex with getColumnIndexOrThrow
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-19 12:54:55 +02:00
Andy Scherzinger
8b699963f3
replace Annotation
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-18 18:32:44 +02:00
Andy Scherzinger
0bbf14a2f0
remove obsolete sdk version check
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-18 17:29:14 +02:00
Andy Scherzinger
1230aa7773
Mark opt-in use of camera2 implementation
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-18 17:26:52 +02:00
Álvaro Brey
093af7f79d
Remove parceler annotation processor
Not needed anymore after #2061

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-05-18 15:37:55 +02:00
Andy Scherzinger
aab00c5e8f
Remove unused class
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-18 00:36:39 +02:00
Andy Scherzinger
2f84685ccc
Migrate EventOverallWebSocketMessage to kotlin data class
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-18 00:36:38 +02:00
Andy Scherzinger
36e2a81958
Migrate CallStatus enum to kotlin, parcelized enum
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-18 00:36:38 +02:00
Andy Scherzinger
2fd176366a
Migrate Parcel to Parcelize
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-18 00:36:37 +02:00
Andy Scherzinger
18d375b540
Migrate general models to kotlin data classes
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-18 00:36:37 +02:00
Andy Scherzinger
f56d7dbcbc
Migrate WebSocketMessage models to kotlin data classes
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-18 00:36:37 +02:00
Andy Scherzinger
1e4775aed0
Migrate DataChannel model to kotlin data classes
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-18 00:36:36 +02:00
Andy Scherzinger
cf568a00eb
Migrate Nc to kotlin data classes
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-18 00:36:36 +02:00
Andy Scherzinger
32a83f066f
MIgrate Signaling to kotlin data classes
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-18 00:36:35 +02:00
Andy Scherzinger
0bcc219d48
Migrate signaling settings
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-18 00:36:35 +02:00
Andy Scherzinger
66088a48ec
Migrate BrowserFile to kotlin data class
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-18 00:36:35 +02:00
Andy Scherzinger
946df9a2bc
Migrate AddParticipantOverall to kotlin data class
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-17 22:16:53 +02:00
Andy Scherzinger
e74a3e49e7
Fix enum and make it a parcel again
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-17 22:16:52 +02:00
Andy Scherzinger
9312a62af9
Migrate conversation model to kotlin data classes
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-17 22:16:52 +02:00
Andy Scherzinger
5484511d96
Migrate remaining chat models to kotlin data classes
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-17 22:16:51 +02:00
Andy Scherzinger
d683cb109a
Migrate remaining chat models to kotlin data classes
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-17 18:26:44 +02:00
Andy Scherzinger
ee67c67a33
Add Any parceler implementation
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-17 18:26:06 +02:00
Andy Scherzinger
8ed5432045
Migrate ChatMesage, Conversation and directly linked data classes to kotlin
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-17 14:42:10 +02:00
Dariusz Olszewski
d9b60eb8be
ktlint
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-05-17 13:09:03 +02:00
Dariusz Olszewski
fcf2118008
Implemented suggested design changes - first attempt
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-05-17 13:09:03 +02:00
Dariusz Olszewski
cee5564f39
Reply from notification - initial error handling
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-05-17 13:09:02 +02:00
Marcel Hibbe
7ae5413308 avoid NPE when initializing chat permission
currentConversation could have been null when opening the ChatController from notification.

hasChatPermission is now only set in
getRoomInfo

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-17 10:19:14 +00:00
drone
517d23f16f Merge commit '98d4de7c322841a77ac87d87a3db1b6bbfb983cb' 2022-05-17 09:00:07 +00:00
Andy Scherzinger
98d4de7c32
format code
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-17 10:28:53 +02:00
Marcel Hibbe
6475f28304 add silent send option
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-17 08:02:27 +00:00
Andy Scherzinger
b27096eece
Migrate ParticipantsOCS to kotlin
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-16 23:13:12 +02:00
Andy Scherzinger
67f06c8d6e
Migrate ParticipantsOCS to kotlin
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-16 23:10:30 +02:00
Andy Scherzinger
0ec07410cb
remove unused interface
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-16 23:07:02 +02:00
Andy Scherzinger
a617f10473
Migrate participant to kotlin data class
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-16 23:06:29 +02:00
Andy Scherzinger
84fea0ba80
Migrate SettingsController to kotlin + viewbinding
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-16 15:56:30 +02:00
Andy Scherzinger
de542099dc
migrate sharee classes to kotlin data classes
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-16 11:31:49 +02:00
Andy Scherzinger
199107857f
mark GenericOCS as deprecated
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-16 11:31:49 +02:00
Andy Scherzinger
4b05ed662f
move data classes away from inheritance
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-16 11:31:48 +02:00
Andy Scherzinger
90b9207b1a
migrate Status to kotlin data class
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-16 11:31:48 +02:00
Andy Scherzinger
0c824120e3
migrate generic OCS to kotlin data classes + interface
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-16 11:31:44 +02:00
Andy Scherzinger
c7ac8a3074
make bottom_sheets initial state collapsed for the rounded top corners
Resolves #2035

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-13 12:42:44 +02:00
Andy Scherzinger
dc705ccf40
fix spinner by using enabled not refresh like on the original file
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-13 11:07:40 +02:00
Andy Scherzinger
25528aded0
improve detekt score
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-13 11:07:39 +02:00
Andy Scherzinger
e1725767c3
improve ktlint score
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-13 11:07:39 +02:00
Andy Scherzinger
c52d23fabf
improve detekt score
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-13 11:07:38 +02:00
Andy Scherzinger
e6a78405ed
Migrate ContactsController to kotlin + viewbinding
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-13 11:07:38 +02:00
Dariusz Olszewski
4bb4d6870a
This setAction call seems strange and redundant
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-05-13 10:38:39 +02:00
Dariusz Olszewski
93e0751901
Additional refactoring/clean-up
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-05-13 10:38:39 +02:00
Dariusz Olszewski
d4bdd88588
Refactor - extracted common method to load avatars for notifications
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-05-13 10:38:39 +02:00
Dariusz Olszewski
3b7ca4a31a
Refactor NotificationWorker - extracted sendChatNotification method
plus some minor modifications, hopefully ;-) without changing behaviour

Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-05-13 10:38:38 +02:00
Dariusz Olszewski
2f73433170
Reduce code duplication in NotificationUtils
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-05-13 10:38:38 +02:00
Dariusz Olszewski
b96bba47b5
Reduce number of issues reported by detekt
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-05-13 10:38:37 +02:00
Dariusz Olszewski
a234c178a8
ktlint
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-05-13 10:38:37 +02:00
Dariusz Olszewski
8b07a2aa72
Reply from notification - initial implementation
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-05-13 10:38:33 +02:00
Andy Scherzinger
ffaa6388fa
Merge pull request #2016 from ASerbinski/master
TakePhotoActivity: Use full field of view
2022-05-12 23:15:46 +02:00
Marcel Hibbe
2576a696a7
avoid NPE for swipeRefreshLayout
fix #2011

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-12 15:53:14 +02:00
Marcel Hibbe
729e30d25b
use "return when" in isShowMessageDeletionButton()
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-12 14:44:33 +02:00
Marcel Hibbe
681dbfa025
allow to show "forward" option in chats with restricted permission
this reverts one condition from commit b603031. I can't think about any reason why "forward" should be hidden.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-12 14:26:25 +02:00
Marcel Hibbe
a1b7a52b24
set log level of permission checks to "warning"
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-12 13:43:44 +02:00
Marcel Hibbe
8b3d32584c
restrict to share content without permissions
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-11 17:02:57 +02:00
Marcel Hibbe
d76e833d74
fix to show share-to screen
fix to show share-to screen another time when sending was not confirmed.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-11 16:44:08 +02:00
Marcel Hibbe
7c4e7c22df
update permissions in getRoomInfo
so they are updated on the fly..

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-11 16:44:07 +02:00
Marcel Hibbe
be29459955
fix klint warnings
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-11 16:44:07 +02:00
Marcel Hibbe
b603031011
hide "reply" and "forward" when chatPermission is missing
"forward" is also hidden because this would need bigger changes regarding the state of the hasChatPermission variable inside the ChatController.kt

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-11 16:44:07 +02:00
Marcel Hibbe
96721a2df6
delete parsing of unused permissions
add getter,setter,hashCode,toString for "permissions" in Conversation.java

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-11 16:44:06 +02:00
Marcel Hibbe
36383dfcc6
don't allow to post/delete reaction without permission
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-11 16:44:06 +02:00
Marcel Hibbe
bae65ebbe9
rename canPostChatShareItemsDoReaction to hasChatPermission
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-11 16:44:06 +02:00
Marcel Hibbe
7cf18923b5
add check if delete message is allowed to be executed
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-11 16:44:06 +02:00
Marcel Hibbe
cc6f582ee2
check capability and permission to delete message
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-11 16:44:06 +02:00
Marcel Hibbe
d9d6af2b99
add util for permissions
util uses bitwise operations to access every single permission via variable

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-11 16:44:05 +02:00
Marcel Hibbe
99e9bcb0e8
add different types of permissions
add different types of permissions to Conversation.java and Participant.java (though they are not used yet)

For conversation see
https://nextcloud-talk.readthedocs.io/en/latest/conversation/#get-user-s-conversations

For Participant see
https://nextcloud-talk.readthedocs.io/en/latest/participant/#get-list-of-participants-in-a-conversation

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-11 16:44:05 +02:00
Marcel Hibbe
436c860011 disable call buttons if calls are disabled by capability
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-10 14:03:00 +00:00
Adam Serbinski
5362510d18 TakePhotoActivity: Use full field of view
Some devices have a digital video stabilization mode that uses a
smaller field of view within the full set of sensor data, and moves
the selected subset around like on rubber bands in order to reduce
shaking in video captures. Most devices default this mode to OFF,
but some, like Pixel 6 Pro, default this mode to ON, which causes
image and video captures to have a reduced field of view.

This change will have no effect on most devices, but will increase
field of view to full on those devices that do not by default.

Reference: https://issuetracker.google.com/issues/230013960

Signed-off-by: Adam Serbinski <adam@serbinski.com>
2022-05-10 08:29:30 -04:00
Andy Scherzinger
b84589a831
improve detekt score
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-09 16:51:05 +02:00
Andy Scherzinger
5a76f3a3d3
extract checks to separate methods
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-09 16:46:16 +02:00
Andy Scherzinger
c3dd263b3f
proper kotlin code formatting
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-09 16:36:38 +02:00
Andy Scherzinger
cbad775669
extract react-able message type check
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-09 16:36:38 +02:00
Andy Scherzinger
44d47bf74c
hide forward action on deleted messages
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-09 16:36:38 +02:00
Andy Scherzinger
5afb4b68cf
extract UI build logic blocks
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-09 16:36:37 +02:00
Andy Scherzinger
649d8831ac
hide reactions on deleted and command messages
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-09 16:36:34 +02:00
Andy Scherzinger
973d13f902
Merge pull request #2005 from nextcloud/bugfix/1978/fixNPEpeerConnectionWrapper
Bugfix/1978/fix npe in peerConnectionWrapper
2022-05-09 15:31:59 +02:00
Marcel Hibbe
d88c01367c
fix NPE #1977
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-09 13:19:46 +02:00
Marcel Hibbe
a1c5e942cd
reformat code
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-09 13:15:11 +02:00
Marcel Hibbe
a43a51b931
try to fix #1978
i suspect that peerConnectionFactory could have been null because e.g. "hangup()" was already called which sets it to null. Because of some async task getOrCreatePeerConnectionWrapperForSessionIdAndType might still be called afterwards and it failed because peerConnectionFactory was already null.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-09 13:00:01 +02:00
Marcel Hibbe
4414002b8a
reformat code
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-09 12:44:51 +02:00
Tim Krüger
370c51ec2d Use 'lateinit' for injected properties
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-05-07 11:21:29 +00:00
Tim Krüger
f9020dbc2b Reduce number of Detekt issues
Reduce the number of Detekt issues for the 'OperationsMenuController' by
splitting the function 'processOperation' into smaller pieces. But in
the end it is not enough, because also the now short function
'processOperation' is too complex for Detekt. Because of that the
suppress annotation is set.

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-05-07 11:21:29 +00:00
Andy Scherzinger
aebebe5410 Migrate OperationsMenuController to kotlin
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-07 11:21:29 +00:00
Andy Scherzinger
0c5429bd7b
Merge pull request #2001 from nextcloud/bugfux/1975/fixNPEforMimetype
make attributes of file nullable and handle null values
2022-05-07 12:54:56 +02:00
Marcel Hibbe
59f1f003ca
avoid NPE
trying to avoid #1976

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-06 23:48:44 +02:00
Marcel Hibbe
a5f7ecc5d8
make attributes of file nullable and handle null values
nullable attributes of files can be found at https://github.com/nextcloud/server/blob/master/lib/public/RichObjectStrings/Definitions.php#L303-L351

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-06 23:21:10 +02:00
Marcel Hibbe
30f65424a5
fix NPE for viewbinding
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-06 14:58:30 +02:00
Andy Scherzinger
6cdce6db50
Merge pull request #1928 from nextcloud/bugfix/noid/removeButterknife
remove unused butterknife binding
2022-05-06 14:39:55 +02:00
Andy Scherzinger
fafbcbd1cd
Merge pull request #1957 from nextcloud/bugfix/1956/hideReactionsForReadOnlyConversations
Hide reactions from menu if conversation is read-only
2022-05-06 14:38:15 +02:00
Andy Scherzinger
8f654937de
Always show reaction count
Resolves #1983

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-05 22:51:20 +02:00
drone
be1b075234 Merge commit 'e52b2d8b7ffbad4e4343bb6b97d40663ddc58149' 2022-05-05 11:06:39 +00:00
Tim Krüger
e52b2d8b7f
Add null checks and extract constants
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-05-05 13:06:15 +02:00
Tim Krüger
4f5a344a20
Add handling for "event.participants.update.all"
In case a moderator of a restricted room ends the call for all
participants a update participants event with the field 'all=true' will
be thrown by the HPB.

    {
      "type": "event"
      "event": {
        "target": "participants",
        "type": "update",
        "update": [
          "roomid": "the-room-id",
          "incall": new-incall-state,
          "all": true
        ]
      }
    }

In that case the call can be ended directly without handling every
single participant.

Resolves: #1881

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-05-04 13:49:04 +02:00
Tim Krüger
0c1303e0af
Fix Detekt issues in LocationPickerController
- LongMethod - 94/60 - [initMap]
- ComplexMethod - 15/10 - [initMap]
- ReturnCount - [areAllGranted]

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-05-04 11:30:17 +02:00
Tim Krüger
377e171156
Fix Detekt issues in ChatUtils
- ComplexMethod - 11/10 - [getParsedMessage]
- NestedBlockDepth - 4/4 - [getParsedMessage]

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-05-04 11:30:06 +02:00
Marcel Hibbe
d6a4e54957
fix klint
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-03 12:47:04 +02:00
Tim Krüger
8e981f04b0
Catch NPE on ServerSelection view binding
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-05-03 12:47:03 +02:00
Tim Krüger
b60de3858b
Catch NPE on Chat view binding
Resolves: #1960

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-05-03 12:47:03 +02:00
Tim Krüger
5cb36d0801
Catch NPE on Profile view binding
Resolves: #1959

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-05-03 12:47:03 +02:00
Tim Krüger
ff5f686d7c
Catch NPE on webLogin view binding
Resolves: #1958

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-05-03 12:47:03 +02:00
Marcel Hibbe
7f2b337565
fix to load conversations when servers status app is disabled
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-03 11:16:54 +02:00
Andy Scherzinger
572a212fc1
hide reactions from menu if conversation is read-only
Fixes #1956

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-02 23:01:58 +02:00
Andy Scherzinger
38146dabf0
remove unused butterknife binding
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-05-02 18:09:58 +02:00
Daniel Calviño Sánchez
3274c1e1fa
Fix typo in name of method to check if video should not be received
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2022-05-02 13:36:13 +02:00
Marcel Hibbe
d539161768
fix NumberFormatException
fix NumberFormatException for files >2,14 GB (=limit that can be represented by Int)

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-05-02 10:54:49 +02:00
Marcel Hibbe
2e54c456d1
fix klint warning
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-29 15:32:54 +02:00
Marcel Hibbe
e0d1f16106
show progress bar also when user left and re-entered the media tab screen
how to test:
1. click on file with big file size that was not clicked before (so it's not in the cache)
2. leave media tab view or just select other tab.
3. go back to the clicked file
4. --> see that progress bar is still spinning (otherwise it's already finished and a click should oen the file directly without showing the progress bar)

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-29 15:24:56 +02:00
Marcel Hibbe
734f33caba
add fallback image for mimetype if drawee request fails
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-29 14:24:14 +02:00
Tim Krüger
a64e22c820
Fix ktlin issues
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-04-29 14:09:36 +02:00
Tim Krüger
afe61b7aa1
Unify naming of shared item layouts
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-04-29 14:03:59 +02:00
Tim Krüger
58acf3edc8
Rename 'SharedItemsAdapter' to 'SharedItemsGridAdapter'
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-04-29 13:44:11 +02:00
Tim Krüger
721797c078
Hide tabs without content in shared items view
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-04-29 13:41:54 +02:00
Marcel Hibbe
b22ed7399d
fix to close media view when press back button
when starting media tab from conversation info, the back button opened media tab again. to fix this FLAG_ACTIVITY_CLEAR_TOP was set as flag

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-29 13:21:30 +02:00
Marcel Hibbe
b49a1bbbde
fix klint warnings
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-29 12:26:30 +02:00
Marcel Hibbe
a91ff9e920
make tabbar full width
improve design

hide "Other" tab

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-29 11:53:59 +02:00
Marcel Hibbe
8c20180545
show mimetype icons from DrawableUtils
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-29 11:53:59 +02:00
Marcel Hibbe
fd08ad965a
add filesize and date to listview for shared items
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-29 10:53:00 +02:00
Tim Krüger
962e43857e
Check for spreed capability "rich-object-list-media"
If the capability is not available the shared items can't shown.

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-04-29 10:04:56 +02:00
Andy Scherzinger
5c662427f8
improve detekt score
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-28 21:29:54 +02:00
Andy Scherzinger
eaab887765
refactor duplicated code
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-28 21:18:29 +02:00
Andy Scherzinger
48c7ccb4b0
improve detekt score
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-28 21:10:21 +02:00
Andy Scherzinger
f5d70dab0c
mediaItems can be null
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-28 18:36:34 +02:00
Tim Krüger
6f277cbe92
Fix new introduced SpotBugs error and warnings
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-04-28 17:57:30 +02:00
Tim Krüger
000184a338
Remove lint error for using 'Hashmap#forEach'
Call requires API level 24 (current min is 21): java.util.HashMap#forEach

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-04-28 17:37:22 +02:00
Tim Krüger
6b671191e9
Fix ktlint warning
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-04-28 17:14:10 +02:00
Tim Krüger
a322a2ad73
Load shared items while scrolling
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-04-28 17:09:26 +02:00
Marcel Hibbe
d92f5546e9
add progress bar for other items than media
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-28 15:56:23 +02:00
Marcel Hibbe
9edffc5e64
add progress bar for media items
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-28 15:42:55 +02:00