/*
- * Copyright © 2018-2022 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2018-2022 Soren Stoutner <soren@stoutner.com>.
*
* This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
*
Button importExportButton;
// Define the class variables.
+ private File fileProviderDirectory;
private boolean openKeychainInstalled;
private File temporaryPgpEncryptedImportFile;
private File temporaryPreEncryptedExportFile;
//noinspection ResultOfMethodCallIgnored
temporaryPgpEncryptedImportFile.delete();
}
+
+ // Delete the file provider directory if it exists.
+ if (fileProviderDirectory.exists()) {
+ //noinspection ResultOfMethodCallIgnored
+ fileProviderDirectory.delete();
+ }
+
break;
case OPENPGP_EXPORT_RESULT_CODE:
//noinspection ResultOfMethodCallIgnored
temporaryPreEncryptedExportFile.delete();
}
+
+ // Delete the file provider directory if it exists.
+ if (fileProviderDirectory.exists()) {
+ //noinspection ResultOfMethodCallIgnored
+ fileProviderDirectory.delete();
+ }
+
break;
}
}
case OPENPGP_ENCRYPTION:
try {
+ // Get a handle for the file provider directory.
+ fileProviderDirectory = new File(getApplicationContext().getCacheDir() + "/" + getString(R.string.file_provider_directory));
+
+ // Create the file provider directory. Any errors will be handled by the catch statement below.
+ //noinspection ResultOfMethodCallIgnored
+ fileProviderDirectory.mkdir();
+
// Set the temporary PGP encrypted import file.
- temporaryPgpEncryptedImportFile = File.createTempFile("temporary_pgp_encrypted_import_file", null, getApplicationContext().getCacheDir());
+ temporaryPgpEncryptedImportFile = File.createTempFile("temporary_pgp_encrypted_import_file", null, fileProviderDirectory);
// Create a temporary PGP encrypted import file output stream.
FileOutputStream temporaryPgpEncryptedImportFileOutputStream = new FileOutputStream(temporaryPgpEncryptedImportFile);
case OPENPGP_ENCRYPTION:
try {
+ // Get a handle for the file provider directory.
+ fileProviderDirectory = new File(getApplicationContext().getCacheDir() + "/" + getString(R.string.file_provider_directory));
+
+ // Create the file provider directory. Any errors will be handled by the catch statement below.
+ //noinspection ResultOfMethodCallIgnored
+ fileProviderDirectory.mkdir();
+
// Set the temporary pre-encrypted export file.
- temporaryPreEncryptedExportFile = new File(getApplicationContext().getCacheDir() + "/" + getString(R.string.settings) + " " + BuildConfig.VERSION_NAME + ".pbs");
+ temporaryPreEncryptedExportFile = new File(fileProviderDirectory + "/" + getString(R.string.settings) + " " + BuildConfig.VERSION_NAME + ".pbs");
// Delete the temporary pre-encrypted export file if it already exists.
if (temporaryPreEncryptedExportFile.exists()) {
// Restart Privacy Browser after 150 milliseconds to allow enough time for the preferences to be saved.
restartHandler.postDelayed(restartRunnable, 150);
}
-}
\ No newline at end of file
+}
<string name="mht_checkbox_explanation">Manchmal müssen MIME-gekapselte HTML-Web-Archive (MHT) manuell festgelegt werden, um korrekt geöffnet zu werden.</string>
<!-- Save Dialog. Android removes double spaces, but extra spaces can be manually specified with the Unicode `\u0020` formatting.
- The `%1$s` code inserts variables into the displayed text and should be preserved in translation. <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
+ The `%*$s` code inserts variables into the displayed text and should be preserved in translation. <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
<string name="save_url">URL speichern</string>
<string name="save_archive">Archiv speichern</string>
<string name="save_text">Text speichern</string>
<string name="mht_checkbox_explanation">A veces se necesita especificar manualmente los archivos web MIME Encapsulated HTML (MHT) para que se abran correctamente.</string>
<!-- Save Dialog. Android removes double spaces, but extra spaces can be manually specified with the Unicode `\u0020` formatting.
- The `%1$s` code inserts variables into the displayed text and should be preserved in translation. <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
+ The `%*$s` code inserts variables into the displayed text and should be preserved in translation. <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
<string name="save_url">Guardar URL</string>
<string name="save_archive">Guardar archivo</string>
<string name="save_text">Guardar texto</string>
<string name="mht_checkbox_explanation">Parfois, les archives web MHT (MIME Encapsulated HTML) doivent être spécifiées manuellement pour être ouvertes correctement.</string>
<!-- Save Dialog. Android removes double spaces, but extra spaces can be manually specified with the Unicode `\u0020` formatting.
- The `%1$s` code inserts variables into the displayed text and should be preserved in translation. <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
+ The `%*$s` code inserts variables into the displayed text and should be preserved in translation. <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
<string name="save_url">Enregistrer l\'URL</string>
<string name="save_archive">Enregistrer l\'archive</string>
<string name="save_text">Sauvegarder le texte</string>
<string name="mht_checkbox_explanation">Talvolta gli archivi web del tipo MIME Encapsulated HTML (MHT) devono essere specificati manualmente per essere aperti correttamente.</string>
<!-- Save Dialog. Android removes double spaces, but extra spaces can be manually specified with the Unicode `\u0020` formatting.
- The `%1$s` code inserts variables into the displayed text and should be preserved in translation. <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
+ The `%*$s` code inserts variables into the displayed text and should be preserved in translation. <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
<string name="save_url">Salva URL</string>
<string name="save_archive">Salva Archivio</string>
<string name="save_text">Salva Testo</string>
<string name="mht_checkbox_explanation">Às vezes, os arquivos da web MIME Encapsulated HTML (MHT) precisam ser especificados manualmente para serem abertos corretamente.</string>
<!-- Save Dialog. Android removes double spaces, but extra spaces can be manually specified with the Unicode `\u0020` formatting.
- The `%1$s` code inserts variables into the displayed text and should be preserved in translation. <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
+ The `%*$s` code inserts variables into the displayed text and should be preserved in translation. <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
<string name="save_url">Salvar URL</string>
<string name="save_archive">Salvar Arquivo</string>
<string name="save_text">Salvar Texto</string>
<string name="settings">Настройки</string>
<string name="import_export">Импорт/Экспорт</string>
<string name="logcat">Logcat</string>
+ <string name="webview_devtools">Инструменты разработчика WebView</string>
<string name="guide">Руководство</string>
<string name="about">О Privacy Browser</string>
<string name="mht_checkbox_explanation">Иногда для корректного открытия веб-архивов MIME Encapsulated HTML (MHT) необходимо указать вручную.</string>
<!-- Save Dialog. Android removes double spaces, but extra spaces can be manually specified with the Unicode `\u0020` formatting.
- The `%1$s` code inserts variables into the displayed text and should be preserved in translation. <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
+ The `%*$s` code inserts variables into the displayed text and should be preserved in translation. <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
<string name="save_url">Сохранить URL</string>
<string name="save_archive">Сохранить архив</string>
<string name="save_text">Сохранить текст</string>
<string name="invalid_url">неправильный URL</string>
<string name="saving_file">Сохранение файла:</string>
<string name="processing_image">Обработка изображения… :</string>
+ <string name="error_saving_file">Ошибка сохранения %1$s: \u0020 %2$s</string>
+ <string name="unknown_error">Неизвестная ошибка</string>
<!-- View Source. -->
<string name="request_headers">Заголовки запроса</string>
<string name="swipe_to_refresh">Потянуть для обновления</string>
<string name="swipe_to_refresh_summary">Некоторые веб-сайты могут работать некорректно при включении данной опции.</string>
<string name="download_with_external_app">Загрузка во внешнем приложении</string>
+ <string name="download_with_external_app_summary">Внешние приложения не будут учитывать настройки прокси Privacy Browser и не будут иметь доступа к cookie
+ (это означает, что файлы, загруженные с сайтов, для которых требуется авторизация, вряд ли будут работать).</string>
<string name="scroll_app_bar">Прокручивать панель приложения</string>
<string name="scroll_app_bar_summary">Прокручивает панель приложения вверху экрана при прокрутке WebView вниз.</string>
<string name="bottom_app_bar">Нижняя панель приложения</string>
<string name="next">Sonraki</string>
<!-- Save Dialog. Android removes double spaces, but extra spaces can be manually specified with the Unicode `\u0020` formatting.
- The `%1$s` code inserts variables into the displayed text and should be preserved in translation. <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
+ The `%*$s` code inserts variables into the displayed text and should be preserved in translation. <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
<string name="save_image">Resmi kaydet</string>
<string name="file_name">Dosya adı</string>
<string name="unknown_size">Bilinmeyen boyut</string>
<!-- Providers. -->
<string name="file_provider" translatable="false">com.stoutner.privacybrowser.fileprovider.standard</string>
+ <string name="file_provider_directory" translatable="false">file_provider</string>
<!-- Activities. -->
<string name="privacy_browser">Privacy Browser</string>
<string name="mht_checkbox_explanation">Sometimes MIME Encapsulated HTML (MHT) web archives need to be manually specified to be opened correctly.</string>
<!-- Save Dialog. Android removes double spaces, but extra spaces can be manually specified with the Unicode `\u0020` formatting.
- The `%1$s` code inserts variables into the displayed text and should be preserved in translation. <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
+ The `%*$s` code inserts variables into the displayed text and should be preserved in translation. <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
<string name="save_dialog" translatable="false">Save Dialog</string> <!-- This string is used to tag the save dialog. It is never displayed to the user. -->
<string name="save_url">Save URL</string>
<string name="save_archive">Save Archive</string>
<string name="saving_file">Saving file:</string>
<string name="saved">%1$s saved.</string>
<string name="processing_image">Processing image… :</string>
- <string name="error_saving_file">Error saving %1$s: \u0020 %2$s</string> -->
+ <string name="error_saving_file">Error saving %1$s: \u0020 %2$s</string>
<string name="unknown_error">Unknown error</string>
<!-- View Source. -->
<paths>
<cache-path
name="private-cache-directory"
- path="." />
+ path="file_provider" />
</paths>
projects / PrivacyBrowserAndroid.git / commitdiff