mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed sharing logs with Linphone from debug fragment

Browse source
This commit is contained in:
Sylvain Berfini 2023-11-21 10:40:54 +01:00
parent 7099a33dc4
commit 4e602fc5e8
3 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/org/linphone/ui/main/MainActivity.kt
View file

@ -51,6 +51,7 @@ import org.linphone.R
import org.linphone.core.tools.Log
import org.linphone.databinding.MainActivityBinding
import org.linphone.ui.assistant.AssistantActivity
import org.linphone.ui.main.help.fragment.DebugFragmentDirections
import org.linphone.ui.main.viewmodel.MainViewModel
import org.linphone.ui.main.viewmodel.SharedMainViewModel
import org.linphone.ui.welcome.WelcomeActivity
@ -430,6 +431,19 @@ class MainActivity : AppCompatActivity() {
Log.i("$TAG Going into conversations list as no shortcut ID as found")
}
if (binding.drawerMenu.isOpen) {
Log.i("$TAG Drawer menu is opened, closing it")
closeDrawerMenu()
}
if (findNavController().currentDestination?.id == R.id.debugFragment) {
Log.i(
"$TAG App is already started and in debug fragment, navigating to conversations list"
)
val action = DebugFragmentDirections.actionDebugFragmentToConversationsListFragment()
findNavController().navigate(action)
}
val navGraph = findNavController().navInflater.inflate(R.navigation.main_nav_graph)
navGraph.setStartDestination(R.id.conversationsListFragment)

6
app/src/main/res/drawable/meeting.xml
View file

