diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-03-31 22:09:22 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-03-31 22:12:10 +0200 |
| commit | a7af64cbeb43214351bbf9557e7e78f2dd295f51 (patch) | |
| tree | 832f8e2212432934c68b094aea1673f5aa88b5f4 /src/main/java/de/pixart/messenger/ui/ConversationsOverviewFragment.java | |
| parent | 6cfb99ae03a5ea8c992db099caa28ab79b0fbfce (diff) | |
integrate qr code scanner. temporarily break omemo activity scan
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/ConversationsOverviewFragment.java')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationsOverviewFragment.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationsOverviewFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationsOverviewFragment.java index 35e1e02b7..476cc267d 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationsOverviewFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationsOverviewFragment.java @@ -144,7 +144,10 @@ public class ConversationsOverviewFragment extends XmppFragment { @Override public void onSaveInstanceState(Bundle bundle) { super.onSaveInstanceState(bundle); - bundle.putParcelable(STATE_SCROLL_POSITION, getScrollState()); + ScrollState scrollState = getScrollState(); + if (scrollState != null) { + bundle.putParcelable(STATE_SCROLL_POSITION, scrollState); + } } private ScrollState getScrollState() { |