Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Forgot to replace 2 calls to findNavController in MainActivity

Browse source
This commit is contained in:
Sylvain Berfini 2021-11-15 14:08:12 +01:00
parent 1b5fc47e7a
commit 07b37f03f6
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/linphone/activities/Navigation.kt
View file

@ -47,7 +47,6 @@ import org.linphone.activities.main.settings.fragments.*
import org.linphone.activities.main.sidemenu.fragments.SideMenuFragment import org.linphone.activities.main.sidemenu.fragments.SideMenuFragment
import org.linphone.contact.NativeContact import org.linphone.contact.NativeContact
import org.linphone.core.Address import org.linphone.core.Address
import org.linphone.core.tools.Log
internal fun Fragment.findMasterNavController(): NavController { internal fun Fragment.findMasterNavController(): NavController {
return parentFragment?.parentFragment?.findNavController() ?: findNavController() return parentFragment?.parentFragment?.findNavController() ?: findNavController()
@ -83,7 +82,6 @@ internal fun MainActivity.navigateToChatRooms(args: Bundle? = null) {
internal fun MainActivity.navigateToChatRoom(localAddress: String?, peerAddress: String?) { internal fun MainActivity.navigateToChatRoom(localAddress: String?, peerAddress: String?) {
val deepLink = "linphone-android://chat-room/$localAddress/$peerAddress" val deepLink = "linphone-android://chat-room/$localAddress/$peerAddress"
Log.i("[Main Activity] Starting deep link: $deepLink")
findNavController(R.id.nav_host_fragment).navigate( findNavController(R.id.nav_host_fragment).navigate(
Uri.parse(deepLink), Uri.parse(deepLink),
popupTo(R.id.masterChatRoomsFragment, true) popupTo(R.id.masterChatRoomsFragment, true)
@ -92,7 +90,6 @@ internal fun MainActivity.navigateToChatRoom(localAddress: String?, peerAddress:
internal fun MainActivity.navigateToContact(contactId: String?) { internal fun MainActivity.navigateToContact(contactId: String?) {
val deepLink = "linphone-android://contact/view/$contactId" val deepLink = "linphone-android://contact/view/$contactId"
Log.i("[Main Activity] Starting deep link: $deepLink")
findNavController(R.id.nav_host_fragment).navigate( findNavController(R.id.nav_host_fragment).navigate(
Uri.parse(deepLink), Uri.parse(deepLink),
popupTo(R.id.masterContactsFragment, true) popupTo(R.id.masterContactsFragment, true)

9
app/src/main/java/org/linphone/activities/main/MainActivity.kt
View file

@ -282,6 +282,7 @@ class MainActivity : GenericActivity(), SnackBarActivity, NavController.OnDestin
when { when {
intent.hasExtra("ContactId") -> { intent.hasExtra("ContactId") -> {
val id = intent.getStringExtra("ContactId") val id = intent.getStringExtra("ContactId")
Log.i("[Main Activity] Found contact ID in extras: $id")
navigateToContact(id) navigateToContact(id)
} }
intent.hasExtra("Chat") -> { intent.hasExtra("Chat") -> {
@ -291,10 +292,10 @@ class MainActivity : GenericActivity(), SnackBarActivity, NavController.OnDestin
val peerAddress = intent.getStringExtra("RemoteSipUri") val peerAddress = intent.getStringExtra("RemoteSipUri")
val localAddress = intent.getStringExtra("LocalSipUri") val localAddress = intent.getStringExtra("LocalSipUri")
Log.i("[Main Activity] Found chat room intent extra: local SIP URI=[$localAddress], peer SIP URI=[$peerAddress]") Log.i("[Main Activity] Found chat room intent extra: local SIP URI=[$localAddress], peer SIP URI=[$peerAddress]")
findNavController(R.id.nav_host_fragment).navigate(Uri.parse("linphone-android://chat-room/$localAddress/$peerAddress")) navigateToChatRoom(localAddress, peerAddress)
} else { } else {
Log.i("[Main Activity] Found chat intent extra, go to chat rooms list") Log.i("[Main Activity] Found chat intent extra, go to chat rooms list")
findNavController(R.id.nav_host_fragment).navigate(R.id.action_global_masterChatRoomsFragment) navigateToChatRooms()
} }
} }
intent.hasExtra("Dialer") -> { intent.hasExtra("Dialer") -> {
@ -428,6 +429,7 @@ class MainActivity : GenericActivity(), SnackBarActivity, NavController.OnDestin
val localAddress = val localAddress =
coreContext.core.defaultAccount?.params?.identityAddress?.asStringUriOnly() coreContext.core.defaultAccount?.params?.identityAddress?.asStringUriOnly()
val peerAddress = coreContext.core.interpretUrl(addressToIM)?.asStringUriOnly() val peerAddress = coreContext.core.interpretUrl(addressToIM)?.asStringUriOnly()
Log.i("[Main Activity] Navigating to chat room with local [$localAddress] and peer [$peerAddress] addresses")
navigateToChatRoom(localAddress, peerAddress) navigateToChatRoom(localAddress, peerAddress)
} else { } else {
val shortcutId = intent.getStringExtra("android.intent.extra.shortcut.ID") // Intent.EXTRA_SHORTCUT_ID val shortcutId = intent.getStringExtra("android.intent.extra.shortcut.ID") // Intent.EXTRA_SHORTCUT_ID
@ -446,9 +448,10 @@ class MainActivity : GenericActivity(), SnackBarActivity, NavController.OnDestin
if (split.size == 2) { if (split.size == 2) {
val localAddress = split[0] val localAddress = split[0]
val peerAddress = split[1] val peerAddress = split[1]
Log.i("[Main Activity] Navigating to chat room with local [$localAddress] and peer [$peerAddress] addresses, computed from shortcut/locus id")
navigateToChatRoom(localAddress, peerAddress) navigateToChatRoom(localAddress, peerAddress)
} else { } else {
Log.e("[Main Activity] Failed to parse shortcut/locus id: $id") Log.e("[Main Activity] Failed to parse shortcut/locus id: $id, going to chat rooms list")
navigateToChatRooms() navigateToChatRooms()
} }
} }