Commit graph

3318 commits

Author SHA1 Message Date
Marcel Hibbe
052dc588aa
remove comment
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
b822eb8417
reformat code in CallNotificationActivity
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
b3f8a36c62
load avatar again in CallNotificationActivity
was only disabled for debugging. still needs to be fixed with https://github.com/nextcloud/talk-android/issues/1234

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
7a7888f5d1
reformat code in CallActivity
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
71ae7eddc2
move code from onStart to onCreate
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
0bfeb1b320
add action button to mute/unmute in pip mode
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
4a1c637efc
add checks if pip is supported by device
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
a0c95113bf
display overlay instead of grid in pip view for group calls
this is a quick and dirty solution until "speaker view" is introduced in the future which should be used for the pip view.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
57804c8d62
dismiss keyguard for CallNotificationActivity (WIP, see TODO)
Whenever i click the button to accept the call, CallActivity is started by intent.
CallActivity itself has the same logic to dismiss the keyguard.

The problem is: When switching from CallNotificationActivity to CallActivity the lockscreen is shown indeed!
So i guess Android recognizes "oh, CallNotificationActivity is gone. Let's show the lockscreen" before it recognizes that
the new activity also dismiss the lockscreen ?!

I fear for this scenario it was not the best idea to have 2 different activies.. (before it was only 1 activity and 2 condcutor controllers..)

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
e05334cb9a
enable pip support for CallNotificationActivity
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
7e68ecbde9
rename "runAllThings"
:D :D
setUpAfterConversationIsKnown might not be the best name, but i'm not sure when in onCreate the currentConversation can be null. depending on that it might even not be necessary to have the "things" in a method..

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
3326b6a7f3
rename design for CallActivity
move methods

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
c7e38e4859
replace CallNotificationController with Activity (WIP)
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
251d41f7fb
replace CallController with CallActivity etc. (WIP)
- delete MagicCallActivity
- replace butterknife with viewbinding for CallActivity

TODO:
- also switch CallNotificationController to Activity
- check if CallActivity and CallNotificationActivity are called correctly
- testing!

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
b49a1b9274
remove unused import
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
06fab75c30
remove unused view
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
3afcceae50
delete creation of intent that is not used
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
03913b40a2
fix to enable pip for CallNotification Controller
methods to update UI are not yet implemented. maybe it's better to make two Activities: one for Call and one for CallNotification...

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
0d1e0af9d1
fix NPE when call is joined by notification
add ability to have PIP mode for calls joined by notification

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
51b86b5a88
fix currentRoomToken for ApplicationWideCurrentRoomHolder
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
e0e3bf4c32
add logging and comments
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
2c1b45491d
start pip mode when back button is pressed
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
78653e7d8d
show call controls in videocall when entering call or when come back from pip mode
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
12d96634e5
fix to show call controls in voiceOnly call after coming back from pip mode
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
1ae5f51a81
hide pip button for android < 8
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
6839b9eb2c
fix animation of callControls
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
3ba599be98
rename old "pip*"-stuff to "selfVideo*"
improve design-logic for pip-mode and normal mode when switched back from pip

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
914b10bf20
make pip fullscreen (wip)
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
d482d8603e
modify call screen design for pip mode
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
ea8e45e934
enable keyguard when users presses home button
= security check if call was entered via notification in locked mode

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
0aee8eb7ef
remove comment
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
d4322bf2d9
finish call activity if closed via "X" in pip mode
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
7f19816961
remove call activity from tasks
add launch screen for call

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
d4d23c1855
set calling/dialing state by ApplicationWideCurrentRoomHolder
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
78384e7b55
add initial approach for pip mode (wip)
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 13:23:40 +01:00
Marcel Hibbe
bda45d874c Drone: update Lint results to reflect reduced error/warning count [skip ci]
Signed-off-by: Marcel Hibbe <drone@nextcloud.com>
2021-11-11 12:11:03 +00:00
Marcel Hibbe
762124ea06
Merge pull request #1674 from nextcloud/bumpMasterTo13
bump version to 13.0.0 Alpha 1
2021-11-11 12:52:10 +01:00
Marcel Hibbe
40506eaeaf
allow app to query for apps that can resolve VIEW or SEND intents
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 11:22:37 +01:00
Marcel Hibbe
6f206aa5b8
bump version to 13.0.0 Alpha 1
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2021-11-11 09:12:25 +01:00
Andy Scherzinger
dfcf68b849
Merge pull request #1670 from nextcloud/dependabot/gradle/com.google.android.exoplayer-exoplayer-2.16.0
Bump exoplayer from 2.15.1 to 2.16.0
2021-11-10 23:39:07 +01:00
dependabot[bot]
23ceb89064
Bump exoplayer from 2.15.1 to 2.16.0
Bumps [exoplayer](https://github.com/google/ExoPlayer) from 2.15.1 to 2.16.0.
- [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.15.1...r2.16.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-10 22:36:24 +00:00
Andy Scherzinger
d4a010ac6f
Merge pull request #1664 from nextcloud/dependabot/gradle/com.google.code.gson-gson-2.8.9
Bump gson from 2.8.8 to 2.8.9
2021-11-10 23:35:46 +01:00
Tim Krueger
4edd401f21
Merge pull request #1673 from nextcloud/feature/noid/findbugs-ignore-generated-JsonObjectMapper
Ignore generated JsonObjectMapper
2021-11-10 17:03:29 +01:00
Tim Krüger
0820964e53
Ignore generated JsonObjectMapper
Signed-off-by: Tim Krüger <t@timkrueger.me>
2021-11-10 15:56:49 +01:00
Tim Krueger
6b13d0b818
Merge pull request #1659 from nextcloud/feature/1644/avatar-hovercard
Avatar "hovercard"
2021-11-10 14:04:33 +01:00
Tim Krüger
85785c287e
Resolve FindBugs Collection Naming Confusion
From the FindBugs documentation:

> CNC_COLLECTION_NAMING_CONFUSION: Collection variable is named with a different
> type of collection in the name
>
> This class defines a field or local collection variable with a name that
> contains a different type of collection in its name. An example would be a Set
> called userList. This is confusing to the reader, and likely caused by a
> previous refactor of type, without changing the name. This detector is
> obviously only checking for English names.

Signed-off-by: Tim Krüger <t@timkrueger.me>
2021-11-10 13:55:20 +01:00
Tim Krüger
9accac3325
Show profile action on avatar click
For every click on a avatar in a group chat it will be tried to receive a
hover card from the Nextcloud server. The endpoint returns multiple
actions. Those actions will be filtered for the app ids 'spreed',
'email' and 'profile'. Other will be ignored.
The received filtered actions will be shown in a bottom sheet.

Resolves: #1644

Signed-off-by: Tim Krüger <t@timkrueger.me>
2021-11-10 09:08:43 +01:00
Tim Krüger
036cf7c590
Some refactoring
- Removed spelling issues
- Removed unneded boolean comparisons
- Improve code readability by reformatting

Signed-off-by: Tim Krüger <t@timkrueger.me>
2021-11-10 09:08:42 +01:00
Tim Krueger
fce5fca535
Merge pull request #1669 from nextcloud/testLint
Use curl -k
2021-11-10 09:00:44 +01:00
tobiasKaminsky
69485a1f3f
Use curl -k
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2021-11-10 08:34:14 +01:00