diff --git a/app/src/main/java/org/linphone/ui/main/help/viewmodel/HelpViewModel.kt b/app/src/main/java/org/linphone/ui/main/help/viewmodel/HelpViewModel.kt index 9c62bb2e3..2e821abd7 100644 --- a/app/src/main/java/org/linphone/ui/main/help/viewmodel/HelpViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/help/viewmodel/HelpViewModel.kt @@ -23,6 +23,7 @@ import androidx.annotation.UiThread import androidx.annotation.WorkerThread import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope +import com.google.firebase.FirebaseApp import kotlinx.coroutines.launch import org.linphone.BuildConfig import org.linphone.LinphoneApplication.Companion.coreContext @@ -49,6 +50,8 @@ class HelpViewModel @UiThread constructor() : GenericViewModel() { val sdkVersion = MutableLiveData() + val firebaseProjectId = MutableLiveData() + val checkUpdateAvailable = MutableLiveData() val uploadLogsAvailable = MutableLiveData() @@ -138,6 +141,8 @@ class HelpViewModel @UiThread constructor() : GenericViewModel() { sdkVersion.value = coreContext.sdkVersion logsUploadInProgress.value = false + firebaseProjectId.value = FirebaseApp.getInstance().options.projectId + coreContext.postOnCoreThread { core -> core.addListener(coreListener) diff --git a/app/src/main/res/drawable/firebase.xml b/app/src/main/res/drawable/firebase.xml new file mode 100644 index 000000000..c4c0e7e6a --- /dev/null +++ b/app/src/main/res/drawable/firebase.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/google_play.xml b/app/src/main/res/drawable/google_play.xml new file mode 100644 index 000000000..ad52ffbcd --- /dev/null +++ b/app/src/main/res/drawable/google_play.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/resource_package.xml b/app/src/main/res/drawable/resource_package.xml new file mode 100644 index 000000000..7c230e8a5 --- /dev/null +++ b/app/src/main/res/drawable/resource_package.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/help_debug_fragment.xml b/app/src/main/res/layout/help_debug_fragment.xml index 5d47844af..d0fd36c41 100644 --- a/app/src/main/res/layout/help_debug_fragment.xml +++ b/app/src/main/res/layout/help_debug_fragment.xml @@ -110,7 +110,7 @@ android:layout_width="32dp" android:layout_height="32dp" android:layout_marginStart="16dp" - android:src="@drawable/info" + android:src="@drawable/google_play" android:contentDescription="@null" app:tint="?attr/color_main1_500" app:layout_constraintStart_toStartOf="parent" @@ -153,7 +153,7 @@ android:layout_width="32dp" android:layout_height="32dp" android:layout_marginStart="16dp" - android:src="@drawable/info" + android:src="@drawable/resource_package" android:contentDescription="@null" app:tint="?attr/color_main1_500" app:layout_constraintStart_toStartOf="parent" @@ -190,6 +190,49 @@ app:layout_constraintStart_toEndOf="@id/sdk_version_icon" app:layout_constraintEnd_toEndOf="parent" /> + + + + + + + app:layout_constraintTop_toBottomOf="@id/firebase_project_subtitle"/> Partager les journaux Version de l\'application Version du SDK + ID du projet Firebase Partager le lien vers journaux avec… Les journaux ont été nettoyés Echec à l\'envoi des journaux diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8c8a9dbe0..3b6b017ba 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -203,6 +203,7 @@ Share logs App version SDK version + Firebase project ID Share debug logs link using… Debug logs have been cleaned Failed to upload debug logs