Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Continue to support old 'search' extra in MessageList Intent #2380

Merged
merged 1 commit into from Mar 14, 2017
Merged

Continue to support old 'search' extra in MessageList Intent #2380

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions k9mail/src/main/java/com/fsck/k9/activity/MessageList.java
View file
Open in desktop
Expand Up @@ -72,8 +72,11 @@ public class MessageList extends K9Activity implements MessageListFragmentListen
MessageViewFragmentListener, OnBackStackChangedListener, OnSwipeGestureListener,
OnSwitchCompleteListener {

// for this activity
private static final String EXTRA_SEARCH = "search";
@Deprecated
//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 ACTION_SHORTCUT = "shortcut";
Expand Down Expand Up @@ -431,6 +434,9 @@ private boolean decodeExtras(Intent intent) {
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 {
// regular LocalSearch object was passed
mSearch = intent.hasExtra(EXTRA_SEARCH) ?
Expand Down