@ -7,8 +7,8 @@
android:pathData="M2,3.75L22,3.75A1.25,1.25 0,0 1,23.25 5L23.25,19.462A1.25,1.25 0,0 1,22 20.712L2,20.712A1.25,1.25 0,0 1,0.75 19.462L0.75,5A1.25,1.25 0,0 1,2 3.75z"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:strokeColor="#FE5E00"/>
android:strokeColor="#4E6074"/>
<path
android:pathData="M19.799,12.399C19.746,12.438 19.686,12.467 19.623,12.483C19.559,12.499 19.493,12.503 19.428,12.494C19.363,12.484 19.3,12.462 19.244,12.429C19.187,12.396 19.138,12.351 19.099,12.299C18.797,11.894 18.405,11.565 17.954,11.339C17.502,11.113 17.004,10.997 16.499,10.999C16.401,10.999 16.305,10.97 16.222,10.915C16.141,10.861 16.076,10.784 16.038,10.693C16.012,10.632 15.999,10.566 15.999,10.499C15.999,10.432 16.012,10.366 16.038,10.305C16.076,10.214 16.141,10.137 16.222,10.082C16.305,10.028 16.401,9.999 16.499,9.999C16.779,9.999 17.054,9.92 17.292,9.772C17.53,9.623 17.722,9.411 17.846,9.159C17.969,8.908 18.019,8.626 17.991,8.347C17.962,8.068 17.856,7.802 17.684,7.581C17.513,7.359 17.282,7.19 17.019,7.092C16.756,6.995 16.471,6.974 16.196,7.03C15.921,7.087 15.668,7.219 15.465,7.413C15.262,7.606 15.117,7.853 15.047,8.124C15.03,8.188 15.001,8.248 14.962,8.3C14.922,8.353 14.873,8.397 14.816,8.43C14.76,8.463 14.697,8.485 14.632,8.495C14.567,8.504 14.501,8.5 14.437,8.484C14.374,8.467 14.314,8.438 14.261,8.399C14.209,8.359 14.165,8.31 14.131,8.253C14.098,8.197 14.076,8.134 14.067,8.069C14.058,8.004 14.061,7.938 14.078,7.874C14.175,7.498 14.359,7.149 14.615,6.856C14.871,6.563 15.191,6.333 15.552,6.186C15.912,6.039 16.301,5.978 16.689,6.007C17.077,6.037 17.452,6.157 17.786,6.357C18.119,6.558 18.401,6.833 18.61,7.162C18.818,7.49 18.946,7.863 18.985,8.25C19.024,8.637 18.972,9.028 18.833,9.391C18.695,9.755 18.473,10.081 18.186,10.343C18.866,10.638 19.457,11.105 19.9,11.698C19.94,11.751 19.968,11.811 19.985,11.875C20.001,11.938 20.004,12.005 19.995,12.07C19.985,12.135 19.963,12.197 19.929,12.254C19.896,12.31 19.851,12.359 19.799,12.399ZM16.431,16.248C16.468,16.305 16.492,16.369 16.503,16.435C16.514,16.502 16.511,16.57 16.495,16.635C16.479,16.701 16.45,16.763 16.41,16.816C16.369,16.87 16.318,16.916 16.26,16.949C16.201,16.983 16.137,17.005 16.07,17.013C16.003,17.021 15.935,17.015 15.87,16.997C15.805,16.978 15.745,16.946 15.693,16.903C15.641,16.861 15.598,16.808 15.566,16.748C15.252,16.215 14.803,15.773 14.265,15.466C13.727,15.159 13.119,14.998 12.499,14.998C11.88,14.998 11.271,15.159 10.733,15.466C10.196,15.773 9.747,16.215 9.432,16.748C9.401,16.808 9.358,16.861 9.306,16.903C9.254,16.946 9.193,16.978 9.128,16.997C9.064,17.015 8.996,17.021 8.929,17.013C8.862,17.005 8.797,16.983 8.739,16.949C8.681,16.916 8.63,16.87 8.589,16.816C8.549,16.763 8.52,16.701 8.504,16.635C8.488,16.57 8.485,16.502 8.496,16.435C8.507,16.369 8.531,16.305 8.567,16.248C9.052,15.415 9.791,14.76 10.676,14.378C10.178,13.997 9.812,13.47 9.63,12.87C9.447,12.27 9.457,11.628 9.658,11.034C9.86,10.44 10.242,9.924 10.752,9.559C11.261,9.194 11.872,8.997 12.499,8.997C13.126,8.997 13.738,9.194 14.247,9.559C14.757,9.924 15.139,10.44 15.34,11.034C15.542,11.628 15.552,12.27 15.369,12.87C15.187,13.47 14.821,13.997 14.323,14.378C15.208,14.76 15.947,15.415 16.431,16.248ZM12.499,13.999C12.895,13.999 13.281,13.881 13.61,13.661C13.939,13.442 14.196,13.13 14.347,12.764C14.498,12.399 14.538,11.997 14.461,11.609C14.384,11.221 14.193,10.864 13.913,10.585C13.634,10.305 13.277,10.115 12.889,10.037C12.502,9.96 12.099,10 11.734,10.151C11.369,10.303 11.056,10.559 10.837,10.888C10.617,11.217 10.5,11.603 10.5,11.999C10.5,12.529 10.71,13.038 11.085,13.413C11.46,13.788 11.969,13.999 12.499,13.999ZM9,10.499C9,10.366 8.947,10.239 8.853,10.145C8.76,10.052 8.632,9.999 8.5,9.999C8.219,9.999 7.944,9.92 7.706,9.772C7.468,9.623 7.277,9.411 7.153,9.159C7.03,8.908 6.979,8.626 7.008,8.347C7.036,8.068 7.142,7.802 7.314,7.581C7.486,7.359 7.717,7.19 7.98,7.092C8.243,6.995 8.528,6.974 8.803,7.03C9.077,7.087 9.331,7.219 9.534,7.413C9.737,7.606 9.882,7.853 9.952,8.124C9.985,8.253 10.068,8.363 10.182,8.43C10.297,8.497 10.433,8.517 10.561,8.484C10.69,8.45 10.8,8.368 10.867,8.253C10.935,8.139 10.954,8.003 10.921,7.874C10.823,7.498 10.639,7.149 10.384,6.856C10.128,6.563 9.807,6.333 9.447,6.186C9.087,6.039 8.698,5.978 8.31,6.007C7.922,6.037 7.546,6.157 7.213,6.357C6.879,6.558 6.597,6.833 6.389,7.162C6.181,7.49 6.052,7.863 6.013,8.25C5.974,8.637 6.026,9.028 6.165,9.391C6.304,9.755 6.526,10.081 6.812,10.343C6.133,10.638 5.543,11.105 5.1,11.698C5.021,11.804 4.986,11.938 5.005,12.069C5.024,12.2 5.094,12.319 5.2,12.398C5.306,12.478 5.439,12.512 5.571,12.494C5.702,12.475 5.82,12.405 5.9,12.299C6.201,11.894 6.594,11.565 7.045,11.339C7.497,11.113 7.995,10.997 8.5,10.999C8.632,10.999 8.76,10.946 8.853,10.852C8.947,10.759 9,10.632 9,10.499Z"
android:fillColor="#FE5E00"/>
android:pathData="M19.299,13.199C19.246,13.238 19.186,13.267 19.123,13.283C19.059,13.299 18.993,13.303 18.928,13.294C18.863,13.284 18.8,13.262 18.744,13.229C18.687,13.196 18.638,13.151 18.599,13.099C18.297,12.694 17.905,12.365 17.454,12.139C17.002,11.913 16.504,11.797 15.999,11.799C15.901,11.799 15.804,11.77 15.722,11.715C15.641,11.661 15.576,11.584 15.538,11.493C15.512,11.432 15.499,11.366 15.499,11.299C15.499,11.232 15.512,11.166 15.538,11.105C15.576,11.014 15.641,10.937 15.722,10.882C15.804,10.828 15.901,10.799 15.999,10.799C16.279,10.799 16.554,10.72 16.792,10.572C17.03,10.423 17.222,10.211 17.346,9.959C17.469,9.707 17.519,9.426 17.491,9.147C17.462,8.868 17.356,8.602 17.184,8.381C17.013,8.159 16.782,7.99 16.519,7.892C16.256,7.795 15.971,7.774 15.696,7.83C15.421,7.887 15.168,8.019 14.965,8.213C14.762,8.406 14.617,8.653 14.547,8.924C14.53,8.988 14.501,9.048 14.462,9.1C14.422,9.153 14.373,9.197 14.316,9.23C14.26,9.263 14.197,9.285 14.132,9.295C14.067,9.304 14.001,9.3 13.937,9.284C13.874,9.267 13.814,9.238 13.761,9.199C13.709,9.159 13.665,9.11 13.631,9.053C13.598,8.997 13.576,8.934 13.567,8.869C13.558,8.804 13.561,8.738 13.578,8.674C13.675,8.298 13.859,7.949 14.115,7.656C14.371,7.363 14.691,7.133 15.052,6.986C15.412,6.839 15.801,6.778 16.189,6.807C16.577,6.837 16.952,6.957 17.286,7.157C17.619,7.358 17.901,7.633 18.11,7.962C18.318,8.29 18.446,8.663 18.485,9.05C18.524,9.437 18.472,9.828 18.333,10.191C18.195,10.555 17.973,10.881 17.686,11.143C18.366,11.438 18.957,11.905 19.4,12.498C19.44,12.551 19.468,12.611 19.485,12.675C19.501,12.738 19.504,12.804 19.495,12.87C19.485,12.935 19.463,12.997 19.429,13.054C19.396,13.11 19.351,13.16 19.299,13.199ZM15.931,17.048C15.968,17.105 15.992,17.169 16.003,17.235C16.014,17.302 16.011,17.37 15.995,17.435C15.979,17.501 15.95,17.563 15.91,17.616C15.869,17.67 15.818,17.716 15.76,17.749C15.701,17.783 15.637,17.805 15.57,17.813C15.503,17.821 15.435,17.815 15.37,17.797C15.305,17.778 15.245,17.746 15.193,17.704C15.141,17.661 15.098,17.608 15.066,17.548C14.752,17.015 14.303,16.573 13.765,16.266C13.227,15.959 12.619,15.797 11.999,15.797C11.38,15.797 10.771,15.959 10.233,16.266C9.696,16.573 9.247,17.015 8.932,17.548C8.901,17.608 8.858,17.661 8.806,17.704C8.754,17.746 8.693,17.778 8.628,17.797C8.564,17.815 8.496,17.821 8.429,17.813C8.362,17.805 8.297,17.783 8.239,17.749C8.181,17.716 8.13,17.67 8.089,17.616C8.049,17.563 8.02,17.501 8.004,17.435C7.988,17.37 7.985,17.302 7.996,17.235C8.007,17.169 8.031,17.105 8.067,17.048C8.552,16.215 9.291,15.56 10.176,15.179C9.678,14.797 9.312,14.27 9.13,13.67C8.947,13.07 8.957,12.428 9.158,11.834C9.36,11.24 9.742,10.724 10.252,10.359C10.761,9.994 11.372,9.797 11.999,9.797C12.626,9.797 13.238,9.994 13.747,10.359C14.257,10.724 14.639,11.24 14.84,11.834C15.042,12.428 15.052,13.07 14.869,13.67C14.687,14.27 14.321,14.797 13.823,15.179C14.708,15.56 15.447,16.215 15.931,17.048ZM11.999,14.799C12.395,14.799 12.781,14.681 13.11,14.462C13.439,14.242 13.696,13.929 13.847,13.564C13.998,13.199 14.038,12.797 13.961,12.409C13.884,12.021 13.693,11.664 13.413,11.385C13.134,11.105 12.777,10.915 12.389,10.837C12.002,10.76 11.599,10.8 11.234,10.951C10.869,11.103 10.556,11.359 10.337,11.688C10.117,12.017 10,12.403 10,12.799C10,13.329 10.21,13.838 10.585,14.213C10.96,14.588 11.469,14.799 11.999,14.799ZM8.5,11.299C8.5,11.166 8.447,11.039 8.353,10.945C8.26,10.852 8.132,10.799 8,10.799C7.719,10.799 7.444,10.72 7.206,10.572C6.968,10.423 6.777,10.211 6.653,9.959C6.53,9.707 6.479,9.426 6.508,9.147C6.536,8.868 6.642,8.602 6.814,8.381C6.986,8.159 7.217,7.99 7.48,7.892C7.743,7.795 8.028,7.774 8.303,7.83C8.577,7.887 8.831,8.019 9.034,8.213C9.237,8.406 9.382,8.653 9.452,8.924C9.485,9.053 9.568,9.163 9.682,9.23C9.797,9.297 9.933,9.317 10.061,9.284C10.19,9.25 10.3,9.168 10.367,9.053C10.435,8.939 10.454,8.803 10.421,8.674C10.323,8.298 10.139,7.949 9.884,7.656C9.628,7.363 9.307,7.133 8.947,6.986C8.587,6.839 8.198,6.778 7.81,6.807C7.422,6.837 7.046,6.957 6.713,7.157C6.379,7.358 6.097,7.633 5.889,7.962C5.681,8.29 5.552,8.663 5.513,9.05C5.474,9.437 5.526,9.828 5.665,10.191C5.804,10.555 6.026,10.881 6.312,11.143C5.633,11.438 5.043,11.905 4.6,12.498C4.521,12.604 4.486,12.738 4.505,12.869C4.524,13 4.594,13.119 4.7,13.198C4.806,13.278 4.939,13.312 5.071,13.294C5.202,13.275 5.32,13.205 5.4,13.099C5.701,12.694 6.094,12.365 6.545,12.139C6.997,11.913 7.495,11.797 8,11.799C8.132,11.799 8.26,11.746 8.353,11.653C8.447,11.559 8.5,11.432 8.5,11.299Z"
android:fillColor="#4E6074"/>
</vector>

8
app/src/main/res/navigation/main_nav_graph.xml
View file

@ -178,7 +178,13 @@
android:id="@+id/debugFragment"
android:name="org.linphone.ui.main.help.fragment.DebugFragment"
android:label="DebugFragment"
tools:layout="@layout/help_debug_fragment" />
tools:layout="@layout/help_debug_fragment" >
<action
android:id="@+id/action_debugFragment_to_conversationsListFragment"
app:destination="@id/conversationsListFragment"
app:popUpTo="@id/helpFragment"
app:popUpToInclusive="true"/>
</fragment>
<fragment
android:id="@+id/accountSettingsFragment"