Merge branch 'develop' into improvement/camera_permission

README.md

@@ -139,7 +139,7 @@ Notice that in this case I specified a single flavor to run tests on. This could
 ## License
 
 
-    Copyright 2013-2022 Federico Iosue
+    Copyright 2013-2024 Federico Iosue
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

assets/translations/arrays.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2013-2023 Federico Iosue ([email protected])
+  ~ Copyright (C) 2013-2024 Federico Iosue ([email protected])
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by

assets/translations/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  ~ Copyright (C) 2013-2023 Federico Iosue ([email protected])
+  ~ Copyright (C) 2013-2024 Federico Iosue ([email protected])
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by

build.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2020 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2024 Federico Iosue ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.1'
+        classpath 'com.android.tools.build:gradle:8.3.0'
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.2.0"
         classpath 'com.adarshr:gradle-test-logger-plugin:2.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10"

gradle.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013-2023 Federico Iosue ([email protected])
+# Copyright (C) 2013-2024 Federico Iosue ([email protected])
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,8 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-VERSION_NAME=6.3.1
-VERSION_CODE=331
+VERSION_NAME=6.3.2
+VERSION_CODE=332
 PACKAGE=it.feio.android.omninotes
 MIN_SDK=21
 TARGET_SDK=33

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013-2023 Federico Iosue ([email protected])
+# Copyright (C) 2013-2024 Federico Iosue ([email protected])
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip

gradlew

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 #
-# Copyright (C) 2013-2022 Federico Iosue ([email protected])
+# Copyright (C) 2013-2024 Federico Iosue ([email protected])
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

omniNotes/build.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2020 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2024 Federico Iosue ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

omniNotes/lint.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2013-2023 Federico Iosue ([email protected])
+  ~ Copyright (C) 2013-2024 Federico Iosue ([email protected])
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by

omniNotes/src/alpha/java/it/feio/android/omninotes/helpers/GeocodeProviderFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2020 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2024 Federico Iosue ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

omniNotes/src/alpha/java/it/feio/android/omninotes/utils/Constants.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2020 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2024 Federico Iosue ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

omniNotes/src/alpha/res/values/strings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2013-2023 Federico Iosue ([email protected])
+  ~ Copyright (C) 2013-2024 Federico Iosue ([email protected])
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by

omniNotes/src/alpha/res/xml/shortcuts.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2013-2023 Federico Iosue ([email protected])
+  ~ Copyright (C) 2013-2024 Federico Iosue ([email protected])
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by

omniNotes/src/androidTest/java/it/feio/android/omninotes/async/upgrade/UpgradeProcessorTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2023 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2024 Federico Iosue ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

omniNotes/src/androidTest/java/it/feio/android/omninotes/db/DbHelperTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2023 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2024 Federico Iosue ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,6 +47,27 @@ public void testGetNotesByTag() {
     assertEquals(1, dbHelper.getNotesByTag("#tagged").size());
   }
 
+  @Test
+  public void testGetNotesByTag_excludeLocked() {
+    var titleTag = "#titleTag";
+    var contentTag = "#tag";
+
+    var note1 = new Note();
+    note1.setTitle("simple note with " + titleTag);
+    note1.setContent("content with " + contentTag);
+    dbHelper.updateNote(note1, true);
+    var note2 = new Note();
+    note2.setTitle("protected note with " + titleTag);
+    note2.setContent("content with same tag " + contentTag);
+    note2.setLocked(true);
+    dbHelper.updateNote(note2, true);
+
+    var result = dbHelper.getNotesByTag(contentTag);
+    assertEquals(1, result.size());
+    assertEquals(note1.getTitle(), result.get(0).getTitle());
+    assertEquals(2, dbHelper.getNotesByTag(titleTag).size());
+  }
+
   @Test
   public void getNotesByPatternEscaped() {
     Note note1 = new Note();
@@ -65,4 +86,40 @@ public void getNotesByPatternEscaped() {
     assertEquals(1, dbHelper.getNotesByPattern("%").size());
   }
 
+  @Test
+  public void getNotesByPattern_excludeLocked() {
+    var note1 = new Note();
+    note1.setTitle("title one");
+    note1.setContent("This note is clear");
+    dbHelper.updateNote(note1, true);
+    var note2 = new Note();
+    note2.setTitle("title two");
+    note2.setContent("This note is protected");
+    note2.setLocked(true);
+    dbHelper.updateNote(note2, true);
+
+    var result = dbHelper.getNotesByPattern("This note is ");
+
+    assertEquals(1, result.size());
+    assertEquals(note1.getTitle(), result.get(0).getTitle());
+  }
+
+  @Test
+  public void getTags() {
+    var note1 = new Note();
+    note1.setTitle("title1");
+    note1.setContent("#tag1");
+    dbHelper.updateNote(note1, true);
+    var note2 = new Note();
+    note2.setTitle("title2#");
+    note2.setContent("#tag2");
+    note2.setLocked(true);
+    dbHelper.updateNote(note2, true);
+
+    var tags = dbHelper.getTags();
+
+    assertEquals(1, tags.size());
+    assertEquals(note1.getContent(), tags.get(0).getText());
+  }
+
 }

