wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2380 from k9mail/GH-2282_fix_crash_with_old_intent_extra

Browse source 
Continue to support old 'search' extra in MessageList Intent
This commit is contained in:
cketti 2017-03-14 14:21:07 +01:00 committed by GitHub
commit b901b81882
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
k9mail/src/main/java/com/fsck/k9/activity/MessageList.java
View file

@ -72,8 +72,11 @@ public class MessageList extends K9Activity implements MessageListFragmentListen
MessageViewFragmentListener, OnBackStackChangedListener, OnSwipeGestureListener, MessageViewFragmentListener, OnBackStackChangedListener, OnSwipeGestureListener,
OnSwitchCompleteListener { OnSwitchCompleteListener {
// for this activity @Deprecated
private static final String EXTRA_SEARCH = "search"; //TODO: Remove after 2017-09-11
private static final String EXTRA_SEARCH_OLD = "search";
private static final String EXTRA_SEARCH = "search_bytes";
private static final String EXTRA_NO_THREADING = "no_threading"; private static final String EXTRA_NO_THREADING = "no_threading";
private static final String ACTION_SHORTCUT = "shortcut"; private static final String ACTION_SHORTCUT = "shortcut";
@ -431,6 +434,9 @@ public class MessageList extends K9Activity implements MessageListFragmentListen
mSearch.addAccountUuid(LocalSearch.ALL_ACCOUNTS); mSearch.addAccountUuid(LocalSearch.ALL_ACCOUNTS);
} }
} }
} else if (intent.hasExtra(EXTRA_SEARCH_OLD)) {
mSearch = intent.getParcelableExtra(EXTRA_SEARCH_OLD);
mNoThreading = intent.getBooleanExtra(EXTRA_NO_THREADING, false);
} else { } else {
// regular LocalSearch object was passed // regular LocalSearch object was passed
mSearch = intent.hasExtra(EXTRA_SEARCH) ? mSearch = intent.hasExtra(EXTRA_SEARCH) ?