Commit graph

3251 commits

Author SHA1 Message Date
Andy Scherzinger
6e02c5de41
reformat kotlin
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-03-14 10:23:07 +01:00
Andy Scherzinger
6206e4910d
simplify complex conditions for readability
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-03-14 10:23:06 +01:00
Andy Scherzinger
454dbc5db2
unify http(s) protocoll prefix check on urls
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-03-14 10:23:06 +01:00
Andy Scherzinger
a10b67456c
ignore generic exception handling
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-03-14 10:23:05 +01:00
Andy Scherzinger
86f8f1d5cd
make constant a constant
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-03-14 10:23:05 +01:00
Andy Scherzinger
2102f0fbc8
document empty blocks
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-03-14 10:23:01 +01:00
Nextcloud Android Bot
96b9b1083c Weekly 13.1.0 Alpha 16 2022-03-14 03:26:18 +00:00
Nextcloud bot
72cc5d0050
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-03-13 03:59:40 +00:00
Andy Scherzinger
874edc7eec
Merge pull request #1859 from nextcloud/dependabot/gradle/com.github.nextcloud-ChatKit-0.3.0-1
Bump ChatKit from c6a6176729 to 0.3.0-1
2022-03-11 17:44:06 +01:00
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