diff --git a/app/src/main/java/org/linphone/ui/main/contacts/fragment/EditContactFragment.kt b/app/src/main/java/org/linphone/ui/main/contacts/fragment/EditContactFragment.kt
index 1c380d583..2cfec619d 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/fragment/EditContactFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/fragment/EditContactFragment.kt
@@ -31,6 +31,7 @@ import androidx.core.view.doOnPreDraw
import androidx.databinding.DataBindingUtil
import androidx.databinding.ViewDataBinding
import androidx.lifecycle.lifecycleScope
+import androidx.navigation.fragment.findNavController
import androidx.navigation.fragment.navArgs
import androidx.navigation.navGraphViewModels
import kotlinx.coroutines.launch
@@ -55,7 +56,7 @@ class EditContactFragment : GenericFragment() {
private lateinit var binding: ContactNewOrEditFragmentBinding
private val viewModel: ContactNewOrEditViewModel by navGraphViewModels(
- R.id.main_nav_graph
+ R.id.contact_nav_graph
)
private val args: EditContactFragmentArgs by navArgs()
@@ -114,7 +115,7 @@ class EditContactFragment : GenericFragment() {
model.confirmRemovalEvent.observe(viewLifecycleOwner) {
it.consume {
- goBack()
+ findNavController().popBackStack()
dialog.dismiss()
}
}
@@ -134,7 +135,7 @@ class EditContactFragment : GenericFragment() {
getString(R.string.contact_editor_saved_changes_toast),
R.drawable.info
)
- goBack()
+ findNavController().popBackStack()
} else {
(requireActivity() as MainActivity).showRedToast(
getString(R.string.contact_editor_error_saving_changes_toast),
diff --git a/app/src/main/java/org/linphone/ui/main/contacts/fragment/NewContactFragment.kt b/app/src/main/java/org/linphone/ui/main/contacts/fragment/NewContactFragment.kt
index 8e242b701..e7eb41230 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/fragment/NewContactFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/fragment/NewContactFragment.kt
@@ -31,6 +31,7 @@ import androidx.annotation.UiThread
import androidx.databinding.DataBindingUtil
import androidx.databinding.ViewDataBinding
import androidx.lifecycle.lifecycleScope
+import androidx.navigation.fragment.findNavController
import androidx.navigation.navGraphViewModels
import kotlinx.coroutines.launch
import org.linphone.BR
@@ -129,7 +130,8 @@ class NewContactFragment : GenericFragment() {
it.consume { refKey ->
if (refKey.isNotEmpty()) {
backPressedCallback.isEnabled = false
- goBack()
+ findNavController().popBackStack()
+
sharedViewModel.showContactEvent.value = Event(refKey)
(requireActivity() as MainActivity).showGreenToast(
getString(R.string.contact_editor_saved_contact_toast),
@@ -222,7 +224,7 @@ class NewContactFragment : GenericFragment() {
model.confirmRemovalEvent.observe(viewLifecycleOwner) {
it.consume {
backPressedCallback.isEnabled = false
- goBack()
+ findNavController().popBackStack()
dialog.dismiss()
}
}
diff --git a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt
index 309249de9..78358c603 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt
@@ -81,6 +81,8 @@ class ContactNewOrEditViewModel @UiThread constructor() : ViewModel() {
@UiThread
fun findFriendByRefKey(refKey: String?) {
+ reset()
+
coreContext.postOnCoreThread { core ->
friend = if (refKey.isNullOrEmpty()) {
core.createFriend()
@@ -257,4 +259,17 @@ class ContactNewOrEditViewModel @UiThread constructor() : ViewModel() {
private fun isSaveButtonEnabled(): Boolean {
return firstName.value.orEmpty().isNotEmpty() || lastName.value.orEmpty().isNotEmpty()
}
+
+ @UiThread
+ private fun reset() {
+ isEdit.value = false
+ picturePath.value = ""
+ firstName.value = ""
+ lastName.value = ""
+ sipAddresses.clear()
+ phoneNumbers.clear()
+ company.value = ""
+ jobTitle.value = ""
+ saveButtonEnabled.value = false
+ }
}
diff --git a/app/src/main/java/org/linphone/ui/main/help/fragment/DebugFragment.kt b/app/src/main/java/org/linphone/ui/main/help/fragment/DebugFragment.kt
new file mode 100644
index 000000000..b5f807a65
--- /dev/null
+++ b/app/src/main/java/org/linphone/ui/main/help/fragment/DebugFragment.kt
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2010-2023 Belledonne Communications SARL.
+ *
+ * This file is part of linphone-android
+ * (see https://www.linphone.org).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package org.linphone.ui.main.help.fragment
+
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.navigation.navGraphViewModels
+import org.linphone.R
+import org.linphone.databinding.HelpDebugFragmentBinding
+import org.linphone.ui.main.MainActivity
+import org.linphone.ui.main.fragment.GenericFragment
+import org.linphone.ui.main.help.viewmodel.HelpViewModel
+import org.linphone.utils.AppUtils
+
+class DebugFragment : GenericFragment() {
+ companion object {
+ private const val TAG = "[Debug Fragment]"
+ }
+
+ private lateinit var binding: HelpDebugFragmentBinding
+
+ val viewModel: HelpViewModel by navGraphViewModels(
+ R.id.main_nav_graph
+ )
+
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View {
+ binding = HelpDebugFragmentBinding.inflate(layoutInflater)
+ return binding.root
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ binding.lifecycleOwner = viewLifecycleOwner
+ binding.viewModel = viewModel
+
+ binding.setBackClickListener {
+ goBack()
+ }
+
+ viewModel.debugLogsCleanedEvent.observe(viewLifecycleOwner) {
+ it.consume {
+ (requireActivity() as MainActivity).showGreenToast(
+ getString(R.string.help_advanced_debug_logs_cleaned_toast_message),
+ R.drawable.info
+ )
+ }
+ }
+
+ viewModel.uploadDebugLogsFinishedEvent.observe(viewLifecycleOwner) {
+ it.consume { url ->
+ val clipboard =
+ requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+ val clip = ClipData.newPlainText("Logs url", url)
+ clipboard.setPrimaryClip(clip)
+
+ (requireActivity() as MainActivity).showGreenToast(
+ getString(
+ R.string.help_advanced_debug_logs_url_copied_into_clipboard_toast_message
+ ),
+ R.drawable.info
+ )
+
+ AppUtils.shareUploadedLogsUrl(requireActivity(), url)
+ }
+ }
+
+ viewModel.uploadDebugLogsErrorEvent.observe(viewLifecycleOwner) {
+ it.consume {
+ (requireActivity() as MainActivity).showRedToast(
+ getString(R.string.help_advanced_debug_logs_upload_error_toast_message),
+ R.drawable.warning_circle
+ )
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/org/linphone/ui/main/settings/fragment/HelpFragment.kt b/app/src/main/java/org/linphone/ui/main/help/fragment/HelpFragment.kt
similarity index 69%
rename from app/src/main/java/org/linphone/ui/main/settings/fragment/HelpFragment.kt
rename to app/src/main/java/org/linphone/ui/main/help/fragment/HelpFragment.kt
index f471d7d76..165f44113 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/fragment/HelpFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/help/fragment/HelpFragment.kt
@@ -1,8 +1,5 @@
-package org.linphone.ui.main.settings.fragment
+package org.linphone.ui.main.help.fragment
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
import android.content.Intent
import android.net.Uri
import android.os.Bundle
@@ -10,14 +7,14 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.annotation.UiThread
+import androidx.navigation.fragment.findNavController
import androidx.navigation.navGraphViewModels
import org.linphone.R
import org.linphone.core.tools.Log
import org.linphone.databinding.HelpFragmentBinding
import org.linphone.ui.main.MainActivity
import org.linphone.ui.main.fragment.GenericFragment
-import org.linphone.ui.main.settings.viewmodel.HelpViewModel
-import org.linphone.utils.AppUtils
+import org.linphone.ui.main.help.viewmodel.HelpViewModel
@UiThread
class HelpFragment : GenericFragment() {
@@ -49,6 +46,11 @@ class HelpFragment : GenericFragment() {
goBack()
}
+ binding.setDebugClickListener {
+ val action = HelpFragmentDirections.actionHelpFragmentToDebugFragment()
+ findNavController().navigate(action)
+ }
+
binding.setPrivacyPolicyClickListener {
val url = getString(R.string.privacy_policy_url)
try {
@@ -111,41 +113,5 @@ class HelpFragment : GenericFragment() {
)
}
}
-
- viewModel.debugLogsCleanedEvent.observe(viewLifecycleOwner) {
- it.consume {
- (requireActivity() as MainActivity).showGreenToast(
- getString(R.string.help_advanced_debug_logs_cleaned_toast_message),
- R.drawable.info
- )
- }
- }
-
- viewModel.uploadDebugLogsFinishedEvent.observe(viewLifecycleOwner) {
- it.consume { url ->
- val clipboard =
- requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
- val clip = ClipData.newPlainText("Logs url", url)
- clipboard.setPrimaryClip(clip)
-
- (requireActivity() as MainActivity).showGreenToast(
- getString(
- R.string.help_advanced_debug_logs_url_copied_into_clipboard_toast_message
- ),
- R.drawable.info
- )
-
- AppUtils.shareUploadedLogsUrl(requireActivity(), url)
- }
- }
-
- viewModel.uploadDebugLogsErrorEvent.observe(viewLifecycleOwner) {
- it.consume {
- (requireActivity() as MainActivity).showRedToast(
- getString(R.string.help_advanced_debug_logs_upload_error_toast_message),
- R.drawable.warning_circle
- )
- }
- }
}
}
diff --git a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/HelpViewModel.kt b/app/src/main/java/org/linphone/ui/main/help/viewmodel/HelpViewModel.kt
similarity index 99%
rename from app/src/main/java/org/linphone/ui/main/settings/viewmodel/HelpViewModel.kt
rename to app/src/main/java/org/linphone/ui/main/help/viewmodel/HelpViewModel.kt
index 1c8f328ae..a0586da94 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/HelpViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/help/viewmodel/HelpViewModel.kt
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package org.linphone.ui.main.settings.viewmodel
+package org.linphone.ui.main.help.viewmodel
import androidx.annotation.UiThread
import androidx.annotation.WorkerThread
diff --git a/app/src/main/res/drawable/secondary_cell_background.xml b/app/src/main/res/drawable/secondary_cell_background.xml
index b0e3d17fd..269221cf3 100644
--- a/app/src/main/res/drawable/secondary_cell_background.xml
+++ b/app/src/main/res/drawable/secondary_cell_background.xml
@@ -5,5 +5,5 @@