From 7a539b64961c6fb5bbfead37840a21cbaa9b8092 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 20 Jul 2016 14:30:03 +0200
Subject: [PATCH] Fixed missing fragment on tablets after rotation

---
 res/layout-sw533dp-land/main.xml       |  1 -
 res/layout-sw533dp/main.xml            |  1 -
 src/org/linphone/LinphoneActivity.java | 15 +++++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/res/layout-sw533dp-land/main.xml b/res/layout-sw533dp-land/main.xml
index 4ef06a512..1b70202a7 100644
--- a/res/layout-sw533dp-land/main.xml
+++ b/res/layout-sw533dp-land/main.xml
@@ -77,7 +77,6 @@
 
 						<LinearLayout
 							android:id="@+id/fragmentContainer2"
-							android:visibility="gone"
 							android:layout_width="match_parent"
 							android:layout_height="match_parent"
 							android:layout_weight="1"
diff --git a/res/layout-sw533dp/main.xml b/res/layout-sw533dp/main.xml
index a2e3698de..b62e7bdc6 100644
--- a/res/layout-sw533dp/main.xml
+++ b/res/layout-sw533dp/main.xml
@@ -77,7 +77,6 @@
 
 						<LinearLayout
 							android:id="@+id/fragmentContainer2"
-							android:visibility="gone"
 							android:layout_width="match_parent"
 							android:layout_height="match_parent"
 							android:layout_weight="1"
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index c0568fa11..42ce65a73 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -200,6 +200,8 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		currentFragment = nextFragment = FragmentsAvailable.EMPTY;
 		if (savedInstanceState == null) {
 			changeCurrentFragment(FragmentsAvailable.DIALER, getIntent().getExtras());
+		} else {
+			currentFragment = (FragmentsAvailable) savedInstanceState.getSerializable("currentFragment");
 		}
 
 		mListener = new LinphoneCoreListenerBase(){
@@ -1284,6 +1286,12 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 			checkAndRequestReadContactsPermission();
 		}
 	}
+	
+	@Override
+	protected void onSaveInstanceState(Bundle outState) {
+		outState.putSerializable("currentFragment", currentFragment);
+		super.onSaveInstanceState(outState);
+	}
 
 	@Override
 	protected void onResume() {
@@ -1297,6 +1305,13 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		if (lc != null) {
 			lc.addListener(mListener);
 		}
+		
+		if (isTablet()) {
+			LinearLayout ll = (LinearLayout) findViewById(R.id.fragmentContainer2);
+			if (currentFragment == FragmentsAvailable.DIALER) {
+				ll.setVisibility(View.GONE);
+			}
+		}
 
 		refreshAccounts();