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

4735 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andy Scherzinger
fd727322ac
Merge pull request #2222 from nextcloud/chore/1549/roomMigration4 
Migrate further areas to room
 2022-07-18 19:29:35 +02:00
Andy Scherzinger
165f2ffa28
Merge pull request #2226 from nextcloud/updateChangelogFor14.1.0 
update changelog for 14.1.0
 2022-07-18 19:01:35 +02: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
drone
8385def3ed
Drone: update FindBugs results to reflect reduced error/warning count [skip ci] 
Signed-off-by: drone <drone@nextcloud.com>
 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
74fbd3feeb
Merge pull request #2224 from nextcloud/dependabot/gradle/io.gitlab.arturbosch.detekt-detekt-gradle-plugin-1.21.0 
Bump detekt-gradle-plugin from 1.20.0 to 1.21.0
 2022-07-18 18:52:24 +02:00
Marcel Hibbe
5bd499f719
update changelog for 14.1.0 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2022-07-18 16:13:27 +02:00
dependabot[bot]
0ad49989a3
Bump detekt-formatting from 1.20.0 to 1.21.0 
Bumps [detekt-formatting](https://github.com/detekt/detekt) from 1.20.0 to 1.21.0.
- [Release notes](https://github.com/detekt/detekt/releases)
- [Commits](https://github.com/detekt/detekt/compare/v1.20.0...v1.21.0)

---
updated-dependencies:
- dependency-name: io.gitlab.arturbosch.detekt:detekt-formatting
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-18 14:20:44 +02:00
Nextcloud bot
17a48826d3
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-18 04:12:11 +00:00
Nextcloud Android Bot
689f5c8ecf Weekly 14.2.0 Alpha 03 2022-07-18 03:12:43 +00:00
dependabot[bot]
05bb51b47d
Bump detekt-gradle-plugin from 1.20.0 to 1.21.0 
Bumps [detekt-gradle-plugin](https://github.com/detekt/detekt) from 1.20.0 to 1.21.0.
- [Release notes](https://github.com/detekt/detekt/releases)
- [Commits](https://github.com/detekt/detekt/compare/v1.20.0...v1.21.0)

---
updated-dependencies:
- dependency-name: io.gitlab.arturbosch.detekt:detekt-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-18 01:33:38 +00:00
Nextcloud bot
489928904d
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-17 04:13:13 +00:00
Andy Scherzinger
26ce9ee868
Merge pull request #2221 from nextcloud/chore/1549/roomMigration3 
Migrate contacts and creation of talk rooms from requery to room
 2022-07-16 16:30:14 +02:00
drone
2821d84226 Drone: update FindBugs results to reflect reduced error/warning count [skip ci] 
Signed-off-by: drone <drone@nextcloud.com>
 2022-07-16 14:11:12 +00: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
1c672c04e3
Merge pull request #2219 from nextcloud/chore/1549/roomMigration2 
Migrate calls and used classes/methods from requery to room
 2022-07-16 15:15:33 +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
Nextcloud bot
a743e32cbb
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-16 04:13:29 +00: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