Commit graph

3292 commits

Author SHA1 Message Date
Tim Krueger
08dc22c30f
Merge pull request #1841 from nextcloud/bugfix/1839/fail-to-set-empty-status-message
Bugfix/1839/fail to set empty status message
2022-03-11 15:33:58 +01:00
Tim Krüger
cb1dd8e5b5
Avoid empty status message
Enable the 'Set status message' button only if a message is set.
Currently the API don't allow us to set an empty message [1].

See:
  [1] nextcloud/server#31452
  #1839

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-03-10 17:08:02 +01:00
Tim Krüger
f8e8a95b34
Use '==' instead of 'equals' in Kotlin
In Kotlin for a check of the structural equality '==' should be used.
Referential equality is checked with '==='.

See:
 - https://kotlinlang.org/docs/equality.html

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-03-10 17:05:14 +01:00
Nextcloud bot
af09675d9d
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-03-10 04:06:00 +00:00
Tim Krueger
70a30f146a
Merge pull request #1851 from nextcloud/bugfix/1848/showSystemMessageAddedGroup
add groups and circles to system messages ("add"+"remove")
2022-03-09 10:37:19 +01:00
dependabot[bot]
298ae2d029
Bump ChatKit from c6a6176729 to 0.3.0-1
Bumps ChatKit from c6a6176729 to 0.3.0-1.

---
updated-dependencies:
- dependency-name: com.github.nextcloud:ChatKit
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-08 02:06:04 +00:00
Andy Scherzinger
0fe562d415
remove unused method parameters
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-03-07 13:40:42 +01:00
Tim Krüger
5ad6da86f1
Use Boolean constant values directly
From the SpotBugs report:

