aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/ui/src/main/java/com/wireguard/android
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2025-05-19 17:57:39 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2025-05-19 17:57:39 +0200
commit2c223fb68cabc02ba7f761a87a211a05bb0da6a5 (patch)
tree5c1dfb5fc09495484451a026243017f49069c5cb /ui/src/main/java/com/wireguard/android
parentglobal: add missing xml copyright and opening tag (diff)
downloadwireguard-android-2c223fb68cabc02ba7f761a87a211a05bb0da6a5.tar.xz
wireguard-android-2c223fb68cabc02ba7f761a87a211a05bb0da6a5.zip
MainActivity: don't reuse id names across layouts
This causes problems on foldables. Reported-by: Josh Dague <josh3736@gmail.com> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'ui/src/main/java/com/wireguard/android')
-rw-r--r--ui/src/main/java/com/wireguard/android/activity/MainActivity.kt4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/src/main/java/com/wireguard/android/activity/MainActivity.kt b/ui/src/main/java/com/wireguard/android/activity/MainActivity.kt
index cff17a89..087ca08e 100644
--- a/ui/src/main/java/com/wireguard/android/activity/MainActivity.kt
+++ b/ui/src/main/java/com/wireguard/android/activity/MainActivity.kt
@@ -80,7 +80,7 @@ class MainActivity : BaseActivity(), FragmentManager.OnBackStackChangedListener
R.id.menu_action_edit -> {
supportFragmentManager.commit {
- replace(R.id.detail_container, TunnelEditorFragment())
+ replace(if (isTwoPaneLayout) R.id.detail_container else R.id.list_detail_container, TunnelEditorFragment())
setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
addToBackStack(null)
}
@@ -119,7 +119,7 @@ class MainActivity : BaseActivity(), FragmentManager.OnBackStackChangedListener
} else if (backStackEntries == 0) {
// Create and show a new detail fragment.
fragmentManager.commit {
- add(R.id.detail_container, TunnelDetailFragment())
+ add(if (isTwoPaneLayout) R.id.detail_container else R.id.list_detail_container, TunnelDetailFragment())
setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
addToBackStack(null)
}