-
Notifications
You must be signed in to change notification settings - Fork 743
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
VoIP Screen Sharing Permission #5811
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
00bbb94
Add screen sharing option to call menu.
99cab79
Show screen sharing permission dialog.
fa3476d
Create a foreground service during screen sharing.
f9ee06c
Implement foreground service for Android Q and later.
0693e3c
Add feature flag for screen sharing.
55740a1
Changelog added.
534d55a
Fix import.
949d476
Code review fixes.
56b3e8a
Merge branch 'develop' into feature/ons/voip_screen_sharing_permission
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
VoIP Screen Sharing Permission |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 56 additions & 0 deletions
56
vector/src/main/java/im/vector/app/features/call/webrtc/ScreenCaptureService.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
/* | ||
* Copyright (c) 2022 New Vector Ltd | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package im.vector.app.features.call.webrtc | ||
|
||
import android.content.Intent | ||
import android.os.Binder | ||
import android.os.IBinder | ||
import dagger.hilt.android.AndroidEntryPoint | ||
import im.vector.app.core.services.VectorService | ||
import im.vector.app.features.notifications.NotificationUtils | ||
import javax.inject.Inject | ||
|
||
@AndroidEntryPoint | ||
class ScreenCaptureService : VectorService() { | ||
|
||
@Inject lateinit var notificationUtils: NotificationUtils | ||
private val binder = LocalBinder() | ||
|
||
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { | ||
showStickyNotification() | ||
|
||
return START_STICKY | ||
} | ||
|
||
private fun showStickyNotification() { | ||
val notificationId = System.currentTimeMillis().toInt() | ||
val notification = notificationUtils.buildScreenSharingNotification() | ||
startForeground(notificationId, notification) | ||
} | ||
|
||
override fun onBind(intent: Intent?): IBinder { | ||
return binder | ||
} | ||
|
||
fun stopService() { | ||
stopSelf() | ||
} | ||
|
||
inner class LocalBinder : Binder() { | ||
fun getService(): ScreenCaptureService = this@ScreenCaptureService | ||
} | ||
} |
54 changes: 54 additions & 0 deletions
54
vector/src/main/java/im/vector/app/features/call/webrtc/ScreenCaptureServiceConnection.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
/* | ||
* Copyright (c) 2022 New Vector Ltd | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package im.vector.app.features.call.webrtc | ||
|
||
import android.content.ComponentName | ||
import android.content.Context | ||
import android.content.Intent | ||
import android.content.ServiceConnection | ||
import android.os.IBinder | ||
import javax.inject.Inject | ||
|
||
class ScreenCaptureServiceConnection @Inject constructor( | ||
private val context: Context | ||
) : ServiceConnection { | ||
|
||
private var isBound = false | ||
private var screenCaptureService: ScreenCaptureService? = null | ||
|
||
fun bind() { | ||
if (!isBound) { | ||
Intent(context, ScreenCaptureService::class.java).also { intent -> | ||
context.bindService(intent, this, 0) | ||
} | ||
} | ||
} | ||
|
||
fun stopScreenCapturing() { | ||
screenCaptureService?.stopService() | ||
} | ||
|
||
override fun onServiceConnected(className: ComponentName, binder: IBinder) { | ||
screenCaptureService = (binder as ScreenCaptureService.LocalBinder).getService() | ||
isBound = true | ||
} | ||
|
||
override fun onServiceDisconnected(className: ComponentName) { | ||
isBound = false | ||
screenCaptureService = null | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Optional: This is a good opportunity to get rid of the commented code below. They're nearly 2 years old, I don't think we'll need it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right :) done.