From 2c223fb68cabc02ba7f761a87a211a05bb0da6a5 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 19 May 2025 17:57:39 +0200 Subject: [PATCH] MainActivity: don't reuse id names across layouts This causes problems on foldables. Reported-by: Josh Dague Signed-off-by: Jason A. Donenfeld --- .../main/java/com/wireguard/android/activity/MainActivity.kt | 4 ++-- ui/src/main/res/layout/main_activity.xml | 2 +- 2 files changed, 3 insertions(+), 3 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) } diff --git a/ui/src/main/res/layout/main_activity.xml b/ui/src/main/res/layout/main_activity.xml index a2bb368c..ab3b7e63 100644 --- a/ui/src/main/res/layout/main_activity.xml +++ b/ui/src/main/res/layout/main_activity.xml @@ -11,7 +11,7 @@ tools:context=".activity.MainActivity">