omniNotes/src/androidTest/java/it/feio/android/omninotes/exceptions/TestException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2023 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2024 Federico Iosue ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

omniNotes/src/androidTest/java/it/feio/android/omninotes/helpers/AppVersionHelperTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2023 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2024 Federico Iosue ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

omniNotes/src/androidTest/java/it/feio/android/omninotes/helpers/BackupHelperTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2023 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2024 Federico Iosue ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

omniNotes/src/androidTest/java/it/feio/android/omninotes/helpers/DocumentFileHelperTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2023 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2024 Federico Iosue ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

omniNotes/src/androidTest/java/it/feio/android/omninotes/helpers/GeocodeProviderBaseFactoryTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2023 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2024 Federico Iosue ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

omniNotes/src/androidTest/java/it/feio/android/omninotes/helpers/IntentHelperTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2023 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2024 Federico Iosue ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

omniNotes/src/androidTest/java/it/feio/android/omninotes/helpers/LanguageHelperTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2023 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2024 Federico Iosue ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

omniNotes/src/androidTest/java/it/feio/android/omninotes/helpers/TagOpenerHelperTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2023 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2024 Federico Iosue ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

omniNotes/src/androidTest/java/it/feio/android/omninotes/helpers/count/CountFactoryTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2023 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2024 Federico Iosue ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

omniNotes/src/androidTest/java/it/feio/android/omninotes/testutils/BaseAndroidTestCase.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2023 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2024 Federico Iosue ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

omniNotes/src/androidTest/java/it/feio/android/omninotes/testutils/NoRealDeviceTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2023 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2024 Federico Iosue ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

omniNotes/src/androidTest/java/it/feio/android/omninotes/testutils/RetryableAssert.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2023 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2024 Federico Iosue ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

omniNotes/src/androidTest/java/it/feio/android/omninotes/ui/AutoBackupTest.java

@@ -1,5 +1,5 @@
 ///*
-// * Copyright (C) 2013-2020 Federico Iosue ([email protected])
+// * Copyright (C) 2013-2024 Federico Iosue ([email protected])
 // *
 // * This program is free software: you can redistribute it and/or modify
 // * it under the terms of the GNU General Public License as published by

omniNotes/src/androidTest/java/it/feio/android/omninotes/ui/BaseEspressoTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2023 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2024 Federico Iosue ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

omniNotes/src/androidTest/java/it/feio/android/omninotes/ui/CategoryLifecycleTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2023 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2024 Federico Iosue ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

omniNotes/src/androidTest/java/it/feio/android/omninotes/ui/DrawerMenusEspressoTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2023 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2024 Federico Iosue ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

omniNotes/src/androidTest/java/it/feio/android/omninotes/ui/FabCameraNoteTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2023 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2024 Federico Iosue ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

omniNotes/src/androidTest/java/it/feio/android/omninotes/ui/FabLifecycleTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2023 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2024 Federico Iosue ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

omniNotes/src/androidTest/java/it/feio/android/omninotes/ui/MrJingleLifecycleTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2023 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2024 Federico Iosue ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

omniNotes/src/androidTest/java/it/feio/android/omninotes/ui/NoteLifecycleTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2023 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2024 Federico Iosue ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by