Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
Linhome-Android
Commits
424531ec
Commit
424531ec
authored
Mar 25, 2022
by
Christophe Deschamps
Browse files
Automatically close the app if it was open from a notifcation of incoming call
parent
dd013ec3
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
0 deletions
+17
-0
app/src/main/java/org/linhome/MainActivity.kt
app/src/main/java/org/linhome/MainActivity.kt
+8
-0
app/src/main/java/org/linhome/linphonecore/CoreContext.kt
app/src/main/java/org/linhome/linphonecore/CoreContext.kt
+2
-0
app/src/main/java/org/linhome/notifications/NotificationsManager.kt
...in/java/org/linhome/notifications/NotificationsManager.kt
+1
-0
app/src/main/java/org/linhome/ui/call/CallGenericActivity.kt
app/src/main/java/org/linhome/ui/call/CallGenericActivity.kt
+6
-0
No files found.
app/src/main/java/org/linhome/MainActivity.kt
View file @
424531ec
...
...
@@ -37,6 +37,7 @@ import org.linhome.ui.tabbar.TabbarViewModel
import
org.linhome.ui.toolbar.ToobarButtonClickedListener
import
org.linhome.ui.toolbar.ToolbarViewModel
import
org.linhome.utils.DialogUtil
import
org.linphone.core.tools.Log
import
permissions.dispatcher.NeedsPermission
import
permissions.dispatcher.OnNeverAskAgain
import
permissions.dispatcher.OnPermissionDenied
...
...
@@ -297,5 +298,12 @@ class MainActivity : GenericActivity() {
return
super
.
dispatchTouchEvent
(
event
)
}
override
fun
onResume
()
{
super
.
onResume
()
if
(
LinhomeApplication
.
coreContext
.
closeAppUponCallFinish
)
{
LinhomeApplication
.
coreContext
.
closeAppUponCallFinish
=
false
finish
()
}
}
}
app/src/main/java/org/linhome/linphonecore/CoreContext.kt
View file @
424531ec
...
...
@@ -37,6 +37,7 @@ import kotlinx.coroutines.delay
import
kotlinx.coroutines.launch
import
org.linhome.LinhomeApplication
import
org.linhome.LinhomeApplication.Companion.corePreferences
import
org.linhome.MainActivity
import
org.linhome.R
import
org.linhome.notifications.NotificationsManager
import
org.linhome.ui.call.CallInProgressActivity
...
...
@@ -55,6 +56,7 @@ class CoreContext(val context: Context, coreConfig: Config) {
var
stopped
=
false
val
core
:
Core
val
handler
:
Handler
=
Handler
(
Looper
.
getMainLooper
())
var
closeAppUponCallFinish
=
false
val
appVersion
:
String
by
lazy
{
"${org.linhome.BuildConfig.VERSION_NAME} / versionCode: ${org.linhome.BuildConfig.VERSION_CODE} (${org.linhome.BuildConfig.BUILD_TYPE})"
...
...
app/src/main/java/org/linhome/notifications/NotificationsManager.kt
View file @
424531ec
...
...
@@ -375,6 +375,7 @@ class NotificationsManager(private val context: Context) {
val
incomingCallNotificationIntent
=
Intent
(
context
,
CallIncomingActivity
::
class
.
java
)
incomingCallNotificationIntent
.
putExtra
(
"callId"
,
call
.
callLog
.
callId
)
incomingCallNotificationIntent
.
putExtra
(
"closeAppUponCallFinish"
,
true
)
incomingCallNotificationIntent
.
addFlags
(
Intent
.
FLAG_ACTIVITY_NEW_TASK
)
val
pendingIntent
=
PendingIntent
.
getActivity
(
context
,
...
...
app/src/main/java/org/linhome/ui/call/CallGenericActivity.kt
View file @
424531ec
...
...
@@ -25,6 +25,7 @@ import android.view.View
import
org.linhome.GenericActivity
import
org.linhome.LinhomeApplication.Companion.coreContext
import
org.linphone.core.Call
import
org.linphone.core.tools.Log
abstract
class
CallGenericActivity
:
GenericActivity
()
{
...
...
@@ -40,9 +41,14 @@ abstract class CallGenericActivity : GenericActivity() {
decorView
.
systemUiVisibility
=
uiOptions
call
=
intent
.
getStringExtra
(
"callId"
)
?.
let
{
callId
->
if
(
intent
.
getBooleanExtra
(
"closeAppUponCallFinish"
,
false
))
{
coreContext
.
closeAppUponCallFinish
=
true
}
coreContext
.
core
.
calls
.
filter
{
it
.
callLog
.
callId
.
equals
(
callId
)
}.
firstOrNull
()
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment