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
4cf6a0c4
Commit
4cf6a0c4
authored
Jun 25, 2020
by
Christophe Deschamps
Browse files
Missed count sync
Former-commit-id: 72e73a7a45cd7a04f19279376dfa82664bbd919c
parent
b70c3cd9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
7 deletions
+16
-7
app/src/main/java/org/lindoor/linphonecore/extensions/CoreExtensions.kt
...ava/org/lindoor/linphonecore/extensions/CoreExtensions.kt
+12
-0
app/src/main/java/org/lindoor/notifications/NotificationsManager.kt
...in/java/org/lindoor/notifications/NotificationsManager.kt
+2
-1
app/src/main/java/org/lindoor/ui/tabbar/TabbarViewModel.kt
app/src/main/java/org/lindoor/ui/tabbar/TabbarViewModel.kt
+2
-6
No files found.
app/src/main/java/org/lindoor/linphonecore/extensions/CoreExtensions.kt
View file @
4cf6a0c4
package
org.lindoor.linphonecore.extensions
import
org.lindoor.LindoorApplication
import
org.lindoor.LindoorApplication.Companion.coreContext
import
org.linphone.core.AudioDevice
import
org.linphone.core.CallLog
...
...
@@ -52,3 +53,14 @@ fun Core.forceBluetoothAudioRoute() {
fun
Core
.
callLogsWithNonEmptyCallId
():
ArrayList
<
CallLog
>
{
return
(
coreContext
.
core
.
callLogs
.
toCollection
(
ArrayList
())
as
ArrayList
<
CallLog
>).
filterNot
{
it
.
callId
==
null
}
as
ArrayList
<
CallLog
>
}
fun
Core
.
missedCount
():
Int
{
var
count
=
0
coreContext
.
core
.
callLogsWithNonEmptyCallId
().
forEach
{
if
(
it
.
isNew
())
count
++
}
return
count
}
app/src/main/java/org/lindoor/notifications/NotificationsManager.kt
View file @
4cf6a0c4
...
...
@@ -47,6 +47,7 @@ import org.lindoor.customisation.Theme
import
org.lindoor.linphonecore.CoreService
import
org.lindoor.linphonecore.extensions.extendedAcceptEarlyMedia
import
org.lindoor.linphonecore.extensions.historyEvent
import
org.lindoor.linphonecore.extensions.missedCount
import
org.lindoor.store.DeviceStore
import
org.lindoor.ui.call.CallInProgressActivity
import
org.lindoor.ui.call.CallIncomingActivity
...
...
@@ -446,7 +447,7 @@ class NotificationsManager(private val context: Context) {
.
setVisibility
(
NotificationCompat
.
VISIBILITY_PRIVATE
)
.
setWhen
(
System
.
currentTimeMillis
())
.
setShowWhen
(
true
)
.
setNumber
(
missedC
allC
ount
)
.
setNumber
(
coreContext
.
core
.
missedCount
()
)
.
setColor
(
Theme
.
getColor
(
"color_s"
))
.
build
()
notify
(
MISSED_CALLS_NOTIF_ID
,
notification
)
...
...
app/src/main/java/org/lindoor/ui/tabbar/TabbarViewModel.kt
View file @
4cf6a0c4
...
...
@@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModel
import
org.lindoor.LindoorApplication
import
org.lindoor.linphonecore.extensions.callLogsWithNonEmptyCallId
import
org.lindoor.linphonecore.extensions.isNew
import
org.lindoor.linphonecore.extensions.missedCount
import
org.linphone.core.CallLog
import
org.linphone.core.Core
import
org.linphone.core.CoreListenerStub
...
...
@@ -19,12 +20,7 @@ class TabbarViewModel : ViewModel() {
}
fun
updateUnreadCount
()
{
var
count
=
0
LindoorApplication
.
coreContext
.
core
.
callLogsWithNonEmptyCallId
().
forEach
{
if
(
it
.
isNew
())
count
++
}
unreadCount
.
value
=
count
unreadCount
.
value
=
LindoorApplication
.
coreContext
.
core
.
missedCount
()
}
init
{
...
...
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