From c63839569b75feac09fb22e512d08dcdbceaa8af Mon Sep 17 00:00:00 2001 From: udenr Date: Wed, 27 Mar 2024 13:02:28 +0000 Subject: [PATCH 1/3] update changelog for v4.6.0 changes This commit was created by changelog-from-release in 'Changelog Generation' CI workflow --- CHANGELOG.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f659586f..fe46673e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog + +## [QR Scanner (Privacy Friendly) v4.6.0](https://github.com/SecUSo/privacy-friendly-qr-scanner/releases/tag/v4.6.0) - 27 Mar 2024 + +## What's Changed +* Update ci workflow by [@udenr](https://github.com/udenr) in https://github.com/SecUSo/privacy-friendly-qr-scanner/pull/220 +* Add plural forms to string by [@udenr](https://github.com/udenr) in https://github.com/SecUSo/privacy-friendly-qr-scanner/pull/221 +* Translations update from Hosted Weblate by [@weblate](https://github.com/weblate) in https://github.com/SecUSo/privacy-friendly-qr-scanner/pull/217 +* Adjust versions for dependencies by [@udenr](https://github.com/udenr) in https://github.com/SecUSo/privacy-friendly-qr-scanner/pull/227 + + +**Full Changelog**: https://github.com/SecUSo/privacy-friendly-qr-scanner/compare/v4.5.9...v4.6.0 + +[Changes][v4.6.0] + + ## [QR Scanner (Privacy Friendly) v4.5.9](https://github.com/SecUSo/privacy-friendly-qr-scanner/releases/tag/v4.5.9) - 24 Jan 2024 @@ -315,6 +330,7 @@ It belongs to the group of Privacy Friendly Apps from the research group SecUSo [Changes][v1.4] +[v4.6.0]: https://github.com/SecUSo/privacy-friendly-qr-scanner/compare/v4.5.9...v4.6.0 [v4.5.9]: https://github.com/SecUSo/privacy-friendly-qr-scanner/compare/v4.5.8...v4.5.9 [v4.5.8]: https://github.com/SecUSo/privacy-friendly-qr-scanner/compare/v4.5.7...v4.5.8 [v4.5.7]: https://github.com/SecUSo/privacy-friendly-qr-scanner/compare/v4.5.0...v4.5.7 @@ -338,4 +354,4 @@ It belongs to the group of Privacy Friendly Apps from the research group SecUSo [v1.5]: https://github.com/SecUSo/privacy-friendly-qr-scanner/compare/v1.4...v1.5 [v1.4]: https://github.com/SecUSo/privacy-friendly-qr-scanner/tree/v1.4 - + From 376e0e8e14a22dd5773408e2bb44120e1eca6458 Mon Sep 17 00:00:00 2001 From: jahway603 Date: Mon, 1 Apr 2024 12:34:28 -0400 Subject: [PATCH 2/3] Added info re: Privacy Friendly Backup to app Help screen --- .../qrscanner/ui/helpers/HelpDataDump.java | 5 +++++ app/src/main/res/values/strings.xml | 7 +++---- app/src/main/res/xml/help.xml | 5 +++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/secuso/privacyfriendlycodescanner/qrscanner/ui/helpers/HelpDataDump.java b/app/src/main/java/com/secuso/privacyfriendlycodescanner/qrscanner/ui/helpers/HelpDataDump.java index 7be46608..4ab38b2a 100644 --- a/app/src/main/java/com/secuso/privacyfriendlycodescanner/qrscanner/ui/helpers/HelpDataDump.java +++ b/app/src/main/java/com/secuso/privacyfriendlycodescanner/qrscanner/ui/helpers/HelpDataDump.java @@ -63,6 +63,11 @@ public LinkedHashMap> getDataGeneral() { expandableListDetail.put(context.getResources().getString(R.string.help_permission), permissions); + List data_backup = new ArrayList(); + data_backup.add(context.getResources().getString(R.string.help_data_backup_answer)); + + expandableListDetail.put(context.getResources().getString(R.string.help_data_backup), data_backup); + return expandableListDetail; } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3d59fcff..f6c2400e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -211,20 +211,19 @@ The scanning does not work, what can I do? What is PRIVACY FRIENDLY QR Scanner? With PRIVACY FRIENDLY QR Scanner you can scan barcodes and qr-codes with various contents. - With PRIVACY FRIENDLY QR Scanner you can scan/generate barcodes and qr-codes with various contents. Also You can copy/share scanned QR code with other applications, furthermore you can save the generated QR code in the gallery and share it as well. - - What is PRIVACY FRIENDLY QR Scanner? - + With PRIVACY FRIENDLY QR Scanner you can scan/generate barcodes and qr-codes with various contents. Also You can copy/share scanned QR code with other applications, furthermore you can save the generated QR code in the gallery and share it as well. The scanning does not work, what can I do? If you cannot scan a code, increase the distance between the scanner and the code. What makes the app privacy-friendly? Privacy Friendly App Example does not require any permission. It further does not include any tracking mechanisms or advertisement. What permissions are required by PRIVACY FRIENDLY QR Scanner? The app requires the camera permission, which is used to scan barcodes and qr codes via camera. The app also requires the permission to access your storage to scan codes from your images or save generated codes to your images. + How do I backup my data? + You can use the separate Privacy Friendly Backup app to backup and restore this application\'s data. This can also be used to migrate your data to a new phone. diff --git a/app/src/main/res/xml/help.xml b/app/src/main/res/xml/help.xml index 5355bc77..acc0f79c 100644 --- a/app/src/main/res/xml/help.xml +++ b/app/src/main/res/xml/help.xml @@ -23,6 +23,11 @@ android:selectable="false"/> + + + \ No newline at end of file From 227cc3b2660bc197758b13abad894b77fa88a441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20L=C3=A4nge?= Date: Wed, 10 Apr 2024 11:43:26 +0200 Subject: [PATCH 3/3] Update `values-de/strings.xml` --- app/src/main/res/values-de/strings.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 956ff956..d7ca7483 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -171,6 +171,7 @@ Weitere Infos unter: Mitwirkende--> Was ist PRIVACY FRIENDLY QR Scanner? + Mit dem PRIVACY FRIENDLY QR Scanner können Sie Barcodes und QR-Codes mit verschiedenen Inhalten scannen / generieren. Sie können auch gescannten QR-Code mit anderen Apps kopieren / teilen, außerdem können Sie den generierten QR-Code teilen oder in der Galerie speichern. andere Funktionen Das Scannen funktioniert nicht, was kann ich tun? Wenn Sie keinen Code scannen können, vergrößern Sie den Abstand zwischen Scanner und Code. @@ -178,7 +179,8 @@ Privacy Friendly App Example does not require any permission. It further does not include any tracking mechanisms or advertisement. Welche Berechtigungen benötigt der PRIVACY FRIENDLY QR Scanner? Die App benötigt die Kamera-Erlaubnis, die verwendet wird, um Barcodes und QR-Codes über die Kamera zu scannen. Die App benötigt außerdem die Erlaubnis, auf Ihren Speicher zuzugreifen, um Codes von Ihren Bildern zu scannen oder generierte Codes in Ihren Bildern zu speichern. - Mit dem PRIVACY FRIENDLY QR Scanner können Sie Barcodes und QR-Codes mit verschiedenen Inhalten scannen / generieren. Sie können auch gescannten QR-Code mit anderen Apps kopieren / teilen, außerdem können Sie den generierten QR-Code teilen oder in der Galerie speichern. + Wie kann ich meine Daten sichern? + Mit der App Privacy Friendly Backup können die Daten dieser App gesichert und wiederhergestellt werden. Damit können die Daten auch auf ein neues Smatphone übertragen werden. Der gescannte QR-Code enthält eine MMS. Der gescannte QR-Code enthält eine geographisch Information. Inhalt kopiert