Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b901b818 authored by cketti's avatar cketti Committed by GitHub
Browse files

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

Continue to support old 'search' extra in MessageList Intent
parents ea7af813 5485f7a1

k9mail/src/main/java/com/fsck/k9/activity/MessageList.java

+8 −2
Original line number Diff line number Diff line
@@ -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";
@@ -431,6 +434,9 @@ public class MessageList extends K9Activity implements MessageListFragmentListen 
                    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) ?