Merge branch 'master' into branding

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<NavigationAdapter.NavigationItem> categories = db.getCategories(account.getId());
+        List<NavigationAdapter.CategoryNavigationItem> 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<NavigationAdapter.NavigationItem> categories = db.searchCategories(account.getId(), "Dia");
+        List<NavigationAdapter.CategoryNavigationItem> 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<NavigationAdapter.NavigationItem> categories = db.getCategories(account.getId());
+        List<NavigationAdapter.CategoryNavigationItem> 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<NavigationAdapter.NavigationItem> categories = db.searchCategories(account.getId(), "M");
+        List<NavigationAdapter.CategoryNavigationItem> 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<NavigationAdapter.NavigationItem> categories = db.getCategories(account.getId());
+        List<NavigationAdapter.CategoryNavigationItem> 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<NavigationAdapter.NavigationItem> categories = db.getCategories(account.getId());
+            List<NavigationAdapter.CategoryNavigationItem> categories = db.getCategories(account.getId());
             int count = 0;
             for (NavigationAdapter.NavigationItem categoryItem : categories) {
                 Log.i("Test_13_getCategoryIdByTitle", String.format("%s | %s | %d | %d",

app/src/main/res/values-cs-rCZ/strings.xml

@@ -150,6 +150,8 @@
     <string name="added_content">Přidáno „%1$s“</string>
     <string name="shared_text_empty">Sdílený text je prázdný</string>
     <string name="append_to_note">Připojit k poznámce</string>
+    <string name="share_multiple">Sdílet obsah %1$d poznámek</string>
+
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
         <item>Otevřít v režimu úprav</item>

app/src/main/res/values-de/strings.xml

@@ -150,6 +150,8 @@
     <string name="added_content">„%1$s“ hinzugefügt</string>
     <string name="shared_text_empty">Der geteilte Text war ohne Inhalt</string>
     <string name="append_to_note">An Notiz anhängen</string>
+    <string name="share_multiple">Inhalt von %1$d Notizen teilen</string>
+
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
         <item>Im Bearbeitungsmodus öffnen</item>

app/src/main/res/values-el/strings.xml

@@ -150,6 +150,8 @@
     <string name="added_content">Προστέθηκε \"%1$s\"</string>
     <string name="shared_text_empty">Το κοινόχρηστο κείμενο είναι κενό</string>
     <string name="append_to_note">Προσάρτηση στη σημείωση</string>
+    <string name="share_multiple">Κοινόχρηστο περιεχόμενο από %1$d σημειώσεις</string>
+
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
         <item>Άνοιγμα σε λειτουργία τροποποίησης</item>

app/src/main/res/values-es/strings.xml

@@ -150,6 +150,8 @@
     <string name="added_content">Se ha añadido «%1$s»</string>
     <string name="shared_text_empty">El texto compartido estaba vacío</string>
     <string name="append_to_note">Añadir a la nota</string>
+    <string name="share_multiple">Compartido contenido de %1$d notas</string>
+
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
         <item>Abrir en modo edición</item>

app/src/main/res/values-fr/strings.xml

@@ -150,6 +150,8 @@
     <string name="added_content">\"%1$s\" ajouté</string>
     <string name="shared_text_empty">Le texte partagé est vide</string>
     <string name="append_to_note">Ajouter à la note</string>
+    <string name="share_multiple">Partager le contenu de %1$d notes</string>
+
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
         <item>Ouvrir en mode édition</item>

app/src/main/res/values-gl/strings.xml

@@ -150,6 +150,8 @@
     <string name="added_content">Engadido «%1$s»</string>
     <string name="shared_text_empty">O texto compartido estaba baleiro</string>
     <string name="append_to_note">Anexo á nota</string>
+    <string name="share_multiple">Compartir o contido de  %1$dnotas</string>
+
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
         <item>Abrir en modo de edición</item>

app/src/main/res/values-it/strings.xml

@@ -150,6 +150,8 @@
     <string name="added_content">Aggiunto \"%1$s\"</string>
     <string name="shared_text_empty">Il testo condiviso era vuoto</string>
     <string name="append_to_note">Aggiungi a nota</string>
+    <string name="share_multiple">Condividi il contenuto di %1$d note</string>
+
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
         <item>Apri in modalità modifica</item>

app/src/main/res/values-pl/strings.xml

@@ -150,6 +150,8 @@
     <string name="added_content">Dodano \"%1$s\"</string>
     <string name="shared_text_empty">Udostępniony tekst był pusty</string>
     <string name="append_to_note">Dołącz do notatki</string>
+    <string name="share_multiple">Udostępnij treść notatki %1$d</string>
+
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
         <item>Otwórz w trybie edycji</item>

app/src/main/res/values-pt-rBR/strings.xml

@@ -150,6 +150,8 @@
     <string name="added_content">\"%1$s\" adicionado</string>
     <string name="shared_text_empty">O texto compartilhado estava vazio</string>
     <string name="append_to_note">Anexar à nota</string>
+    <string name="share_multiple">Compartilhar o conteúdo de %1$d notas</string>
+
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
         <item>Abrir em modo de edição</item>

app/src/main/res/values-sk-rSK/strings.xml

@@ -150,6 +150,8 @@
     <string name="added_content">Pridané \"%1$s\"</string>
     <string name="shared_text_empty">Zdieľaný text bol prázdny</string>
     <string name="append_to_note">Pripojiť k poznámke</string>
+    <string name="share_multiple">Zdieľať obsah %1$d poznámok</string>
+
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
         <item>Otvoriť v režime úprav</item>

fastlane/metadata/android/en-US/changelogs/2013000.txt

@@ -1 +1,2 @@
 - 📩 Bulk share content of multiple notes
+- 🔧 Move note list widget preferences to database (#832)