Merge branch 'develop'

assets/translations/arrays.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2013-2022 Federico Iosue ([email protected])
+  ~ Copyright (C) 2013-2023 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-2022 Federico Iosue ([email protected])
+  ~ Copyright (C) 2013-2023 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

gradle.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013-2022 Federico Iosue ([email protected])
+# Copyright (C) 2013-2023 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.2.4
-VERSION_CODE=319
+VERSION_NAME=6.2.5
+VERSION_CODE=320
 PACKAGE=it.feio.android.omninotes
 MIN_SDK=21
 TARGET_SDK=31

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013-2022 Federico Iosue ([email protected])
+# Copyright (C) 2013-2023 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-2022 Federico Iosue ([email protected])
+  ~ Copyright (C) 2013-2023 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-2022 Federico Iosue ([email protected])
+  ~ Copyright (C) 2013-2023 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-2022 Federico Iosue ([email protected])
+  ~ Copyright (C) 2013-2023 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

@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2013-2023 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package it.feio.android.omninotes.async.upgrade
+
+
+import it.feio.android.omninotes.testutils.BaseAndroidTestCase
+import it.feio.android.omninotes.utils.FileProviderHelper.getShareableUri
+import it.feio.android.omninotes.utils.StorageHelper.createAttachmentFromUri
+import org.junit.Assert.*
+import org.junit.Test
+import rx.Observable.from
+
+class UpgradeProcessorTest : BaseAndroidTestCase() {
+
+    @Test
+    fun onUpgradeTo625() {
+        // Preparation of database state existent pre-612 version.
+        // Attachment used to be stored with "content://" scheme that allowed sharing but broke backups.
+        val note = createTestNote("t", "c", 1)
+        var attachment = createAttachmentFromUri(testContext, note.attachmentsList[0].uri)
+        attachment?.uri = getShareableUri(attachment)
+        note.attachmentsList[0] = attachment
+        dbHelper.updateNote(note, false)
+
+        assertFalse(from(dbHelper.allAttachments).all { a -> a.uri.scheme != "content" }.toBlocking().single())
+
+        UpgradeProcessor.process(624, 625)
+
+        assertTrue(from(dbHelper.allAttachments).all { a -> a.uri.scheme != "content" }.toBlocking().single())
+    }
+
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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/exceptions/TestException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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/NoteListMenuTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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/RecurrenceRuleTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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/RemindersLifecycleTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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/SearchTagBackArrowTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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/SettingsActivityTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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/utils/BitmapHelperTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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/utils/ClickWithoutDisplayConstraint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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/utils/FileProviderHelperTest.kt

@@ -52,7 +52,7 @@ class FileProviderHelperTest : BaseAndroidTestCase() {
 
         val res = FileProviderHelper.getShareableUri(attachment)
 
-        assertEquals(uri, res)
+        assertEquals(uri, res.toString())
     }
 
 }

omniNotes/src/androidTest/java/it/feio/android/omninotes/utils/GeocodeHelperTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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/utils/IsEqualTrimmingAndIgnoringCase.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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/utils/MiscUtilsTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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/utils/ParcelableUtilTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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/utils/ReminderHelperTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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/utils/SecurityTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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/utils/ShortcutHelperTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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/utils/StorageHelperTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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/utils/VisibleViewMatcher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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/utils/date/RecurrenceHelperTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2022 Federico Iosue ([email protected])
+ * Copyright (C) 2013-2023 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/beta/res/values/strings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2013-2022 Federico Iosue ([email protected])
+  ~ Copyright (C) 2013-2023 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