From 916024060337e676f26a6c885dd735d91e50b5cb Mon Sep 17 00:00:00 2001 From: Patrick Schneider Date: Mon, 5 Feb 2024 16:20:50 +0100 Subject: [PATCH 1/5] [Chore] Updates Backup API to v1.3.0 --- libs/privacy-friendly-backup-api | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/privacy-friendly-backup-api b/libs/privacy-friendly-backup-api index 2548856..8687a8d 160000 --- a/libs/privacy-friendly-backup-api +++ b/libs/privacy-friendly-backup-api @@ -1 +1 @@ -Subproject commit 254885602ee4501a572f56306fbf2b3712cfc834 +Subproject commit 8687a8dbd170866707dc41bcb879375400ef697a From 45b37214f2eda309d992c058fd4bb9430329da4c Mon Sep 17 00:00:00 2001 From: Patrick Schneider Date: Mon, 5 Feb 2024 18:35:38 +0100 Subject: [PATCH 2/5] [Chore] Updates Backup API to v1.3.0 --- app/build.gradle | 15 ++++++++++++--- .../backup/BackupRestorer.kt | 2 +- .../database/PainDiaryDatabase.kt | 12 +++++++----- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8666ad2..8a12400 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,12 +3,12 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 31 + compileSdkVersion 34 defaultConfig { applicationId "org.secuso.privacyfriendlypaindiary" minSdkVersion 21 - targetSdkVersion 31 + targetSdkVersion 34 versionCode 5 versionName "1.3.1" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' @@ -51,7 +51,7 @@ dependencies { implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1" - def room_version = "2.4.2" + def room_version = "2.6.1" implementation "androidx.room:room-runtime:$room_version" annotationProcessor "androidx.room:room-compiler:$room_version" kapt "androidx.room:room-compiler:$room_version" @@ -64,6 +64,15 @@ dependencies { implementation "androidx.work:work-runtime:$work_version" implementation "androidx.work:work-runtime-ktx:$work_version" androidTestImplementation "androidx.work:work-testing:$work_version" + + constraints { + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") { + because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib") + } + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") { + because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib") + } + } } repositories { mavenCentral() diff --git a/app/src/main/java/org/secuso/privacyfriendlypaindiary/backup/BackupRestorer.kt b/app/src/main/java/org/secuso/privacyfriendlypaindiary/backup/BackupRestorer.kt index cd4aa06..7e16ad0 100644 --- a/app/src/main/java/org/secuso/privacyfriendlypaindiary/backup/BackupRestorer.kt +++ b/app/src/main/java/org/secuso/privacyfriendlypaindiary/backup/BackupRestorer.kt @@ -38,7 +38,7 @@ class BackupRestorer : IBackupRestorer { version ).writableDatabase db.beginTransaction() - db.setVersion(version) + db.version = version readDatabaseContent(reader, db) db.setTransactionSuccessful() db.endTransaction() diff --git a/app/src/main/java/org/secuso/privacyfriendlypaindiary/database/PainDiaryDatabase.kt b/app/src/main/java/org/secuso/privacyfriendlypaindiary/database/PainDiaryDatabase.kt index 641db23..a63eafb 100644 --- a/app/src/main/java/org/secuso/privacyfriendlypaindiary/database/PainDiaryDatabase.kt +++ b/app/src/main/java/org/secuso/privacyfriendlypaindiary/database/PainDiaryDatabase.kt @@ -55,11 +55,13 @@ abstract class PainDiaryDatabase : RoomDatabase() { .build() } - private val roomCallback: Callback = object : Callback() { - override fun onCreate(db: SupportSQLiteDatabase) { - super.onCreate(db) - } - } + private val roomCallback: Callback = object: Callback() {} + +// object : Callback() { +// override fun onCreate(db: SupportSQLiteDatabase) { +// super.onCreate(db) +// } +// } val MIGRATION_1_2 = object : Migration(1, 2) { From 2f3e397675322a84f7bff348dbb30788257e0845 Mon Sep 17 00:00:00 2001 From: Patrick Schneider Date: Mon, 19 Feb 2024 14:42:59 +0100 Subject: [PATCH 3/5] Updated copyright --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index be327a5..b73faf6 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ 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 .
-The icons used in the navigation drawer are licensed under the [CC BY 2.5](http://creativecommons.org/licenses/by/2.5/). In addition to them the app uses icons from [Google Design Material Icons](https://design.google.com/icons/index.html) licensed under Apache License Version 2.0. All other images (the logo of Privacy Friendly Apps, the SECUSO logo and the app logo) copyright [Karlsruhe Institute of Technology](https://kit.edu) (2016-2022). +The icons used in the navigation drawer are licensed under the [CC BY 2.5](http://creativecommons.org/licenses/by/2.5/). In addition to them the app uses icons from [Google Design Material Icons](https://design.google.com/icons/index.html) licensed under Apache License Version 2.0. All other images (the logo of Privacy Friendly Apps, the SECUSO logo and the app logo) copyright [SECUSO](www.secuso.org) (2016-2024). ## Contributors From 8e4739ed9a8f65c629a6bd2aa7099d282c208774 Mon Sep 17 00:00:00 2001 From: Patrick Schneider Date: Mon, 19 Feb 2024 15:01:05 +0100 Subject: [PATCH 4/5] Updates copyright in app strings. --- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index f3a57ac..0d1e8b2 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -54,7 +54,7 @@ Autoren: und Mitwirkende. In Zusammenarbeit mit - Diese App gehört zur Gruppe der Privacy Friendly Apps entwickelt von der Technischen Universität Darmstadt. Quelltext lizenziert unter GPLv3. Bilder copyright TU Darmstadt und Google Inc. + Diese App gehört zur Gruppe der Privacy Friendly Apps entwickelt vom Karlsruher Institut für Technologie. Quelltext lizenziert unter GPLv3. Bilder copyright KIT und Google Inc. Weitere Infos unter: diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 72941ca..ae6beff 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -55,7 +55,7 @@ Autores: y contribuidores. En afiliación con - Esta aplicación pertenece al grupo de Aplicaciones que respetan la privacidad desarrolladas por Technische Universität Darmstadt. Código fuente bajo licencia GPLv3. Derechos de autor de las imágenes TU Darmstadt y Google Inc. + Esta aplicación pertenece al grupo de Aplicaciones que respetan la privacidad desarrolladas por Karlsruhe Institute of Technology. Código fuente bajo licencia GPLv3. Derechos de autor de las imágenes KIT y Google Inc. Se puede encontrar más información en: diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fc12801..219e90e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -57,7 +57,7 @@ Karola Marky, Susanne Felsen, Rybien Sinjari and contributors. In affiliation with - This application belongs to the group of Privacy Friendly Apps developed by Technische Universität Darmstadt. Sourcecode licensed under GPLv3. Images copyright TU Darmstadt and Google Inc. + This application belongs to the group of Privacy Friendly Apps developed by Karlsruhe Institute of Technology. Sourcecode licensed under GPLv3. Images copyright KIT and Google Inc. More information can be found on: Github-Repo SECUSO-Website From 40574a4ebd98a5919d3bc38da3e5609ad3314e52 Mon Sep 17 00:00:00 2001 From: coderPaddyS Date: Tue, 12 Mar 2024 07:48:21 +0000 Subject: [PATCH 5/5] update changelog for v1.3.1 changes This commit was created by changelog-from-release in 'Changelog Generation' CI workflow --- CHANGELOG.md | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cfaeccc..121be9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,28 @@ # Changelog + +## [Pain Diary (Privacy Friendly) v1.3.1](https://github.com/SecUSo/privacy-friendly-pain-diary/releases/tag/v1.3.1) - 12 Mar 2024 + +## What's Changed +* Add ci workflow by [@udenr](https://github.com/udenr) in https://github.com/SecUSo/privacy-friendly-pain-diary/pull/34 +* Fix unit tests by [@udenr](https://github.com/udenr) in https://github.com/SecUSo/privacy-friendly-pain-diary/pull/35 +* Update backup api to v1.2.0 by [@udenr](https://github.com/udenr) in https://github.com/SecUSo/privacy-friendly-pain-diary/pull/36 +* documentation: Added info re: Privacy Friendly Backup by [@jahway603](https://github.com/jahway603) in https://github.com/SecUSo/privacy-friendly-pain-diary/pull/30 +* Update to version 1.3.1 by [@udenr](https://github.com/udenr) in https://github.com/SecUSo/privacy-friendly-pain-diary/pull/37 +* Updates Copyright by [@coderPaddyS](https://github.com/coderPaddyS) in https://github.com/SecUSo/privacy-friendly-pain-diary/pull/39 +* Update backup api to v1.3.0 by [@coderPaddyS](https://github.com/coderPaddyS) + +## New Contributors +* [@jahway603](https://github.com/jahway603) made their first contribution in https://github.com/SecUSo/privacy-friendly-pain-diary/pull/30 +* [@coderPaddyS](https://github.com/coderPaddyS) made their first contribution in https://github.com/SecUSo/privacy-friendly-pain-diary/pull/39 + +**Full Changelog**: https://github.com/SecUSo/privacy-friendly-pain-diary/compare/v1.3.0...v1.3.1 + +[Changes][v1.3.1] + + -## [Pain Diary (Privacy Friendly) v1.3.0 (v1.3.0)](https://github.com/SecUSo/privacy-friendly-pain-diary/releases/tag/v1.3.0) - 03 Aug 2022 +## [Pain Diary (Privacy Friendly) v1.3.0](https://github.com/SecUSo/privacy-friendly-pain-diary/releases/tag/v1.3.0) - 03 Aug 2022 ## What's Changed * Update backup api to latest version to support the Backup App from F-Droid by [@udenr](https://github.com/udenr) @@ -12,7 +33,7 @@ -## [Pain Diary (Privacy Friendly) v1.2 (v1.2)](https://github.com/SecUSo/privacy-friendly-pain-diary/releases/tag/v1.2) - 22 Jul 2022 +## [Pain Diary (Privacy Friendly) v1.2](https://github.com/SecUSo/privacy-friendly-pain-diary/releases/tag/v1.2) - 22 Jul 2022 ## What's Changed * Update README.md by [@Poussinou](https://github.com/Poussinou) in https://github.com/SecUSo/privacy-friendly-pain-diary/pull/10 @@ -32,7 +53,7 @@ -## [Privacy Friendly Pain Diary v1.0 (v1.0)](https://github.com/SecUSo/privacy-friendly-pain-diary/releases/tag/v1.0) - 29 Mar 2018 +## [Privacy Friendly Pain Diary v1.0](https://github.com/SecUSo/privacy-friendly-pain-diary/releases/tag/v1.0) - 29 Mar 2018 Privacy Friendly Pain Diary can help you track and "share" your pain. It allows you to make daily diary entries recording your condition and the intensity, location, nature and time of the pain you feel, as @@ -48,8 +69,9 @@ https://secuso.org/pfa. [Changes][v1.0] +[v1.3.1]: https://github.com/SecUSo/privacy-friendly-pain-diary/compare/v1.3.0...v1.3.1 [v1.3.0]: https://github.com/SecUSo/privacy-friendly-pain-diary/compare/v1.2...v1.3.0 [v1.2]: https://github.com/SecUSo/privacy-friendly-pain-diary/compare/v1.0...v1.2 [v1.0]: https://github.com/SecUSo/privacy-friendly-pain-diary/tree/v1.0 - +