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

Fixed crash in nav graph due to update required for Android 12

Browse source
This commit is contained in:
Sylvain Berfini 2021-09-09 15:02:31 +02:00
parent 9813c905c9
commit 9a87851583
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -307,7 +307,7 @@ class MainActivity : GenericActivity(), SnackBarActivity, NavController.OnDestin
"linphone-android://chat-room/$localAddress/$peerAddress" "linphone-android://chat-room/$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")
"linphone-android://chat/" "linphone-android://chat-room/"
} }
findNavController(R.id.nav_host_fragment).navigate(Uri.parse(deepLink)) findNavController(R.id.nav_host_fragment).navigate(Uri.parse(deepLink))
} }
@ -451,7 +451,7 @@ class MainActivity : GenericActivity(), SnackBarActivity, NavController.OnDestin
Log.i("[Main Activity] Found shortcut ID: $shortcutId") Log.i("[Main Activity] Found shortcut ID: $shortcutId")
handleLocusOrShortcut(shortcutId) handleLocusOrShortcut(shortcutId)
} else { } else {
val deepLink = "linphone-android://chat/" val deepLink = "linphone-android://chat-room/"
Log.i("[Main Activity] Starting deep link: $deepLink") Log.i("[Main Activity] Starting deep link: $deepLink")
findNavController(R.id.nav_host_fragment).navigate(Uri.parse(deepLink)) findNavController(R.id.nav_host_fragment).navigate(Uri.parse(deepLink))
} }

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

@ -22,15 +22,13 @@
<argument <argument
android:name="LocalSipUri" android:name="LocalSipUri"
app:argType="string" app:argType="string"
android:defaultValue="@null"
app:nullable="true" /> app:nullable="true" />
<argument <argument
android:name="RemoteSipUri" android:name="RemoteSipUri"
app:argType="string" app:argType="string"
android:defaultValue="@null"
app:nullable="true" /> app:nullable="true" />
<deepLink
android:id="@+id/chatsDeepLink"
app:uri="linphone-android://chat/"
android:autoVerify="true" />
<deepLink <deepLink
android:id="@+id/chatRoomDeepLink" android:id="@+id/chatRoomDeepLink"
app:uri="linphone-android://chat-room/{LocalSipUri}/{RemoteSipUri}" app:uri="linphone-android://chat-room/{LocalSipUri}/{RemoteSipUri}"
@ -53,10 +51,6 @@
<action <action
android:id="@+id/action_masterContactsFragment_to_masterChatRoomsFragment" android:id="@+id/action_masterContactsFragment_to_masterChatRoomsFragment"
app:destination="@id/masterChatRoomsFragment" /> app:destination="@id/masterChatRoomsFragment" />
<argument
android:name="id"
app:argType="string"
app:nullable="true" />
<deepLink <deepLink
android:id="@+id/contactDeepLink" android:id="@+id/contactDeepLink"
app:uri="linphone-android://contact/view/{id}" app:uri="linphone-android://contact/view/{id}"