mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-12-17 06:01:58 +03:00
Code Issues Projects Releases Packages Wiki Activity
4954 commits 94 branches 415 tags 79 MiB
Commit graph

2422 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Á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
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
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
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
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
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
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