3887 commits

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	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
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	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
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
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
Á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	4ad8957e6c	Bump androidx.camera from 1.1.0-rc02 to 1.1.0 ... Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>	2022-07-06 22:41:18 +02:00
Andy Scherzinger	6725545bad	unify lifecycle version and bump to 2.5.0 ... Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>	2022-07-05 12:45:08 +02:00
dependabot[bot]	7e370ee61d	Bump lifecycle-runtime-ktx from 2.2.0 to 2.5.0 ... Bumps lifecycle-runtime-ktx from 2.2.0 to 2.5.0. --- updated-dependencies: - dependency-name: androidx.lifecycle:lifecycle-runtime-ktx dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-07-05 12:08:13 +02:00
dependabot[bot]	f3a8e896ab	Bump roomVersion from 2.2.5 to 2.4.2 ... Bumps `roomVersion` from 2.2.5 to 2.4.2. Updates `room-runtime` from 2.2.5 to 2.4.2 Updates `room-rxjava2` from 2.2.5 to 2.4.2 Updates `room-compiler` from 2.2.5 to 2.4.2 Updates `room-ktx` from 2.2.5 to 2.4.2 --- updated-dependencies: - dependency-name: androidx.room:room-runtime dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: androidx.room:room-rxjava2 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: androidx.room:room-compiler dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: androidx.room:room-ktx dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-07-04 20:48:49 +00:00
Andy Scherzinger	ba1c075df3	bump master to 14.2.0 Alpha 1 ... Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>	2022-07-04 22:45:40 +02:00
Nextcloud bot	9a2ffbced2	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-07-04 04:13:07 +00:00
Nextcloud Android Bot	b42c567249	Weekly 14.1.0 Alpha 12	2022-07-04 03:18:07 +00:00
Nextcloud bot	ab5c8c24c9	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-07-03 04:08:26 +00: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