Commit graph

4309 commits

Author SHA1 Message Date
Andy Scherzinger
53bdd951ad
Add deck icon
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-09 23:24:27 +02:00
Tim Krüger
aae7e851c9
Reduce number of return statements
Codacy reported:

  Function itemFromObject has 4 return statements which exceeds the limit of 2.

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-08-09 18:48:25 +02:00
Tim Krüger
43f2d1badf
Shared items: Add tab for deck cards
Deck cards will be opened in the web browser because no specific view
exists.

Resolves: #2029

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-08-09 18:26:48 +02:00
Tim Krüger
4c8c8ac98a
Shared items: Show actor and date-time
For all item types it will now shown who (actor) and when (date-time)
the item was shared.

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-08-09 18:09:54 +02:00
drone
ed0e9c2374 Merge commit '81a3e8216dd947abfe1038a5ab040f9c67d3a62b' 2022-08-09 12:00:54 +00:00
Tim Krüger
81a3e8216d
Shared items: Add tab for other
Resolves: #2029

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-08-09 14:00:00 +02:00
Nextcloud bot
fa91ba4691
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-08-09 04:14:40 +00:00
Tim Krüger
26fde13292
Shared items: Add tab for locations
Resolves: #2029

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-08-08 18:52:11 +02:00
Tim Krüger
d5214ee29c
Replace '@JvmField' with 'lateinit'
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-08-08 18:52:11 +02:00
Tim Krüger
00f06c6ef2
Shared items: Add tab for polls
Resolves: #2029

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-08-08 18:51:56 +02:00
Nextcloud bot
f572cfc08f
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-08-08 04:12:02 +00:00
Nextcloud Android Bot
846124d68b Weekly 14.2.0 Alpha 06 2022-08-08 03:16:21 +00:00
Nextcloud bot
e074b82745
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-08-07 04:16:42 +00:00
Nextcloud bot
1ce8173e8b
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-08-06 04:14:36 +00:00
Andy Scherzinger
9fc7182790
Migrate to updated popup bubble
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-05 16:40:59 +02:00
dependabot[bot]
efaf576168
Bump PopupBubble from 1.0.6 to 2.0.0
Bumps [PopupBubble](https://github.com/nextcloud/PopupBubble) from 1.0.6 to 2.0.0.
- [Release notes](https://github.com/nextcloud/PopupBubble/releases)
- [Commits](https://github.com/nextcloud/PopupBubble/compare/1.0.6...2.0.0)

---
updated-dependencies:
- dependency-name: com.github.nextcloud:PopupBubble
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-05 16:40:59 +02:00
Andy Scherzinger
9df00a8562
make equals null-safe in case no status set
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-05 16:17:04 +02:00
Tim Krüger
32235632c8
Merge pull request #2275 from nextcloud/dependabot/gradle/com.google.firebase-firebase-messaging-23.0.7
Bump firebase-messaging from 23.0.6 to 23.0.7
2022-08-05 12:01:07 +02:00
Tim Krüger
a906e2c244
Merge pull request #2277 from nextcloud/feature/2265/i18n-singular-and-plural
Use singular and plural for vote(s) string
2022-08-05 11:42:25 +02:00
Nextcloud bot
f3e4d89eed
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-08-05 09:03:35 +00:00
Tim Krüger
84f2cf432c
Use singular and plural for vote(s) string
Resolves: #2265

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-08-05 10:27:03 +02:00
dependabot[bot]
6115eb3b24
Bump firebase-messaging from 23.0.6 to 23.0.7
Bumps firebase-messaging from 23.0.6 to 23.0.7.

---
updated-dependencies:
- dependency-name: com.google.firebase:firebase-messaging
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-05 01:17:09 +00:00
Andy Scherzinger
23e3f323f7
Merge pull request #2267 from nextcloud/fixStatusVisibility
Fix status visibility in conversation list
2022-08-04 13:57:45 +02:00
Andy Scherzinger
39ff4cd624
Merge pull request #2271 from nextcloud/dependabot/gradle/net.zetetic-android-database-sqlcipher-4.5.2
Bump android-database-sqlcipher from 4.5.1 to 4.5.2
2022-08-04 13:56:13 +02:00
Andy Scherzinger
3ca3f35e3e
Update app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java
Co-authored-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-04 12:29:24 +02:00
dependabot[bot]
a916ba2189
Bump android-database-sqlcipher from 4.5.1 to 4.5.2
Bumps [android-database-sqlcipher](https://github.com/sqlcipher/android-database-sqlcipher) from 4.5.1 to 4.5.2.
- [Release notes](https://github.com/sqlcipher/android-database-sqlcipher/releases)
- [Commits](https://github.com/sqlcipher/android-database-sqlcipher/compare/v4.5.1...v4.5.2)

---
updated-dependencies:
- dependency-name: net.zetetic:android-database-sqlcipher
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-04 01:06:49 +00:00
dependabot[bot]
9137fca218
Bump daggerVersion from 2.43.1 to 2.43.2
Bumps `daggerVersion` from 2.43.1 to 2.43.2.

Updates `dagger` from 2.43.1 to 2.43.2
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.43.1...dagger-2.43.2)

Updates `dagger-compiler` from 2.43.1 to 2.43.2
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.43.1...dagger-2.43.2)

---
updated-dependencies:
- dependency-name: com.google.dagger:dagger
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger-compiler
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-04 01:06:37 +00:00
tobiasKaminsky
d1e474e402
Fix status visibility in conversation list
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2022-08-03 08:24:10 +02:00
Valdnet
518b3f5a5e
i18n: Spelling unification
Spelling unification in Transifex.

Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>

Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
2022-08-02 11:25:39 +02:00
Andy Scherzinger
ba83552be8
fix button positioning
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-01 13:43:06 +02:00
Andy Scherzinger
0a3e0230c9
fix avatar voter border
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-01 13:43:05 +02:00
Andy Scherzinger
bb822aa1a4
Change vote submitting string
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-01 13:43:05 +02:00
Andy Scherzinger
09ddc86c40
Optimize layout and make it accessible
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-01 13:43:05 +02:00
Andy Scherzinger
14d827c88a
Dialogs have a 24dp outer spacing
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-01 13:43:05 +02:00
Andy Scherzinger
a70ef7b572
Question field should be focused directly
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-01 13:43:05 +02:00
Andy Scherzinger
bcffc3b96f
Bar color should be primary instead of muted different tone
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-01 13:43:04 +02:00
Andy Scherzinger
e767d08755
make "End poll" a tertiary-action styled button
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-01 13:43:04 +02:00
Andy Scherzinger
5bae24213e
pin button sizes to min clickable size
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-01 13:43:04 +02:00
Andy Scherzinger
bb425ef759
improve poll creating element sizes
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-08-01 13:43:00 +02:00
Andy Scherzinger
b2d01d37db
Merge pull request #2263 from nextcloud/dependabot/gradle/daggerVersion-2.43.1
Bump daggerVersion from 2.43 to 2.43.1
2022-08-01 10:06:01 +02:00
Andy Scherzinger
844a402d90
Merge pull request #2264 from nextcloud/dependabot/gradle/com.google.code.gson-gson-2.9.1
Bump gson from 2.9.0 to 2.9.1
2022-08-01 10:05:19 +02:00
Nextcloud Android Bot
5a65af25ca Weekly 14.2.0 Alpha 05 2022-08-01 03:13:32 +00:00
dependabot[bot]
dcd0df7a37
Bump gson from 2.9.0 to 2.9.1
Bumps [gson](https://github.com/google/gson) from 2.9.0 to 2.9.1.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.9.0...gson-parent-2.9.1)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-01 01:36:18 +00:00
dependabot[bot]
25b9a27e25
Bump daggerVersion from 2.43 to 2.43.1
Bumps `daggerVersion` from 2.43 to 2.43.1.

Updates `dagger` from 2.43 to 2.43.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.43...dagger-2.43.1)

Updates `dagger-compiler` from 2.43 to 2.43.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.43...dagger-2.43.1)

---
updated-dependencies:
- dependency-name: com.google.dagger:dagger
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger-compiler
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-01 01:36:09 +00:00
dependabot[bot]
9f123d104b
Bump conductor from 3.1.6 to 3.1.7
Bumps [conductor](https://github.com/bluelinelabs/Conductor) from 3.1.6 to 3.1.7.
- [Release notes](https://github.com/bluelinelabs/Conductor/releases)
- [Commits](https://github.com/bluelinelabs/Conductor/compare/3.1.6...3.1.7)

---
updated-dependencies:
- dependency-name: com.bluelinelabs:conductor
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-29 01:05:30 +00:00
Andy Scherzinger
db52134053
Merge pull request #2254 from nextcloud/feature/noid/newVideoIcon
update video icon in line with files client
2022-07-28 14:32:47 +02:00
Andy Scherzinger
6a7ed4422d
update video icon in line with files client https://github.com/nextcloud/android/pull/10563
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-28 14:05:55 +02:00
dependabot[bot]
93cf6ebe79
Bump lifecycleVersion from 2.5.0 to 2.5.1
Bumps `lifecycleVersion` from 2.5.0 to 2.5.1.

Updates `lifecycle-runtime-ktx` from 2.5.0 to 2.5.1

Updates `lifecycle-livedata-ktx` from 2.5.0 to 2.5.1

Updates `lifecycle-viewmodel-ktx` from 2.5.0 to 2.5.1

---
updated-dependencies:
- dependency-name: androidx.lifecycle:lifecycle-runtime-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.lifecycle:lifecycle-livedata-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.lifecycle:lifecycle-viewmodel-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-28 12:56:46 +02:00
dependabot[bot]
bd4c7039be
Bump roomVersion from 2.4.2 to 2.4.3
Bumps `roomVersion` from 2.4.2 to 2.4.3.

Updates `room-runtime` from 2.4.2 to 2.4.3

Updates `room-rxjava2` from 2.4.2 to 2.4.3

Updates `room-compiler` from 2.4.2 to 2.4.3

Updates `room-ktx` from 2.4.2 to 2.4.3

---
updated-dependencies:
- dependency-name: androidx.room:room-runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.room:room-rxjava2
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.room:room-compiler
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.room:room-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-28 01:12:03 +00:00
Andy Scherzinger
441c321e6a
Merge pull request #2251 from nextcloud/chore/noid/roomCleanup
Persistence cleanup
2022-07-27 09:15:41 +02:00
Nextcloud bot
ee2d94c7d3
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-07-27 03:49:45 +00:00
Andy Scherzinger
d999815ffa
remove unused java imports
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-26 22:24:18 +02:00
Andy Scherzinger
9b48bfedf6
remove unused imports
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-26 22:13:06 +02:00
Andy Scherzinger
12011afb17
migrate detekt report definition
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-26 22:05:17 +02:00
Andy Scherzinger
f951336d0d
remove unused persistence methods
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-26 21:55:03 +02:00
Andy Scherzinger
66b2d44739
finish migration to room: remove requery
Resolves #2244

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-26 21:16:38 +02:00
Andy Scherzinger
125d6770b4
plug cipher migration hook into room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-26 20:33:47 +02:00
Andy Scherzinger
9325e3f3f0
Merge pull request #2248 from nextcloud/dependabot/gradle/com.bluelinelabs-conductor-3.1.6
Bump conductor from 3.1.5 to 3.1.6
2022-07-26 13:25:48 +02:00
Nextcloud bot
52166101c4
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-07-26 04:14:42 +00:00
dependabot[bot]
2c12295b79
Bump conductor from 3.1.5 to 3.1.6
Bumps [conductor](https://github.com/bluelinelabs/Conductor) from 3.1.5 to 3.1.6.
- [Release notes](https://github.com/bluelinelabs/Conductor/releases)
- [Commits](https://github.com/bluelinelabs/Conductor/compare/3.1.5...3.1.6)

---
updated-dependencies:
- dependency-name: com.bluelinelabs:conductor
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-26 01:11:42 +00:00
Andy Scherzinger
520dbdbdec
organize imports
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-25 10:59:08 +02:00
Nextcloud Android Bot
bd9cd76b46 Weekly 14.2.0 Alpha 04 2022-07-25 03:18:12 +00:00
Andy Scherzinger
9ab4c58b41
remove all legacy code except basic requery implementation still needed for the cypher upgrade
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-24 14:19:20 +02:00
Andy Scherzinger
99049e01d7
remove all methods of legacy arbitrary storage persistence
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-24 13:41:35 +02:00
Andy Scherzinger
b5040f2d55
Migrate ArbitraryStorageUtils to ArbitraryStorageManager use
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-24 13:41:34 +02:00
Nextcloud bot
291eee5a1e
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-07-24 04:15:25 +00:00
Andy Scherzinger
5c6fe628f1
Migrate ArbitraryStorageUtils to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 18:40:32 +02:00
Andy Scherzinger
516b9190ad
fix codacy issues
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 18:27:14 +02:00
Andy Scherzinger
8f6bb87761
remove legacy current user provider and make all methods of legacy user utils private
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:43:17 +02:00
Andy Scherzinger
4d935920d0
Migrate RemoteFileBrowser and UnifiedSearch classes to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:38:05 +02:00
Andy Scherzinger
1a20bd3a3b
Migrate to new current user provider
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:33:45 +02:00
Andy Scherzinger
f3d31bf8c1
add license header and empty line at file end
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:29:13 +02:00
Andy Scherzinger
93dacd25c4
Deprecate CurrentUserProvider
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:27:34 +02:00
Andy Scherzinger
3e08781872
Add removal todo for upcoming major version(s)
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:27:18 +02:00
Andy Scherzinger
bcb728a0d1
Migrate PushUtils from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:21:40 +02:00
Andy Scherzinger
285b9cff03
Make signaling db updates use a subscribing consumer
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:21:03 +02:00
Andy Scherzinger
7593efd43f
Migrate WebsocketConnectionsWorker from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:13:39 +02:00
Andy Scherzinger
70d777ec3b
Migrate AddParticipantsToConversation from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:13:25 +02:00
Andy Scherzinger
67318883d0
Migrate SignalingSettingsWorker from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:05:48 +02:00
Andy Scherzinger
22ef1457ee
Migrate LeaveConversationWorker from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:05:30 +02:00
Andy Scherzinger
24ddaf4ec4
Migrate ShareOperationWorker from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:05:07 +02:00
Andy Scherzinger
2dfd4731af
Migrate DeleteConversationWorker from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:04:47 +02:00
Andy Scherzinger
5b8c352947
Migrate ContactAddressBookWorker from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:04:22 +02:00
Andy Scherzinger
d7654f8476
Add generic save method
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:03:43 +02:00
Andy Scherzinger
c4c183ac39
Add UserIdUtils for generic no primary key situation handling
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 16:02:56 +02:00
Andy Scherzinger
1cec9045ee
Migrate CapabilitiesWorker from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 14:58:08 +02:00
Andy Scherzinger
d4b84635f1
Migrate DownloadFileToCacheWorker from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 14:57:50 +02:00
Andy Scherzinger
27017aac9e
Migrate AccountRemovalWorker from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 14:29:41 +02:00
Andy Scherzinger
7ea37b9ee3
migrate poll view model from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 14:14:48 +02:00
Andy Scherzinger
4513866c1d
migrate key manager from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 14:09:08 +02:00
Andy Scherzinger
70ae6eb27d
migrate mention auto complete from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-23 14:08:45 +02:00
Nextcloud bot
525da5fba1
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-07-23 04:12:13 +00:00
Marcel Hibbe
2896d0758f
Merge pull request #2095 from nextcloud/feature/2024/simplePolls
Support "Simple polls"
2022-07-22 20:10:48 +02:00
Marcel Hibbe
faf5f0f698 allow multiline for polls question input
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
34686dd581 avoid to divide by zero
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
c97d02fdde revert button height
was not necessary for multiline. wrap content just works fine

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
8dfb6ca5aa add loading screen
this also avoids to doubleclick on end poll button

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
06d9b6f886 rename close poll to end poll in code
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
c3472de802 move checkboxes to left
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
a84c3d3f22 move avatars in detail view to left
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
c1fd78d29a static text for poll messages
= remove api call. it was decided in talk team to remove this to avoid so many requests. downside is that it's not possible anymore to see if the poll is closed or not.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
8f3a18655e change button heights (support multiple rows)
layout_gravity=center_vertical was added that buttons with 1 row look identical to buttons with 2 rows

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
564587dab1 adjust minor design (move pixels)
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
78274472e1 more whitespace between results list and buttons on bottom
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
b2e47d885c show overlapped mini avatars in results overview
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
64412a1876 toggle details view on click on avatar views
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
20dabf3a72 wip. toggle between voters overview and voters details
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
c7014fd063 hide system message "You voted on the poll ..."
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
58739b8f14 disable buttons while waiting for response
avoids doubleclick and doubled data

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
f46d2d28f5 close dialog when voted for hidden poll
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
fe217d9700 scroll complete poll create screen
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
82ffd1f83c add Options in init method
this avoids adding them again on screen rotation...

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
ba6cc7170b initially add 2 option fields and focus question field
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
ca0c045e8d initialize viewModel in onCreate
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
cd3f8af24a change strings
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
dca7e39905 get variables from parentViewModel
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
139c4412ad move variables from fragment to PollMainViewModel
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
6dfed0e5e7 avoid unnecessary null checks in PollMessageViewHolders
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
880c656be2 enable/disable submit button by liveData
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
3267fc2f47 remove nullable from PollRepository return types
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
87fdd7017d replace @JvmField with lateinit vars
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
bfcab7cb49 fix copyright
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
b6d0d58cbe reorder poll category in strings.xml
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
4b6a314514 remove unused viewState
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
4388d66b23 use CurrentUserProviderNew and User for polls
use CurrentUserProviderNew and User instead of CurrentUserProvider and UserEntity

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
41d64aa740 add copyrights
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
91fc3c311d allow question to be multiline
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
feaf041685 fix cursor jumping to end when editing question
setting the cursor to the end was just a (buggy) workaround when the question was of type liveData. As it's not liveData anymore, this workaround was now useless

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
6b8c83f553 add dismiss button for edit votes mode
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
2ac1567f5d delete empty options on poll creation
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
e77fb7cefb fix lint warnings
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
9afe4e44d6 fix LiveData value assignment nullability mismatch
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
f10b76d430 check talk-polls capability
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
3b4be83ea7 calculate percent with voters instead votes
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
a8afb61745 always focus new empty poll option in poll create dialog
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
40f20c56d6 update poll UI for moderators etc
- allow to end poll for moderators

- allow to see voters amount for voting screen for moderators and creators of the poll

- replace UserEntity with User

- show numVoters instead of votes

- minor refactoring

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
c848659fda fix text of submit button
+ rename variables

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
385d5ccd4a fix copyrights
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
6ab5dace1c fix layouts to handle poll with many options
make options scrollable

replace constraint layout with linear layouts + layout_weight="1"

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
cedbcaefee fix percentage calculation for multiselect polls
for multiselect polls the total votes must be taken instead amount of voters (one voter can have more than 1 votes..)

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
9e8dbb70f3 remove livedata where it's not needed
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
2988b667fe solve detekt warnings 2
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
2b8ee4953b solve detekt warnings
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
1b13812202 solve klint warnings
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
4c6e4b1c4c add copyright headers
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
23bf072326 fix InstantiationException for more fragments
followup to a12692ec + get parentViewModel by ViewModelProvider

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
38256fc25d fix compile error from commit a12692ec
(temporarily...)

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
1a000859bf fix InstantiationException for fragments
fragments must have a public, no-arg constructor.
extra information must be passed as arguments.

With a constructor that receives the data, the following error occurs:

Fragment$InstantiationException: Unable to instantiate fragment ..... could not find Fragment constructor

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
3224ae1e1f improve klint score, minor refactoring
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
b347fbf1b5 rename close poll to end poll (in code)
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:57 +00:00
Marcel Hibbe
bd99245c26 add confirm dialog to end poll
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
01f7016ae2 convert "votes" map
see https://github.com/nextcloud/spreed/pull/7500

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
73d48a395c show detailed list of voters
+ refactoring adapter and viewholders for result screen

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
909ee07ce6 wip2: styling of poll bars
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
bddd6b2e8e wip: styling of poll bars
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
318549a63a wip: show user avatars for closed public polls
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
fb54b35cf0 rename close poll to end poll
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
6447b82969 disable vote button when selection is not changed compared to own votes
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
167aa43ca0 make own votes bold in result screen
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
a95c0d997b make own votes bold in voting screen
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
782d74bfb9 restrict multiselection to maxVotes
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
a4c48b11d6 fix radiobuttons
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
2da4c37a52 remove liveData for selectedOptions
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
acda3d283b add multiselect for poll options
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
8541ebbfc0 add ability to close poll in PollVoteFragment
this adds duplicate button logic atm. might need to be improved..

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
8c898404d1 move details text to PollMainViewModel
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
fbd5e5f5ed show voting screen for open private polls
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
b504af1cd9 add UI logic + close poll system message
add close poll button (wip/temporarily?)
add "close poll" system message
add UI related logic to PollMainViewModel
add placeholder for pollDetails in UI

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
ea0b7d07cc poll creation: add logic to enable/disable buttons
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
8148bfaa65 add poll system message, klint fixes
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
9f90e9c4c6 wip: create poll using multiple livedata fields
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
b140cc8751 wip: create poll using livedata
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
af427f8300 wip: create poll. show outgoing polls
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
0388f3e3f6 fix to show vote results if only "poll.votes" are available
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
d31a9b1ade fix to send votes
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
5a070f5e1b wip: view poll results
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
7d8aebe234 wip: vote on poll
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
81666829b5 fetch poll to set subtitle in message
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
ae80a4e2ad pass roomToken to MessageViewHolders
wrap roomToken and ProfileBottomSheet in data class MessagePayload

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
c7e9721809 wip: get poll from API
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Álvaro Brey
42324419cd wip: Poll view model work
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
01f18d7eca add API poll details
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
e605546925 fix klint warnings
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
bf05445561 open poll dialog
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
Marcel Hibbe
f2025332ab add data classes for polls (WIP)
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-07-22 17:54:56 +00:00
dependabot[bot]
b70fd95516
Bump exoplayer from 2.18.0 to 2.18.1
Bumps [exoplayer](https://github.com/google/ExoPlayer) from 2.18.0 to 2.18.1.
- [Release notes](https://github.com/google/ExoPlayer/releases)
- [Changelog](https://github.com/google/ExoPlayer/blob/release-v2/RELEASENOTES.md)
- [Commits](https://github.com/google/ExoPlayer/compare/r2.18.0...r2.18.1)

---
updated-dependencies:
- dependency-name: com.google.android.exoplayer:exoplayer
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-22 19:51:22 +02:00
Andy Scherzinger
00f55f1949
use correct primary key to search for any other users in the DB and use current value from user attributes object
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-22 19:50:29 +02:00
Andy Scherzinger
6a8cafec22
migrate location picker from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-22 13:52:34 +02:00
Andy Scherzinger
dac99a5db8
Remove unused (legacy) UserUtils
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-22 13:52:34 +02:00
Andy Scherzinger
e7756003d7
remove variable shadowing
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-22 13:52:33 +02:00
Álvaro Brey
a3b99e9010
UserManager: fix rx logic for scheduleUserForDeletionWithId
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-07-22 13:52:33 +02:00
Andy Scherzinger
e7c258e2f8
fix detekt issues
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-22 13:52:33 +02:00
Andy Scherzinger
9bdd0c7a4e
Fix user manager db result processing
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-22 13:52:32 +02:00
Andy Scherzinger
6e05056b2e
Migrate AccountVerificationController from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-22 13:52:32 +02:00
Andy Scherzinger
8d87d5486b
update to latest API changes for storing users
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-22 13:52:32 +02:00
Andy Scherzinger
036e67027c
Migrate web view login from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-22 13:52:31 +02:00
Andy Scherzinger
fe8c7d468a
Migrate server selection from requery to room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-22 13:52:31 +02:00
dependabot[bot]
464e603807
Bump daggerVersion from 2.42 to 2.43
Bumps `daggerVersion` from 2.42 to 2.43.

Updates `dagger` from 2.42 to 2.43
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.42...dagger-2.43)

Updates `dagger-compiler` from 2.42 to 2.43
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.42...dagger-2.43)

---
updated-dependencies:
- dependency-name: com.google.dagger:dagger
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.google.dagger:dagger-compiler
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-22 13:44:54 +02:00
Álvaro Brey
da6ca10cb8
PushRegistrationWorker: fix missing injection causing NPE during login
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-07-22 10:16:37 +02:00
Andy Scherzinger
5eab5f86f7 push token recover is should not use the standard httpClient object and its cookieStore
Resolves #2218

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-07-22 06:48:40 +00:00
Nextcloud bot
d81e82c833
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-07-20 04:12:38 +00:00
dependabot[bot]
f6420e343f
Bump firebase-messaging from 23.0.5 to 23.0.6
Bumps firebase-messaging from 23.0.5 to 23.0.6.

---
updated-dependencies:
- dependency-name: com.google.firebase:firebase-messaging
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-19 13:30:35 +02:00
Tim Krüger
8f0fbc7d60
Merge pull request #2174 from nextcloud/dependabot/gradle/com.google.android.gms-play-services-base-18.1.0
Bump play-services-base from 18.0.1 to 18.1.0
2022-07-19 11:29:45 +02:00
Nextcloud bot
1ae4379e04
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-07-19 04:14:14 +00: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
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
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
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
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
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