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
4796 commits 93 branches 407 tags 64 MiB
Commit graph

4796 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Andy Scherzinger
12efda5064
Merge pull request #2223 from nextcloud/chore/1549/roomMigration5 
Migrate remaining controllers from requery to room
 2022-07-22 19:50:51 +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
Andy Scherzinger
749e0dbf1c
Merge pull request #2235 from nextcloud/dependabot/gradle/daggerVersion-2.43 
Bump daggerVersion from 2.42 to 2.43
 2022-07-22 13:49:58 +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
Andy Scherzinger
4ec8729610
Merge pull request #2237 from nextcloud/fix/noid/login-npe 
PushRegistrationWorker: fix missing injection causing NPE during login
 2022-07-22 13:15:57 +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
d9761f7a1a
Merge pull request #2232 from nextcloud/bugfix/2218/dedicatedCookieStore 
Push token recovery should not use the standard httpClient object
 2022-07-22 09:15:26 +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
Andy Scherzinger
a3e3d931a2
Merge pull request #2233 from nextcloud/chore/noid/devcontainerJava11 
bump devcontainer to java11
 2022-07-21 21:39:54 +02:00
Andy Scherzinger
a4862411fc
bump devcontainer to java11 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2022-07-21 21:38:58 +02:00
Andy Scherzinger
88a20d2dc0
Merge pull request #2231 from nextcloud/repo-sync/android-config/master 
🔄 Synced file(s) with nextcloud/android-config
 2022-07-21 19:28:33 +02:00