Merge remote-tracking branch 'origin/master' into dev_phonenumber

This commit is contained in:
Simon Morlat 2016-09-15 14:55:09 +02:00
commit a89fa37219

View file

@ -1308,9 +1308,16 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
@Override @Override
protected void onSaveInstanceState(Bundle outState) { protected void onSaveInstanceState(Bundle outState) {
outState.putSerializable("currentFragment", currentFragment); outState.putSerializable("currentFragment", currentFragment);
outState.putBoolean("fetchedContactsOnce", fetchedContactsOnce);
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
} }
@Override
protected void onRestoreInstanceState(Bundle savedInstanceState) {
super.onRestoreInstanceState(savedInstanceState);
fetchedContactsOnce = savedInstanceState.getBoolean("fetchedContactsOnce");
}
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();