Compare commits

..

No commits in common. "master" and "1.0.0" have entirely different histories.

5 changed files with 16 additions and 12 deletions

View file

@ -6,8 +6,8 @@ plugins {
id 'org.jetbrains.kotlin.android' id 'org.jetbrains.kotlin.android'
} }
def appVersionName = "1.0.1" def appVersionName = "1.0.0"
def appVersionCode = 52001 def appVersionCode = 52000
def packageName = "org.difusephone" def packageName = "org.difusephone"

View file

@ -67,6 +67,10 @@
android:theme="@style/AppTheme" android:theme="@style/AppTheme"
android:allowNativeHeapPointerTagging="false"> android:allowNativeHeapPointerTagging="false">
<meta-data
android:name="com.google.android.gms.car.application"
android:resource="@xml/automotive_app_desc"/>
<activity android:name=".activities.main.MainActivity" <activity android:name=".activities.main.MainActivity"
android:exported="true" android:exported="true"
android:launchMode="singleTask" android:launchMode="singleTask"

View file

@ -538,11 +538,9 @@ class ConferenceViewModel : ViewModel() {
var foundActivelySpeakingParticipantDevice = false var foundActivelySpeakingParticipantDevice = false
speakingParticipantFound.value = false speakingParticipantFound.value = false
val conferenceInfo = conference.conferenceAddress?.let { val conferenceInfo = conference.core.findConferenceInformationFromUri(
conference.core.findConferenceInformationFromUri( conference.conferenceAddress
it )
)
}
var allSpeaker = true var allSpeaker = true
for (info in conferenceInfo?.participantInfos.orEmpty()) { for (info in conferenceInfo?.participantInfos.orEmpty()) {
if (info.role == Participant.Role.Listener) { if (info.role == Participant.Role.Listener) {

View file

@ -93,11 +93,9 @@ class LinphoneUtils {
fun getConferenceSubject(conference: Conference): String? { fun getConferenceSubject(conference: Conference): String? {
return if (conference.subject.isNullOrEmpty()) { return if (conference.subject.isNullOrEmpty()) {
val conferenceInfo = conference.conferenceAddress?.let { val conferenceInfo = coreContext.core.findConferenceInformationFromUri(
coreContext.core.findConferenceInformationFromUri( conference.conferenceAddress
it )
)
}
if (conferenceInfo != null) { if (conferenceInfo != null) {
conferenceInfo.subject conferenceInfo.subject
} else { } else {

View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<automotiveApp>
<uses name="notification" />
</automotiveApp>