From 2fb0edc853ad3c13d64c974aaed5084f7ec51f85 Mon Sep 17 00:00:00 2001 From: Stefan Niedermann Date: Wed, 3 Jun 2020 13:07:11 +0200 Subject: [PATCH 1/3] Update changelog --- fastlane/metadata/android/en-US/changelogs/2013000.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fastlane/metadata/android/en-US/changelogs/2013000.txt b/fastlane/metadata/android/en-US/changelogs/2013000.txt index bc44322e..dabec3af 100644 --- a/fastlane/metadata/android/en-US/changelogs/2013000.txt +++ b/fastlane/metadata/android/en-US/changelogs/2013000.txt @@ -1 +1,2 @@ -- 📩 Bulk share content of multiple notes \ No newline at end of file +- 📩 Bulk share content of multiple notes +- 🔧 Move note list widget preferences to database (#832) \ No newline at end of file From 5f57fbec04ddc7bd5edb6dee026c5657a1a80b28 Mon Sep 17 00:00:00 2001 From: Stefan Niedermann Date: Thu, 4 Jun 2020 15:54:26 +0200 Subject: [PATCH 2/3] Fix Android instrumented tests --- .../notes/persistence/NotesDatabaseTest.java | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/app/src/androidTest/java/it/niedermann/owncloud/notes/persistence/NotesDatabaseTest.java b/app/src/androidTest/java/it/niedermann/owncloud/notes/persistence/NotesDatabaseTest.java index 86185325..06bffde9 100644 --- a/app/src/androidTest/java/it/niedermann/owncloud/notes/persistence/NotesDatabaseTest.java +++ b/app/src/androidTest/java/it/niedermann/owncloud/notes/persistence/NotesDatabaseTest.java @@ -1,14 +1,5 @@ package it.niedermann.owncloud.notes.persistence; -import it.niedermann.owncloud.notes.model.Capabilities; -import it.niedermann.owncloud.notes.model.CloudNote; -import it.niedermann.owncloud.notes.model.DBNote; -import it.niedermann.owncloud.notes.model.DBStatus; -import it.niedermann.owncloud.notes.model.LocalAccount; -import it.niedermann.owncloud.notes.model.NavigationAdapter; -import it.niedermann.owncloud.notes.persistence.NotesDatabase; -import it.niedermann.owncloud.notes.util.NoteUtil; - import android.content.Context; import android.util.Log; @@ -25,15 +16,27 @@ import org.junit.runners.MethodSorters; import java.lang.reflect.Method; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; -import java.util.Collections; import java.util.Date; import java.util.List; -import java.util.ArrayList; import java.util.TimeZone; -import static org.junit.Assert.*; +import it.niedermann.owncloud.notes.model.Capabilities; +import it.niedermann.owncloud.notes.model.CloudNote; +import it.niedermann.owncloud.notes.model.DBNote; +import it.niedermann.owncloud.notes.model.DBStatus; +import it.niedermann.owncloud.notes.model.LocalAccount; +import it.niedermann.owncloud.notes.model.NavigationAdapter; +import it.niedermann.owncloud.notes.util.NoteUtil; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** @@ -203,7 +206,7 @@ public class NotesDatabaseTest { @Test public void test_04_getCategories() { - List categories = db.getCategories(account.getId()); + List categories = db.getCategories(account.getId()); boolean exitFlag = false; for (NavigationAdapter.NavigationItem categoryItem : categories) { Log.i("Test_04_getCategories_Item", String.format("%s | %s | %d | %d", categoryItem.id, categoryItem.label, categoryItem.count, categoryItem.icon)); @@ -216,7 +219,7 @@ public class NotesDatabaseTest { @Test public void test_05_searchCategories() { - List categories = db.searchCategories(account.getId(), "Dia"); + List categories = db.searchCategories(account.getId(), "Dia"); boolean exitFlag = false; for (NavigationAdapter.NavigationItem categoryItem : categories) { Log.i("Test_05_searchCategories_Dia", String.format("%s | %s | %d | %d", categoryItem.id, categoryItem.label, categoryItem.count, categoryItem.icon)); @@ -352,7 +355,7 @@ public class NotesDatabaseTest { @Test public void test_09_multiGetCategories() { - List categories = db.getCategories(account.getId()); + List categories = db.getCategories(account.getId()); int count = 0; for (NavigationAdapter.NavigationItem categoryItem : categories) { Log.i("Test_09_multiGetCategories_Item", String.format("%s | %s | %d | %d", categoryItem.id, categoryItem.label, categoryItem.count, categoryItem.icon)); @@ -365,7 +368,7 @@ public class NotesDatabaseTest { @Test public void test_10_multiSearchCategories() { - List categories = db.searchCategories(account.getId(), "M"); + List categories = db.searchCategories(account.getId(), "M"); int count = 0; for (NavigationAdapter.NavigationItem categoryItem : categories) { Log.i("Test_10_multiSearchCategories_Item", String.format("%s | %s | %d | %d", categoryItem.id, categoryItem.label, categoryItem.count, categoryItem.icon)); @@ -474,7 +477,7 @@ public class NotesDatabaseTest { Log.i("Test_12_Chinese", "Size: " + notes.size()); assertEquals(1, notes.size()); - List categories = db.getCategories(account.getId()); + List categories = db.getCategories(account.getId()); boolean exitFlag = false; for (NavigationAdapter.NavigationItem categoryItem : categories) { Log.i("Test_12_Chinese_Item", String.format("%s | %s | %d | %d", categoryItem.id, categoryItem.label, categoryItem.count, categoryItem.icon)); @@ -516,7 +519,7 @@ public class NotesDatabaseTest { String.class); method.setAccessible(true); - List categories = db.getCategories(account.getId()); + List categories = db.getCategories(account.getId()); int count = 0; for (NavigationAdapter.NavigationItem categoryItem : categories) { Log.i("Test_13_getCategoryIdByTitle", String.format("%s | %s | %d | %d", From be61d512c06d58b0f92cf58f8f4892d7b8caee2c Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Thu, 4 Jun 2020 03:31:21 +0000 Subject: [PATCH 3/3] [tx-robot] updated from transifex --- app/src/main/res/values-cs-rCZ/strings.xml | 2 ++ app/src/main/res/values-de/strings.xml | 2 ++ app/src/main/res/values-el/strings.xml | 2 ++ app/src/main/res/values-es/strings.xml | 2 ++ app/src/main/res/values-fr/strings.xml | 2 ++ app/src/main/res/values-gl/strings.xml | 2 ++ app/src/main/res/values-it/strings.xml | 2 ++ app/src/main/res/values-pl/strings.xml | 2 ++ app/src/main/res/values-pt-rBR/strings.xml | 2 ++ app/src/main/res/values-sk-rSK/strings.xml | 2 ++ 10 files changed, 20 insertions(+) diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index be87cc6a..5c06044e 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -150,6 +150,8 @@ Přidáno „%1$s“ Sdílený text je prázdný Připojit k poznámce + Sdílet obsah %1$d poznámek + Otevřít v režimu úprav diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 9f7cd138..49a31eaf 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -150,6 +150,8 @@ „%1$s“ hinzugefügt Der geteilte Text war ohne Inhalt An Notiz anhängen + Inhalt von %1$d Notizen teilen + Im Bearbeitungsmodus öffnen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 9f84a168..df7f3106 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -150,6 +150,8 @@ Προστέθηκε \"%1$s\" Το κοινόχρηστο κείμενο είναι κενό Προσάρτηση στη σημείωση + Κοινόχρηστο περιεχόμενο από %1$d σημειώσεις + Άνοιγμα σε λειτουργία τροποποίησης diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 2e3e982f..8ad88e86 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -150,6 +150,8 @@ Se ha añadido «%1$s» El texto compartido estaba vacío Añadir a la nota + Compartido contenido de %1$d notas + Abrir en modo edición diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f44ae087..24139e52 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -150,6 +150,8 @@ \"%1$s\" ajouté Le texte partagé est vide Ajouter à la note + Partager le contenu de %1$d notes + Ouvrir en mode édition diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 4521249e..e456654c 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -150,6 +150,8 @@ Engadido «%1$s» O texto compartido estaba baleiro Anexo á nota + Compartir o contido de %1$dnotas + Abrir en modo de edición diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index cc018527..05f4f912 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -150,6 +150,8 @@ Aggiunto \"%1$s\" Il testo condiviso era vuoto Aggiungi a nota + Condividi il contenuto di %1$d note + Apri in modalità modifica diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 2c5eeb4d..72a607f1 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -150,6 +150,8 @@ Dodano \"%1$s\" Udostępniony tekst był pusty Dołącz do notatki + Udostępnij treść notatki %1$d + Otwórz w trybie edycji diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 023b2bed..2e257bd9 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -150,6 +150,8 @@ \"%1$s\" adicionado O texto compartilhado estava vazio Anexar à nota + Compartilhar o conteúdo de %1$d notas + Abrir em modo de edição diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml index 751efb9f..0d1c8630 100644 --- a/app/src/main/res/values-sk-rSK/strings.xml +++ b/app/src/main/res/values-sk-rSK/strings.xml @@ -150,6 +150,8 @@ Pridané \"%1$s\" Zdieľaný text bol prázdny Pripojiť k poznámke + Zdieľať obsah %1$d poznámok + Otvoriť v režime úprav