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

Unverified Commit 1dd74bb7 authored by Niedermann IT-Dienstleistungen's avatar Niedermann IT-Dienstleistungen Committed by GitHub
Browse files

Merge pull request #586 from stefan-niedermann/fix-search 

fix search in category
parents 3160fba8 3b614938

app/src/main/java/it/niedermann/owncloud/notes/persistence/LoadNotesListTask.java

+0 −9
Original line number Diff line number Diff line
@@ -60,15 +60,6 @@ public class LoadNotesListTask extends AsyncTask<Void, Void, List<Item>> { 


            dbNote.setTitle(Html.toHtml(spannableString));



            spannableString = new SpannableString(dbNote.getCategory());

            matcher = Pattern.compile("(" + searchQuery + ")", Pattern.CASE_INSENSITIVE).matcher(spannableString);

            while (matcher.find()) {

                spannableString.setSpan(new ForegroundColorSpan(context.getResources().getColor(R.color.primary_dark)),

                        matcher.start(), matcher.end(), 0);

            }



            dbNote.setCategory(Html.toHtml(spannableString));



            spannableString = new SpannableString(dbNote.getExcerpt());

            matcher = Pattern.compile("(" + searchQuery + ")", Pattern.CASE_INSENSITIVE).matcher(spannableString);

            while (matcher.find()) {

app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteSQLiteOpenHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ public class NoteSQLiteOpenHelper extends SQLiteOpenHelper { 
        }



        if (category != null) {

            where.add(key_category + "=? OR " + key_category + " LIKE ?");

            where.add("(" + key_category + "=? OR " + key_category + " LIKE ? )");

            args.add(category);

            args.add(category + "/%");

        }