Skip to content

Commit 2c223fb

Browse files
committed
MainActivity: don't reuse id names across layouts
This causes problems on foldables. Reported-by: Josh Dague <[email protected]> Signed-off-by: Jason A. Donenfeld <[email protected]>
1 parent 0ea6cee commit 2c223fb

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ui/src/main/java/com/wireguard/android/activity/MainActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class MainActivity : BaseActivity(), FragmentManager.OnBackStackChangedListener
8080

8181
R.id.menu_action_edit -> {
8282
supportFragmentManager.commit {
83-
replace(R.id.detail_container, TunnelEditorFragment())
83+
replace(if (isTwoPaneLayout) R.id.detail_container else R.id.list_detail_container, TunnelEditorFragment())
8484
setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
8585
addToBackStack(null)
8686
}
@@ -119,7 +119,7 @@ class MainActivity : BaseActivity(), FragmentManager.OnBackStackChangedListener
119119
} else if (backStackEntries == 0) {
120120
// Create and show a new detail fragment.
121121
fragmentManager.commit {
122-
add(R.id.detail_container, TunnelDetailFragment())
122+
add(if (isTwoPaneLayout) R.id.detail_container else R.id.list_detail_container, TunnelDetailFragment())
123123
setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
124124
addToBackStack(null)
125125
}

ui/src/main/res/layout/main_activity.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
tools:context=".activity.MainActivity">
1212

1313
<androidx.fragment.app.FragmentContainerView
14-
android:id="@+id/detail_container"
14+
android:id="@+id/list_detail_container"
1515
android:name="com.wireguard.android.fragment.TunnelListFragment"
1616
android:layout_width="match_parent"
1717
android:layout_height="match_parent"

0 commit comments

Comments
 (0)