mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-24 22:15:41 +03:00
Code Issues Projects Releases Packages Wiki Activity
4711 commits 93 branches 407 tags 64 MiB
Commit graph

4711 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andy Scherzinger
75aa5c9379
reformat code 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2022-07-16 14:33:55 +02:00
drone
ca2f65f0a6 Drone: update FindBugs results to reflect reduced error/warning count [skip ci] 
Signed-off-by: drone <drone@nextcloud.com>
 2022-07-14 16:45:02 +00: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
5e934f496d
Merge pull request #2215 from nextcloud/bugfix/2181/wrongConversationTitle 
fix switching conversation titles
 2022-07-14 11:00:07 +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
Nextcloud bot
e682d30369
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-14 04:13:41 +00:00
Andy Scherzinger
eb3cebab1b
Merge pull request #2189 from nextcloud/chore/1549/roomMigration1 
Room migration - Part 1
 2022-07-13 16:12:51 +02:00
drone
ecd67af2c3 Drone: update FindBugs results to reflect reduced error/warning count [skip ci] 
Signed-off-by: drone <drone@nextcloud.com>
 2022-07-12 22:33:06 +00: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
fb33b1c52d
add flag for mockito tests with Rx 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2022-07-13 00:22:24 +02:00
drone
e8d2208e42
Drone: update FindBugs results to reflect reduced error/warning count [skip ci] 
Signed-off-by: drone <drone@nextcloud.com>
 2022-07-13 00:22:23 +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
drone
f5fce7c9c9 Drone: update FindBugs results to reflect reduced error/warning count [skip ci] 
Signed-off-by: drone <drone@nextcloud.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
Marcel Hibbe
8bdf316442
Merge pull request #2211 from nextcloud/fix/noid/private_permission_appid 
Make private broadcast permission depend on applicationId
 2022-07-12 13:36:20 +02: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
ff0409ada4
Merge pull request #2207 from nextcloud/bugfix/2203/fixNpeEmojiClickListenerBinding 
fix NPE for binding in onEmojiClickListener
 2022-07-11 19:40:00 +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
981b64c9b7
Merge pull request #2205 from nextcloud/bugfix/2204/fixSetStatusWhileInCall 
fix crash when changing status during call
 2022-07-11 19:22:04 +02: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
Nextcloud Android Bot
2615da0121 Weekly 14.2.0 Alpha 02 2022-07-11 03:20:58 +00:00
Nextcloud bot
9bf2a7c3a1
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-10 04:15:26 +00:00
Nextcloud bot
ed8ca611ca
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-09 04:13:07 +00:00
Nextcloud bot
559537d6be
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-08 04:14:42 +00:00
Andy Scherzinger
7d20b76963
Merge pull request #2176 from nextcloud/chore/disposable-set 
Introduce DisposableSet to handle multiple disposables at once
 2022-07-07 18:09:41 +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
5b1b5b4d3a
Merge pull request #2192 from nextcloud/dependabot/gradle/kotlinVersion-1.7.10 
Bump kotlinVersion from 1.7.0 to 1.7.10
 2022-07-07 16:16:26 +02:00
Andy Scherzinger
5423ed231f
Merge pull request #2193 from nextcloud/bugfix/2180/notificationUser 
Read matching user context
 2022-07-07 16:14:38 +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
Andy Scherzinger
1577a99567
Merge pull request #2172 from nextcloud/feature/788/upload-avatar-from-camera 
Upload profile picture from camera
 2022-07-07 13:56:56 +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