diff options
author | Andrew Dolgov <[email protected]> | 2023-06-04 12:59:42 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2023-06-04 12:59:42 +0300 |
commit | 9faf01bba2d237a45a60774daf552b8b501e21cc (patch) | |
tree | aaf7850ba9ece7fea23f770fa9b1055356cfc084 /org.fox.ttrss/src/main | |
parent | d460a8646f8deedd89967ad8d999a5b489efce91 (diff) |
* add option to disable update checks9faf01bbprotected/optional-update-checksoptional-update-checks
* set uniform ttrss_url_summary pointing to example.com
* minor UI tweaks
* bump versioncode
Diffstat (limited to 'org.fox.ttrss/src/main')
22 files changed, 38 insertions, 22 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index 34ba343f..7bf2e720 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="536" - android:versionName="1.302"> + android:versionCode="537" + android:versionName="1.303"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java index 8e340f25..918e67e0 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java @@ -265,7 +265,7 @@ public class OnlineActivity extends CommonActivity { } protected void checkUpdates() { - if (BuildConfig.DEBUG || BuildConfig.ENABLE_UPDATER) { + if (m_prefs.getBoolean("check_for_updates", true) && (BuildConfig.DEBUG || BuildConfig.ENABLE_UPDATER)) { new AppUpdater(this) .setUpdateFrom(UpdateFrom.JSON) .setUpdateJSON(String.format("https://srv.tt-rss.org/fdroid/updates/%1$s.json", this.getPackageName())) diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesFragment.java index 1fb663d1..65e0b556 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesFragment.java @@ -1,11 +1,13 @@ package org.fox.ttrss; import android.content.Intent; +import android.content.SharedPreferences; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.Bundle; import android.preference.Preference; import android.preference.PreferenceFragment; +import android.preference.PreferenceManager; import java.text.SimpleDateFormat; import java.util.Date; @@ -19,6 +21,13 @@ public class PreferencesFragment extends PreferenceFragment { // Load the preferences from an XML resource addPreferencesFromResource(R.xml.preferences); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext()); + + findPreference("check_for_updates").setEnabled(BuildConfig.DEBUG || BuildConfig.ENABLE_UPDATER); + + findPreference("ttrss_url").setSummary(prefs.getString("ttrss_url", getString(R.string.ttrss_url_summary))); + findPreference("login").setSummary(prefs.getString("login", getString(R.string.login_summary))); + findPreference("show_logcat").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { @Override public boolean onPreferenceClick(Preference preference) { diff --git a/org.fox.ttrss/src/main/res/values-cs/strings.xml b/org.fox.ttrss/src/main/res/values-cs/strings.xml index 38faa884..974dc3d1 100644 --- a/org.fox.ttrss/src/main/res/values-cs/strings.xml +++ b/org.fox.ttrss/src/main/res/values-cs/strings.xml @@ -45,7 +45,7 @@ <string name="context_selection_toggle_marked">Hvězdička</string> <string name="context_selection_toggle_published">Publikovaný</string> <string name="article_mark_read_above">Označit nad jako přečtené</string> - <string name="ttrss_url_summary">http://muj_server.cz/tt-rss/</string> + <string name="ttrss_url_summary">https://example.com/tt-rss</string> <string name="enable_cats">Povolit kategorie kanálů</string> <string name="browse_cats_like_feeds">Procházet kategorie jako kanály</string> <string name="browse_cats_like_feeds_summary">Použít místní nabídku kategorie pro přepsání tohoto nastavení</string> diff --git a/org.fox.ttrss/src/main/res/values-de/strings.xml b/org.fox.ttrss/src/main/res/values-de/strings.xml index 52f9238e..2a7e8c89 100644 --- a/org.fox.ttrss/src/main/res/values-de/strings.xml +++ b/org.fox.ttrss/src/main/res/values-de/strings.xml @@ -48,7 +48,7 @@ <string name="article_mark_read_above">Obige als gelesen markieren</string> <string name="http_login_summary">Optional. Bitte ausfüllen, wenn die tt-rss Installation durch HTTP Basic Authentication geschützt ist</string> <string name="login_summary">Im Einbenutzermodus nicht nötig</string> - <string name="ttrss_url_summary">http://example.org/tt-rss</string> + <string name="ttrss_url_summary">https://example.com/tt-rss</string> <string name="enable_cats">Feedkategorien aktivieren</string> <string name="no_caption_to_display">Keine Bildunterschrift vorhanden</string> <string name="browse_cats_like_feeds">Kategorien als Feeds anzeigen</string> diff --git a/org.fox.ttrss/src/main/res/values-es/strings.xml b/org.fox.ttrss/src/main/res/values-es/strings.xml index 026107cf..b96ed1c5 100755 --- a/org.fox.ttrss/src/main/res/values-es/strings.xml +++ b/org.fox.ttrss/src/main/res/values-es/strings.xml @@ -47,7 +47,7 @@ <string name="article_mark_read_above">Marcar artículos anteriores como leídos</string> <string name="http_login_summary">Opcional. Complete este campo si su instalación de Tiny Tiny RSS usa autenticación básica por HTTP</string> <string name="login_summary">Sus credenciales para Tiny Tiny RSS. No son necesarias en modo de usuario único</string> - <string name="ttrss_url_summary">URL de su instalación de Tiny Tiny RSS, por ejemplo http://site.com/tt-rss/</string> + <string name="ttrss_url_summary">https://example.com/tt-rss</string> <string name="enable_cats">Habilitar categorías de fuentes</string> <string name="no_caption_to_display">Ninguna leyenda para mostrar</string> <string name="browse_cats_like_feeds">Ver categorías como si fuesen fuentes</string> diff --git a/org.fox.ttrss/src/main/res/values-eu/strings.xml b/org.fox.ttrss/src/main/res/values-eu/strings.xml index bab8c4ad..dc45436f 100644 --- a/org.fox.ttrss/src/main/res/values-eu/strings.xml +++ b/org.fox.ttrss/src/main/res/values-eu/strings.xml @@ -212,7 +212,7 @@ <string name="browse_cats_like_feeds_summary">Erabili kategoriaren laster-menua konfigurazio hau ezeztatzeko</string> <string name="browse_cats_like_feeds">Ikusi kategoriak jarioak balira bezala</string> <string name="enable_cats">Gaitu jarioen kategoriak</string> - <string name="ttrss_url_summary">http://adibidea.eus/tt-rss</string> + <string name="ttrss_url_summary">https://example.com/tt-rss</string> <string name="login_summary">Ez da beharrezkoa erabiltzaile bakarreko moduarentzat</string> <string name="http_login_summary">Hautazkoa. Osatu eremu hau zure Tiny RSS instalazioak HTTP bidezko oinarrizko autentifikazioa erabiltzen badu</string> <string name="article_mark_read_above">Markatu aurreko artikuluak irakurritako gisa</string> diff --git a/org.fox.ttrss/src/main/res/values-fi/strings.xml b/org.fox.ttrss/src/main/res/values-fi/strings.xml index 976d133b..c92ffd95 100644 --- a/org.fox.ttrss/src/main/res/values-fi/strings.xml +++ b/org.fox.ttrss/src/main/res/values-fi/strings.xml @@ -15,7 +15,7 @@ <string name="headlines_select_dialog">Valitse artikkelit</string> <string name="headlines_select_all">Valitse kaikki</string> <string name="headlines_select_none">Poista kaikki valinnat</string> - <string name="ttrss_url_summary">http://example.org/tt-rss</string> + <string name="ttrss_url_summary">https://example.com/tt-rss</string> <string name="error_unknown">Virhe: Tuntematon virhe (katso loki)</string> <string name="error_http_unauthorized">Virhe: 401 luvaton</string> <string name="error_http_forbidden">Virhe: 403 kielletty</string> diff --git a/org.fox.ttrss/src/main/res/values-fr/strings.xml b/org.fox.ttrss/src/main/res/values-fr/strings.xml index ed1b5082..2a7d28d4 100644 --- a/org.fox.ttrss/src/main/res/values-fr/strings.xml +++ b/org.fox.ttrss/src/main/res/values-fr/strings.xml @@ -48,7 +48,7 @@ <string name="article_mark_read_above">Marquer comme lu jusqu\'ici</string> <string name="http_login_summary">Optionnel. Remplissez ceci si votre installation tt-rss est protégée par une authentification HTTP Basique</string> <string name="login_summary">Inutile en mode utilisateur unique</string> - <string name="ttrss_url_summary">L\'URL de votre répertoire d\'installation tt-rss, ex : http://site.com/tt-rss/</string> + <string name="ttrss_url_summary">https://example.com/tt-rss</string> <string name="enable_cats">Activer les catégories des flux</string> <string name="no_caption_to_display">Aucun sous-titre trouvé</string> <string name="browse_cats_like_feeds">Parcourir les catégories comme les flux</string> diff --git a/org.fox.ttrss/src/main/res/values-it/strings.xml b/org.fox.ttrss/src/main/res/values-it/strings.xml index fa55f800..f7e968d2 100644 --- a/org.fox.ttrss/src/main/res/values-it/strings.xml +++ b/org.fox.ttrss/src/main/res/values-it/strings.xml @@ -48,7 +48,7 @@ <string name="article_mark_read_above">Segna sopra come letti</string> <string name="http_login_summary">Opzionale. Compila questo solo se la tua istanza di tt-rss è protetta tramite autenticazione HTTP Basica</string> <string name="login_summary">Non necessario per la modalità utente singolo</string> - <string name="ttrss_url_summary">URL dell\'istanza di tt-rss, es. http://sito.it/tt-rss/</string> + <string name="ttrss_url_summary">https://example.com/tt-rss</string> <string name="enable_cats">Abilita categorie di notiziari</string> <string name="no_caption_to_display">Nessuna etichetta da mostrare</string> <string name="browse_cats_like_feeds">Naviga le categorie come notiziari</string> diff --git a/org.fox.ttrss/src/main/res/values-ja/strings.xml b/org.fox.ttrss/src/main/res/values-ja/strings.xml index ce0d508f..3a29c349 100755 --- a/org.fox.ttrss/src/main/res/values-ja/strings.xml +++ b/org.fox.ttrss/src/main/res/values-ja/strings.xml @@ -49,7 +49,7 @@ <string name="article_mark_read_above">これより上を既読にする</string> <string name="http_login_summary">オプション。tt-rssサーバにBasic認証を使用している場合は記入してください</string> <string name="login_summary">シングルユーザモードの場合は不要</string> - <string name="ttrss_url_summary">http://example.org/tt-rss/</string> + <string name="ttrss_url_summary">https://example.com/tt-rss</string> <string name="enable_cats">フィードのカテゴリを有効にする</string> <string name="no_caption_to_display">表示するキャプションがありません</string> <string name="browse_cats_like_feeds">カテゴリをフィードのように扱う</string> diff --git a/org.fox.ttrss/src/main/res/values-nl/strings.xml b/org.fox.ttrss/src/main/res/values-nl/strings.xml index cb726148..f25381bf 100644 --- a/org.fox.ttrss/src/main/res/values-nl/strings.xml +++ b/org.fox.ttrss/src/main/res/values-nl/strings.xml @@ -39,7 +39,7 @@ <string name="article_mark_read_above">Bovenstaande als gelezen markeren</string> <string name="http_login_summary">Optioneel. Vul dit in als je tt-rss installatie is beveiligd met HTTP Basic authenticatie</string> <string name="login_summary">Niet nodig voor enkele gebruikersmodus</string> - <string name="ttrss_url_summary">http://voorbeeld.org/tt-rss</string> + <string name="ttrss_url_summary">https://example.com/tt-rss</string> <string name="enable_cats">Schakel feedcategorieën in</string> <string name="no_caption_to_display">Geen bijschrift om weer te geven</string> <string name="browse_cats_like_feeds">Blader door categorieën als feeds</string> diff --git a/org.fox.ttrss/src/main/res/values-pl/strings.xml b/org.fox.ttrss/src/main/res/values-pl/strings.xml index b0a32e0b..4311fcb7 100755 --- a/org.fox.ttrss/src/main/res/values-pl/strings.xml +++ b/org.fox.ttrss/src/main/res/values-pl/strings.xml @@ -63,7 +63,7 @@ <string name="article_mark_read_above">Oznacz art. powyżej jako przeczytane</string> <string name="http_login_summary">Opcjonalne. Wypełnij jedynie gdy Twoja instalacja tt-rss jest chroniona uwierzytelnianiem HTTP Basic</string> <string name="login_summary">Twoja nazwa użytkownika tt-rss. Nie jest wymagana dla trybu pojedynczego użytkownika</string> - <string name="ttrss_url_summary">Adres URL Twojej instalacji tt-rss, np. http://strona.pl/tt-rss/</string> + <string name="ttrss_url_summary">https://example.com/tt-rss</string> <string name="enable_cats">Włącz kategorie kanałów</string> <string name="no_caption_to_display">Brak opisu do wyświetlenia</string> <string name="browse_cats_like_feeds">Przeglądaj kategorie jak kanały</string> diff --git a/org.fox.ttrss/src/main/res/values-pt-rBR/strings.xml b/org.fox.ttrss/src/main/res/values-pt-rBR/strings.xml index d4ca7ddb..ac50cd24 100644 --- a/org.fox.ttrss/src/main/res/values-pt-rBR/strings.xml +++ b/org.fox.ttrss/src/main/res/values-pt-rBR/strings.xml @@ -48,7 +48,7 @@ <string name="article_mark_read_above">Marcar acima como lido</string> <string name="http_login_summary">Opcional. Preencha este campo se sua instalação do tt-rss usa autenticação básica HTTP</string> <string name="login_summary">Seu usuário tt-rss. Não é necessário no modo mono usuário</string> - <string name="ttrss_url_summary">URL da sua instalação tt-rss, por exemplo http://site.com/tt-rss/</string> + <string name="ttrss_url_summary">https://example.com/tt-rss</string> <string name="enable_cats">Habilitar categorias</string> <string name="no_caption_to_display">Nenhuma legenda a mostrar</string> <string name="browse_cats_like_feeds">Navegar pelas categorias como se fossem feeds</string> diff --git a/org.fox.ttrss/src/main/res/values-ru/strings.xml b/org.fox.ttrss/src/main/res/values-ru/strings.xml index b94498a9..e3eb3a58 100644 --- a/org.fox.ttrss/src/main/res/values-ru/strings.xml +++ b/org.fox.ttrss/src/main/res/values-ru/strings.xml @@ -37,7 +37,7 @@ <string name="article_mark_read_above">Отметить выше как прочитанное</string> <string name="http_login_summary">Введите если ваша инсталляция tt-rss защищена авторизацией HTTP Basic</string> <string name="login_summary">Не требуется для однопользовательского режима</string> - <string name="ttrss_url_summary">http://example.org/tt-rss</string> + <string name="ttrss_url_summary">https://example.com/tt-rss</string> <string name="enable_cats">Включить категории</string> <string name="no_caption_to_display">У изображения нет подписи</string> <string name="browse_cats_like_feeds">Просматривать категории как каналы</string> diff --git a/org.fox.ttrss/src/main/res/values-sk/strings.xml b/org.fox.ttrss/src/main/res/values-sk/strings.xml index 9b6afaca..2060032f 100755 --- a/org.fox.ttrss/src/main/res/values-sk/strings.xml +++ b/org.fox.ttrss/src/main/res/values-sk/strings.xml @@ -45,7 +45,7 @@ <string name="context_selection_toggle_marked">Hviezdička</string> <string name="context_selection_toggle_published">Publikovaný</string> <string name="article_mark_read_above">Nastaviť ako prečítané</string> - <string name="ttrss_url_summary">http://moj_server.sk/tt-rss</string> + <string name="ttrss_url_summary">https://example.com/tt-rss</string> <string name="enable_cats">Povoliť kategórie zdrojov</string> <string name="browse_cats_like_feeds">Prechádzať kategórie ako zdroje</string> <string name="browse_cats_like_feeds_summary">Použi kontextové menu pre prechádzanie kategorie</string> diff --git a/org.fox.ttrss/src/main/res/values-sv/strings.xml b/org.fox.ttrss/src/main/res/values-sv/strings.xml index e4b4e9c2..7faa923a 100644 --- a/org.fox.ttrss/src/main/res/values-sv/strings.xml +++ b/org.fox.ttrss/src/main/res/values-sv/strings.xml @@ -38,7 +38,7 @@ <string name="article_mark_read_above">Markera ovanstånde artiklar som lästa</string> <string name="http_login_summary">Valfri. Fyll i detta om din tt-rss-installation är skyddad av HTTP Basic-autentisering</string> <string name="login_summary">Behövs inte för single user mode</string> - <string name="ttrss_url_summary">http://exempel.org/tt-rss</string> + <string name="ttrss_url_summary">https://example.com/tt-rss</string> <string name="enable_cats">Aktivera kategorier för flöden</string> <string name="no_caption_to_display">Ingen rubrik finns att visa</string> <string name="browse_cats_like_feeds">Bläddra bland kategorier som bland flöden</string> diff --git a/org.fox.ttrss/src/main/res/values-uk/strings.xml b/org.fox.ttrss/src/main/res/values-uk/strings.xml index 361b840f..2a971b50 100644 --- a/org.fox.ttrss/src/main/res/values-uk/strings.xml +++ b/org.fox.ttrss/src/main/res/values-uk/strings.xml @@ -39,7 +39,7 @@ <string name="article_mark_read_above">Позначити зверху як прочитане</string> <string name="http_login_summary">Не обов’язково. Заповніть, якщо ваш сервіс tt-rss захищений базовою автентифікацією HTTP</string> <string name="login_summary">Не потрібно для однокористувацького режиму</string> - <string name="ttrss_url_summary">https://example.org/tt-rss</string> + <string name="ttrss_url_summary">https://example.com/tt-rss</string> <string name="enable_cats">Дозволити категорії каналів</string> <string name="no_caption_to_display">У зображення немає заголовку</string> <string name="browse_cats_like_feeds">Переглядати категорії як канали</string> diff --git a/org.fox.ttrss/src/main/res/values-zh-rCN/strings.xml b/org.fox.ttrss/src/main/res/values-zh-rCN/strings.xml index 32ba7288..74314ab1 100644 --- a/org.fox.ttrss/src/main/res/values-zh-rCN/strings.xml +++ b/org.fox.ttrss/src/main/res/values-zh-rCN/strings.xml @@ -181,7 +181,7 @@ <string name="trial_expired_message">若要继续使用 Tiny Tiny RSS 请购买并解锁完整版本。</string> <string name="trial_purchase">解锁完整版本</string> <string name="ttrss_url">Tiny Tiny RSS 网址</string> - <string name="ttrss_url_summary">http://example.org/tt-rss</string> + <string name="ttrss_url_summary">https://example.com/tt-rss</string> <string name="unread_only">仅未读</string> <string name="unsubscribe">取消订阅</string> <string name="unsubscribe_from_prompt">取消%1$s个订阅吗?</string> diff --git a/org.fox.ttrss/src/main/res/values-zh-rTW/strings.xml b/org.fox.ttrss/src/main/res/values-zh-rTW/strings.xml index 0fe1d1cc..51012788 100644 --- a/org.fox.ttrss/src/main/res/values-zh-rTW/strings.xml +++ b/org.fox.ttrss/src/main/res/values-zh-rTW/strings.xml @@ -44,7 +44,7 @@ <string name="attachment_copy">複製 URL</string> <string name="dialog_open_preferences">設定</string> <string name="reload">重新載入</string> - <string name="ttrss_url_summary">http://example.org/tt-rss</string> + <string name="ttrss_url_summary">https://example.com/tt-rss</string> <string name="attachments_prompt">選擇附件</string> <string name="offline_mode">離線模式</string> <string name="dialog_offline_sync_in_progress">正在同步離線資料</string> diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml index f4d0119c..96798ee8 100755 --- a/org.fox.ttrss/src/main/res/values/strings.xml +++ b/org.fox.ttrss/src/main/res/values/strings.xml @@ -49,7 +49,7 @@ <string name="article_mark_read_above">Mark above read</string> <string name="http_login_summary">Optional. Fill this if your tt-rss installation is protected by HTTP Basic authentication</string> <string name="login_summary">Not needed for single user mode</string> - <string name="ttrss_url_summary">http://example.org/tt-rss</string> + <string name="ttrss_url_summary">https://example.com/tt-rss</string> <string name="enable_cats">Enable feed categories</string> <string name="no_caption_to_display">No caption to display</string> <string name="browse_cats_like_feeds">Browse categories like feeds</string> @@ -297,4 +297,6 @@ <string name="score_for_this_article">Score for this article</string> <string name="set_score">Set score</string> <string name="score_invalid">Invalid score</string> + <string name="check_for_updates_summary">Check for new app releases on startup</string> + <string name="check_for_updates">Check for updates</string> </resources> diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml index 5555c28f..1d658af4 100755 --- a/org.fox.ttrss/src/main/res/xml/preferences.xml +++ b/org.fox.ttrss/src/main/res/xml/preferences.xml @@ -15,7 +15,6 @@ android:title="@string/password" > </EditTextPreference> <EditTextPreference - android:hint="@string/default_url" android:inputType="textUri" android:key="ttrss_url" android:singleLine="true" @@ -23,6 +22,12 @@ android:title="@string/ttrss_url" > </EditTextPreference> + <org.fox.ttrss.util.LessBrokenSwitchPreference + android:defaultValue="true" + android:key="check_for_updates" + android:summary="@string/check_for_updates_summary" + android:title="@string/check_for_updates" /> + <Preference android:key="network_settings" android:title="@string/prefs_network_settings" /> |