From 3af14960f300e56e9fcdc246dc33c74ff3746e17 Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Mon, 25 Nov 2024 01:55:39 +0200 Subject: [PATCH 1/7] Add SailJail permission settings: - Audio - UserDirs - since we allow the user to change the Downloads directory - RemovableMedia - same as UserDirs - Internet It is unclear to me if UserDirs also includes ~, if not we will need to update the export code to fix #209 Signed-off-by: E.S. Rosenberg a.k.a. Keeper of the Keys --- harbour-org.gpodder.sailfish.desktop | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/harbour-org.gpodder.sailfish.desktop b/harbour-org.gpodder.sailfish.desktop index 75e38b1..a6dc638 100644 --- a/harbour-org.gpodder.sailfish.desktop +++ b/harbour-org.gpodder.sailfish.desktop @@ -4,3 +4,8 @@ X-Nemo-Application-Type=silica-qt5 Name=gPodder Icon=harbour-org.gpodder.sailfish Exec=sailfish-qml harbour-org.gpodder.sailfish + +[X-Sailjail] +Permissions=Audio;UserDirs;RemovableMedia;Internet +OrganizationName=org.gpodder +ApplicationName=harbour-org.gpodder.sailfish From 0686278765469e6dc9d2393f31567bcc0224c22c Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Mon, 25 Nov 2024 02:02:45 +0200 Subject: [PATCH 2/7] Add support for harbour-mybackup Signed-off-by: E.S. Rosenberg a.k.a. Keeper of the Keys --- harbour-org.gpodder.sailfish.desktop | 3 +++ 1 file changed, 3 insertions(+) diff --git a/harbour-org.gpodder.sailfish.desktop b/harbour-org.gpodder.sailfish.desktop index a6dc638..ba26b79 100644 --- a/harbour-org.gpodder.sailfish.desktop +++ b/harbour-org.gpodder.sailfish.desktop @@ -9,3 +9,6 @@ Exec=sailfish-qml harbour-org.gpodder.sailfish Permissions=Audio;UserDirs;RemovableMedia;Internet OrganizationName=org.gpodder ApplicationName=harbour-org.gpodder.sailfish + +[X-HarbourBackup] +BackupPathList=.config/harbour-org.gpodder.sailfish:.local/share/harbour-org.gpodder.sailfish From e6c1f6eec65fdbebe87fe96434724fa587865c84 Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Thu, 5 Dec 2024 11:39:05 +0200 Subject: [PATCH 3/7] Use the same application name used for notifications. Signed-off-by: E.S. Rosenberg a.k.a. Keeper of the Keys --- harbour-org.gpodder.sailfish.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/harbour-org.gpodder.sailfish.desktop b/harbour-org.gpodder.sailfish.desktop index ba26b79..3d0f810 100644 --- a/harbour-org.gpodder.sailfish.desktop +++ b/harbour-org.gpodder.sailfish.desktop @@ -8,7 +8,7 @@ Exec=sailfish-qml harbour-org.gpodder.sailfish [X-Sailjail] Permissions=Audio;UserDirs;RemovableMedia;Internet OrganizationName=org.gpodder -ApplicationName=harbour-org.gpodder.sailfish +ApplicationName=gPodder [X-HarbourBackup] BackupPathList=.config/harbour-org.gpodder.sailfish:.local/share/harbour-org.gpodder.sailfish From 5d28b4754bd38809d7697fa5403114927fda9f18 Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Thu, 5 Dec 2024 11:39:31 +0200 Subject: [PATCH 4/7] Set base path for exported OPML files to be in the Documents folder, thus remaining in the SailJail --- qml/ImportOPML.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/ImportOPML.qml b/qml/ImportOPML.qml index 8b89b84..b8df034 100644 --- a/qml/ImportOPML.qml +++ b/qml/ImportOPML.qml @@ -20,7 +20,7 @@ Dialog { py.call('main.import_opml', [importOPML.selectedFile]) } else { if(exportFile.text.charAt(0) != '/') { - exportFile.text = StandardPaths.home + '/' + exportFile.text + exportFile.text = StandardPaths.documents + '/' + exportFile.text } py.call('main.export_opml', [exportFile.text]) From 58e48690924a4d52ca53176e240e32dd0e96b8bf Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Sun, 8 Dec 2024 12:00:08 +0200 Subject: [PATCH 5/7] Better hint about exported opml file location Fix typo in placeholder text Add ~ as first character detection for full paths Signed-off-by: E.S. Rosenberg a.k.a. Keeper of the Keys --- qml/ImportOPML.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qml/ImportOPML.qml b/qml/ImportOPML.qml index b8df034..01756f0 100644 --- a/qml/ImportOPML.qml +++ b/qml/ImportOPML.qml @@ -19,7 +19,7 @@ Dialog { if (opmlAction == 'Import') { py.call('main.import_opml', [importOPML.selectedFile]) } else { - if(exportFile.text.charAt(0) != '/') { + if(exportFile.text.charAt(0) != '/' && exportFile.text.charAt(0) != '~') { exportFile.text = StandardPaths.documents + '/' + exportFile.text } @@ -61,8 +61,8 @@ Dialog { TextField { id: exportFile - label: 'Filename' - placeholderText: qsTr('Enter filname') + label: qsTr('Filename, stored in Documents') + placeholderText: qsTr('Enter filename') visible: opmlAction == 'Export' ? true : false anchors { From 19c681fcf6d3f31cf2c8538e1b234940690c530a Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Sun, 8 Dec 2024 12:39:21 +0200 Subject: [PATCH 6/7] Revert braking changes that cause the wrong folders to be accessible due to sailjail Signed-off-by: E.S. Rosenberg a.k.a. Keeper of the Keys --- harbour-org.gpodder.sailfish.desktop | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/harbour-org.gpodder.sailfish.desktop b/harbour-org.gpodder.sailfish.desktop index 3d0f810..76eaae7 100644 --- a/harbour-org.gpodder.sailfish.desktop +++ b/harbour-org.gpodder.sailfish.desktop @@ -7,8 +7,8 @@ Exec=sailfish-qml harbour-org.gpodder.sailfish [X-Sailjail] Permissions=Audio;UserDirs;RemovableMedia;Internet -OrganizationName=org.gpodder -ApplicationName=gPodder +OrganizationName=harbour-org.gpodder.sailfish +ApplicationName=harbour-org.gpodder.sailfish [X-HarbourBackup] BackupPathList=.config/harbour-org.gpodder.sailfish:.local/share/harbour-org.gpodder.sailfish From e5aadffe49cc717da1f3e001257d6b94ded67680 Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Sun, 8 Dec 2024 15:14:57 +0200 Subject: [PATCH 7/7] Updated translation files. Signed-off-by: E.S. Rosenberg a.k.a. Keeper of the Keys --- translations/harbour-org.gpodder.sailfish-bg.ts | 9 +++++++-- translations/harbour-org.gpodder.sailfish-de.ts | 9 +++++++-- translations/harbour-org.gpodder.sailfish-es.ts | 9 +++++++-- translations/harbour-org.gpodder.sailfish-it.ts | 9 +++++++-- translations/harbour-org.gpodder.sailfish-pl.ts | 9 +++++++-- translations/harbour-org.gpodder.sailfish-ru.ts | 9 +++++++-- translations/harbour-org.gpodder.sailfish-sv.ts | 9 +++++++-- translations/harbour-org.gpodder.sailfish-zh_CN.ts | 9 +++++++-- translations/harbour-org.gpodder.sailfish.ts | 7 ++++++- 9 files changed, 62 insertions(+), 17 deletions(-) diff --git a/translations/harbour-org.gpodder.sailfish-bg.ts b/translations/harbour-org.gpodder.sailfish-bg.ts index 6892091..78e7a68 100644 --- a/translations/harbour-org.gpodder.sailfish-bg.ts +++ b/translations/harbour-org.gpodder.sailfish-bg.ts @@ -250,10 +250,15 @@ Import File Файл за внасяне + + + Filename, stored in Documents + + - Enter filname - Въвеждане на файлово име + Enter filename + diff --git a/translations/harbour-org.gpodder.sailfish-de.ts b/translations/harbour-org.gpodder.sailfish-de.ts index c6660b7..ac94677 100644 --- a/translations/harbour-org.gpodder.sailfish-de.ts +++ b/translations/harbour-org.gpodder.sailfish-de.ts @@ -249,10 +249,15 @@ Import File Datei importieren + + + Filename, stored in Documents + + - Enter filname - Dateiname eingeben + Enter filename + diff --git a/translations/harbour-org.gpodder.sailfish-es.ts b/translations/harbour-org.gpodder.sailfish-es.ts index f2babae..88542d7 100644 --- a/translations/harbour-org.gpodder.sailfish-es.ts +++ b/translations/harbour-org.gpodder.sailfish-es.ts @@ -249,10 +249,15 @@ Import File Importar archivo + + + Filename, stored in Documents + + - Enter filname - Indica nombre del archivo + Enter filename + diff --git a/translations/harbour-org.gpodder.sailfish-it.ts b/translations/harbour-org.gpodder.sailfish-it.ts index b5f957a..71a7246 100644 --- a/translations/harbour-org.gpodder.sailfish-it.ts +++ b/translations/harbour-org.gpodder.sailfish-it.ts @@ -249,10 +249,15 @@ Import File Importa file + + + Filename, stored in Documents + + - Enter filname - Inserisci nome file + Enter filename + diff --git a/translations/harbour-org.gpodder.sailfish-pl.ts b/translations/harbour-org.gpodder.sailfish-pl.ts index 45e38af..3cc2f71 100644 --- a/translations/harbour-org.gpodder.sailfish-pl.ts +++ b/translations/harbour-org.gpodder.sailfish-pl.ts @@ -249,10 +249,15 @@ Import File Importuj plik + + + Filename, stored in Documents + + - Enter filname - Wprowadź nazwę pliku + Enter filename + diff --git a/translations/harbour-org.gpodder.sailfish-ru.ts b/translations/harbour-org.gpodder.sailfish-ru.ts index 265a948..0039a12 100644 --- a/translations/harbour-org.gpodder.sailfish-ru.ts +++ b/translations/harbour-org.gpodder.sailfish-ru.ts @@ -249,10 +249,15 @@ Import File Импорт файла + + + Filename, stored in Documents + + - Enter filname - Введите имя файла + Enter filename + diff --git a/translations/harbour-org.gpodder.sailfish-sv.ts b/translations/harbour-org.gpodder.sailfish-sv.ts index dd274b6..2442d93 100644 --- a/translations/harbour-org.gpodder.sailfish-sv.ts +++ b/translations/harbour-org.gpodder.sailfish-sv.ts @@ -249,10 +249,15 @@ Import File Importera fil + + + Filename, stored in Documents + + - Enter filname - Ange filnamn + Enter filename + diff --git a/translations/harbour-org.gpodder.sailfish-zh_CN.ts b/translations/harbour-org.gpodder.sailfish-zh_CN.ts index 6ab7dd3..00a45bc 100644 --- a/translations/harbour-org.gpodder.sailfish-zh_CN.ts +++ b/translations/harbour-org.gpodder.sailfish-zh_CN.ts @@ -249,10 +249,15 @@ Import File 导入文件 + + + Filename, stored in Documents + + - Enter filname - 输入文件名 + Enter filename + diff --git a/translations/harbour-org.gpodder.sailfish.ts b/translations/harbour-org.gpodder.sailfish.ts index 511cf12..7c7a8c9 100644 --- a/translations/harbour-org.gpodder.sailfish.ts +++ b/translations/harbour-org.gpodder.sailfish.ts @@ -249,9 +249,14 @@ Import File + + + Filename, stored in Documents + + - Enter filname + Enter filename