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

Commit c011a19a authored by Stefan Niedermann's avatar Stefan Niedermann Committed by Niedermann IT-Dienstleistungen
Browse files

Fix test package ids

parent 214b69ce

app/src/androidTest/java/it/niedermann/nextcloud/deck/ExampleInstrumentedTest.java→app/src/androidTest/java/it/niedermann/owncloud/notes/persistence/ExampleInstrumentedTest.java

+1 −1
Original line number Original line Diff line number Diff line 
package it.niedermann.nextcloud.deck;

package it.niedermann.owncloud.notes.persistence;





import android.content.Context;

import android.content.Context;

app/src/androidTest/java/it/niedermann/nextcloud/deck/util/ColorUtilTest.java→app/src/androidTest/java/it/niedermann/owncloud/notes/persistence/util/ColorUtilTest.java

+1 −1
Original line number Original line Diff line number Diff line 
package it.niedermann.nextcloud.deck.util;

package it.niedermann.owncloud.notes.persistence.util;





import android.graphics.Color;

import android.graphics.Color;

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

+9 −1
Original line number Original line Diff line number Diff line
@@ -358,9 +358,17 @@ public class NotesDatabase extends AbstractNotesDatabase { 




        String order = category == null ? default_order : key_category + ", " + key_title;

        String order = category == null ? default_order : key_category + ", " + key_title;

        // TODO: modify here, need to test

        // TODO: modify here, need to test

//        if (sortingMethod != null) {

//            order = key_favorite + " DESC," + sortingMethod.getSorder();

//        }

        if (sortingMethod != null) {

        if (sortingMethod != null) {

            if (category != null) {

                order = key_category + "," + key_favorite + " DESC," + sortingMethod.getSorder(); // Edited

            } else {

                order = key_favorite + " DESC," + sortingMethod.getSorder();

                order = key_favorite + " DESC," + sortingMethod.getSorder();

            }

            }

        }

        Log.e(TAG, "ORDER:::: " + order);

        return getNotesCustom(accountId, TextUtils.join(" AND ", where), args.toArray(new String[]{}), order, true);

        return getNotesCustom(accountId, TextUtils.join(" AND ", where), args.toArray(new String[]{}), order, true);

    }

    }