> NAB_NEEDLESS_BOOLEAN_CONSTANT_CONVERSION: Method needlessly boxes a boolean
> constant
>
> This method assigns a Boxed boolean constant to a primitive boolean variable,
> or assigns a primitive boolean constant to a Boxed boolean variable. Use the
> correct constant for the variable desired. Use
>
>
> boolean b = true;
> boolean b = false;
>
> or
>
>
> Boolean b = Boolean.TRUE;
> Boolean b = Boolean.FALSE;
>
> Be aware that this boxing happens automatically when you might not expect it.
> For example,
>
>
> Map statusMap = ...
>
> public Boolean someMethod() {
>     statusMap.put("foo", true);  //the "true" here is boxed
>     return false;  //the "false" here is boxed
> }
>
> has two cases of this needless autoboxing. This can be made more efficient by
> simply substituting in the constant values:
>
>
> Map statusMap = ...
>
> public Boolean someMethod() {
>     statusMap.put("foo", Boolean.TRUE);
>     return Boolean.FALSE;
> }

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-03-07 13:11:23 +01:00
Andy Scherzinger
8e11f21233
adapt to java->kotlin changes regarding null-ability
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-03-07 09:55:30 +01:00
Andy Scherzinger
15e875f974
Migrate push models to kotlin data classes
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-03-07 09:50:19 +01:00
Andy Scherzinger
72569cf2fd
Merge pull request #1855 from nextcloud/dependabot/gradle/com.fasterxml.jackson.core-jackson-core-2.13.2
Bump jackson-core from 2.13.1 to 2.13.2
2022-03-07 09:49:49 +01:00
Nextcloud Android Bot
35e2c7e857 Weekly 13.1.0 Alpha 15 2022-03-07 03:13:49 +00:00
dependabot[bot]
3284cecb38
Bump jackson-core from 2.13.1 to 2.13.2
Bumps [jackson-core](https://github.com/FasterXML/jackson-core) from 2.13.1 to 2.13.2.
- [Release notes](https://github.com/FasterXML/jackson-core/releases)
- [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.13.1...jackson-core-2.13.2)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-07 02:08:30 +00:00
Nextcloud bot
d327e7e738
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-03-06 03:58:18 +00:00
Nextcloud bot
5faa31600e
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-03-05 03:57:56 +00:00
Marcel Hibbe
a1e694104c
add groups and circles to system messages ("add"+"remove")
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-03-04 14:58:46 +01:00
Marcel Hibbe
0079107461
revert commit d76203a0
fix to support older conversationApi versions for canLeave and canDelete

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-03-04 09:23:42 +01:00
Marcel Hibbe
86caa48636
add logging for onError
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-03-04 09:23:41 +01:00
Nextcloud bot
8d208c5d61
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-03-04 03:59:30 +00:00
Andy Scherzinger
aa2a08692f
migrate statuses overall to kotlin data classes
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-03-03 18:00:53 +01:00
Andy Scherzinger
2008fb0c2a
migrate remaining status models to kotlin
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-03-03 12:50:58 +01:00
Nextcloud bot
6dee8cc4e8
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-03-03 03:59:16 +00:00
Marcel Hibbe
508f519468
set fixed avatar sizes for requests
necessary because of https://github.com/nextcloud/server/pull/31010

known issue: avatars in chat messages are too big atm

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-03-02 15:15:22 +01:00
Andy Scherzinger
00c4b13f17
don't resize avatar views dynamically
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-03-02 14:33:53 +01:00
Tim Krüger
3411728597
Pass 'null' for unset icon in custom status message
The OCS Status API  expect an valid emoji or 'null' for the status icon
in a custom message:

> field: statusIcon
> type: string/null
> Description: The icon picked by the user (must be an emoji, at most one)

See [1] for more details.

Resolves: #1839
See:
 [1] https://docs.nextcloud.com/server/latest/developer_manual/client_apis/OCS/ocs-status-api.html#set-a-custom-message-user-defined

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-03-02 09:50:08 +01:00
Nextcloud bot
98a2a62cbf
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-03-02 04:21:28 +00:00
Dariusz Olszewski
93556da33a
Re-use existing ChatController from notification
NotificationWorker provides the user information under KEY_USER_ENTITY parameter of the notification intent, but does not set the KEY_INTERNAL_USER_ID parameter.
With this change existing ChatController instance that has been opened manually from the conversation list is properly reused when a notification is opened.
Otherwise two instances of the ChatController were running in parallel for the same room, causing unintended side effects.

Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-03-01 13:19:18 +01:00
Dariusz Olszewski
c95d286de4
ktlint
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-03-01 13:19:18 +01:00
Dariusz Olszewski
a7bd6393df
Prevent overlapping pullChatMessages calls
Sometimes pullChatMessages may be called before response to a previous call is received.
In such cases just ignore the second call. Message processing will continue when response to the earlier call is received.

Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-03-01 13:19:18 +01:00
Dariusz Olszewski
b2aef87b24
Re-organize sessionId handling
- clean session Id when leaving the room rather than in onAttach
- invoke leaveRoom in onDetach only when we have a valid sessionId
This avoid calling joinRoom twice in some scenarios, or calling leaveRoom before joinRoom completes successfully.

Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-03-01 13:19:17 +01:00
Dariusz Olszewski
d31e6de5c4
Second attempt to fix the issue
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-03-01 13:19:17 +01:00
Dariusz Olszewski
d064ad3f65
Simplified code to avoid NullPointerException when server response arrives after the view was unbound.
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-03-01 13:19:17 +01:00
Dariusz Olszewski
606c6b0b9e
Avoid NullPointerException when server response arrives after the view was unbound.
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-03-01 13:19:17 +01:00
Dariusz Olszewski
505bcdfe20
Yet more diagnostic logging
Also in ConversationsListController

Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-03-01 13:19:16 +01:00
Dariusz Olszewski
cfcfcf5bc4
Even more diagnostic logging
Info to correlate calls and responses
Log errors

Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-03-01 13:19:16 +01:00
Dariusz Olszewski
b88530da6f
More diagnostic logging
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-03-01 13:19:16 +01:00
Dariusz Olszewski
b10d0cb98a
Revert "Notifications from lock screen - initial attempt to fix the issue"
This reverts commit ce8bec73

Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-03-01 13:19:16 +01:00
Dariusz Olszewski
dfa14e7c52
Notifications from lock screen - initial attempt to fix the issue
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-03-01 13:19:15 +01:00
Dariusz Olszewski
be6e5d78cb
Additional logging to diagnose opening chat view from notification
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-03-01 13:19:14 +01:00
Andy Scherzinger
b750f41efd
kotlin code foermatting
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-03-01 10:21:09 +01:00
Andy Scherzinger
243e6161a6
Migrate AccountVerificationController to kotlin
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-02-28 18:25:53 +01:00
Andy Scherzinger
f76d25974e
migrate EntryMenuController to Kotlin
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-02-28 17:21:06 +01:00
Tim Krüger
45085b7e0b
Remove Parceler from model notifications
Resolves: #1548

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-02-28 16:54:24 +01:00
Tim Krüger
d9587e9d18
Remove Parceler from model mention
Resolves: #1548

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-02-28 16:54:24 +01:00
Tim Krüger
003d4c6af2
Remove unneeded not-null assertion operator (!!)
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-02-28 16:54:23 +01:00
Tim Krüger
94f2339baa
Remove unneeded package definition
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-02-28 16:54:23 +01:00
Tim Krüger
9f62df3a53
Suppress lint for unused result
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-02-28 16:54:22 +01:00
Tim Krüger
dad4f56e6a
Remove Parceler from model hovercard
Resolves: #1548

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-02-28 16:54:22 +01:00
Andy Scherzinger
9b8e145e7b
remove unused layouts and its strings
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-02-28 14:38:22 +01:00
Andy Scherzinger
18f180bfe7
rename UserItem to ContactsItem to reflect its use case
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-02-28 13:26:40 +01:00
Andy Scherzinger
da39d12a7f
remove unneeded null checks
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-02-28 13:23:35 +01:00
Andy Scherzinger
92a2c44415
remove unused classes
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-02-28 13:23:10 +01:00
Andy Scherzinger
76270077a1
migrate view items to native view bindings
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-02-28 09:52:49 +01:00
Andy Scherzinger
7374176083
remove unused getter
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-02-28 09:52:48 +01:00
Andy Scherzinger
f47690db22
use seperate xml designs for Items (+use viewbinding)
Resolves #1829

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-02-28 09:52:45 +01:00
Nextcloud bot
7227347339
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-02-28 04:17:36 +00:00
Nextcloud Android Bot
515a87e6d1 Weekly 13.1.0 Alpha 14 2022-02-28 03:16:02 +00:00
Nextcloud bot
573fd63b7c
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-02-27 03:56:40 +00:00
Nextcloud bot
5d2e6ba6ae
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-02-26 03:57:18 +00:00
Marcel Hibbe
9d29cbf9cd
fix vertical alignments for UserItem
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:28:33 +01:00
Andy Scherzinger
5c86629b53
fix license header mail format
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-02-25 12:25:52 +01:00
Andy Scherzinger
a3e86d841f
correct enum comparisons and add constants for fixed values
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-02-25 12:23:56 +01:00
Marcel Hibbe
0dc42a1b1e
fix NPE if status is null
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:46 +01:00
Andy Scherzinger
7ce1b9e916
adapt license header to app
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-02-25 12:11:46 +01:00
Andy Scherzinger
0677607dc4
migrate FlexibleItems to native view bindings
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-02-25 12:11:46 +01:00
Marcel Hibbe
d4f9f996c3
fix vertical alignment for MentionAutocompleteItem's
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:46 +01:00
Marcel Hibbe
ec438b0a9d
add rounded colors to online status buttons
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:45 +01:00
Marcel Hibbe
e1c706fe68
align icons + text in choose account dialog
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:45 +01:00
Marcel Hibbe
4984ba4dde
avoid linebreaks for "clear at" calculation
because:
- can lead to wrong calculations!

- avoid klint complaining about indentation

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:45 +01:00
Marcel Hibbe
f475065a7f
set same textSize for all headings in Status dialog
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:45 +01:00
Marcel Hibbe
b7b92eb623
fix textcolor for highlighted online status button
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:45 +01:00
Marcel Hibbe
305ceedc75
align username etc vertical if no status message is set
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:44 +01:00
Marcel Hibbe
c746b95ac2
add author to license headers
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:44 +01:00
Marcel Hibbe
a7792cb66e
fix lint and spotbugs warnings
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:44 +01:00
Marcel Hibbe
ce002318a2
fix NPE for contacts view
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:44 +01:00
Marcel Hibbe
fc8462e0a5
use StatusDrawable for conversationInfo and mention autocomplete
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:44 +01:00
Marcel Hibbe
5437466b75
use same online state color as web and iOS
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:43 +01:00
Marcel Hibbe
1da8c3b206
modify StatusDrawable and use it for conversationList
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:43 +01:00
Marcel Hibbe
73ce2716de
fix klint warnings
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:43 +01:00
Marcel Hibbe
4f1a188a38
fix lint/spotbug warnings
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:43 +01:00
Marcel Hibbe
4c07ccec11
fix NPE when opening Contacts view.
because UserItem is used for ContactsController and ConversationInfoController it differs between two different xml designs in method getLayoutRes()
because of this there need to be checks which xml element exists or not. These are added with this commit.

In the long term UserItem should not use two different xml designs. This might also be a problem for view binding?!

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:43 +01:00
Marcel Hibbe
7820bc7c51
hide status of "Talk updates" conversation
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:43 +01:00
Marcel Hibbe
452baf4550
improve autocomplete mentions UI
add status message and emoji
match parent
improve design
use rv_item_mention_conversation_info_participant instead of rv_item_mention.xml

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:42 +01:00
Marcel Hibbe
02bd95ffad
improve autocomplete mention items design
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:42 +01:00
Marcel Hibbe
0078778c99
show status for autocomplete mentions
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:42 +01:00
Marcel Hibbe
6a9dea7522
fix autocomplete mentions
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:42 +01:00
Marcel Hibbe
e94cb3b9ac
allow 2 lines for status message in conversation info
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:42 +01:00
Marcel Hibbe
e3fd9a7592
fix onlinestatus color for night mode
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:41 +01:00
Marcel Hibbe
ffbe39bd01
change UserStatusCapability to kotlin data class
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:41 +01:00
Marcel Hibbe
21af8381b0
hide secondary text for normal users
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:41 +01:00
Marcel Hibbe
c64a71b6c1
improve layout
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:41 +01:00
Marcel Hibbe
22c770fa8a
set "away" / "dnd" as status message if it's empty
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:41 +01:00
Marcel Hibbe
176568b628
show online status AND emoji in conversations info
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:40 +01:00
Marcel Hibbe
d453773a1d
show user statuses in conversation info (wip)
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:40 +01:00
Marcel Hibbe
6057306ab3
show user statuses in conversation list
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:40 +01:00
Marcel Hibbe
e27ede75ff
tidy up
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:40 +01:00
Marcel Hibbe
546f3fe1f2
fix to be able to set only "icon" / only "clear at" for status
api seems to set single modification for icon or "clear at" only if status message is not empty (must be at least whitespace)

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:40 +01:00
Marcel Hibbe
bce0d276f3
fix to be able to modify status message after predefined status was selected
so api to set a predefined status is not used at all..

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:40 +01:00
Marcel Hibbe
c87940e115
fix seperator color for in account dialog
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:39 +01:00
Marcel Hibbe
ea634ff43c
delete comments
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-02-25 12:11:39 +01:00