From 9faf01bba2d237a45a60774daf552b8b501e21cc Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 4 Jun 2023 12:59:42 +0300 Subject: * add option to disable update checks * set uniform ttrss_url_summary pointing to example.com * minor UI tweaks * bump versioncode --- org.fox.ttrss/src/main/AndroidManifest.xml | 4 ++-- org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java | 2 +- .../src/main/java/org/fox/ttrss/PreferencesFragment.java | 9 +++++++++ org.fox.ttrss/src/main/res/values-cs/strings.xml | 2 +- org.fox.ttrss/src/main/res/values-de/strings.xml | 2 +- org.fox.ttrss/src/main/res/values-es/strings.xml | 2 +- org.fox.ttrss/src/main/res/values-eu/strings.xml | 2 +- org.fox.ttrss/src/main/res/values-fi/strings.xml | 2 +- org.fox.ttrss/src/main/res/values-fr/strings.xml | 2 +- org.fox.ttrss/src/main/res/values-it/strings.xml | 2 +- org.fox.ttrss/src/main/res/values-ja/strings.xml | 2 +- org.fox.ttrss/src/main/res/values-nl/strings.xml | 2 +- org.fox.ttrss/src/main/res/values-pl/strings.xml | 2 +- org.fox.ttrss/src/main/res/values-pt-rBR/strings.xml | 2 +- org.fox.ttrss/src/main/res/values-ru/strings.xml | 2 +- org.fox.ttrss/src/main/res/values-sk/strings.xml | 2 +- org.fox.ttrss/src/main/res/values-sv/strings.xml | 2 +- org.fox.ttrss/src/main/res/values-uk/strings.xml | 2 +- org.fox.ttrss/src/main/res/values-zh-rCN/strings.xml | 2 +- org.fox.ttrss/src/main/res/values-zh-rTW/strings.xml | 2 +- org.fox.ttrss/src/main/res/values/strings.xml | 4 +++- org.fox.ttrss/src/main/res/xml/preferences.xml | 7 ++++++- 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 @@ + android:versionCode="537" + android:versionName="1.303"> 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 @@ Hvězdička Publikovaný Označit nad jako přečtené - http://muj_server.cz/tt-rss/ + https://example.com/tt-rss Povolit kategorie kanálů Procházet kategorie jako kanály Použít místní nabídku kategorie pro přepsání tohoto nastavení 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 @@ Obige als gelesen markieren Optional. Bitte ausfüllen, wenn die tt-rss Installation durch HTTP Basic Authentication geschützt ist Im Einbenutzermodus nicht nötig - http://example.org/tt-rss + https://example.com/tt-rss Feedkategorien aktivieren Keine Bildunterschrift vorhanden Kategorien als Feeds anzeigen 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 @@ Marcar artículos anteriores como leídos Opcional. Complete este campo si su instalación de Tiny Tiny RSS usa autenticación básica por HTTP Sus credenciales para Tiny Tiny RSS. No son necesarias en modo de usuario único - URL de su instalación de Tiny Tiny RSS, por ejemplo http://site.com/tt-rss/ + https://example.com/tt-rss Habilitar categorías de fuentes Ninguna leyenda para mostrar Ver categorías como si fuesen fuentes 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 @@ Erabili kategoriaren laster-menua konfigurazio hau ezeztatzeko Ikusi kategoriak jarioak balira bezala Gaitu jarioen kategoriak - http://adibidea.eus/tt-rss + https://example.com/tt-rss Ez da beharrezkoa erabiltzaile bakarreko moduarentzat Hautazkoa. Osatu eremu hau zure Tiny RSS instalazioak HTTP bidezko oinarrizko autentifikazioa erabiltzen badu Markatu aurreko artikuluak irakurritako gisa 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 @@ Valitse artikkelit Valitse kaikki Poista kaikki valinnat - http://example.org/tt-rss + https://example.com/tt-rss Virhe: Tuntematon virhe (katso loki) Virhe: 401 luvaton Virhe: 403 kielletty 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 @@ Marquer comme lu jusqu\'ici Optionnel. Remplissez ceci si votre installation tt-rss est protégée par une authentification HTTP Basique Inutile en mode utilisateur unique - L\'URL de votre répertoire d\'installation tt-rss, ex : http://site.com/tt-rss/ + https://example.com/tt-rss Activer les catégories des flux Aucun sous-titre trouvé Parcourir les catégories comme les flux 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 @@ Segna sopra come letti Opzionale. Compila questo solo se la tua istanza di tt-rss è protetta tramite autenticazione HTTP Basica Non necessario per la modalità utente singolo - URL dell\'istanza di tt-rss, es. http://sito.it/tt-rss/ + https://example.com/tt-rss Abilita categorie di notiziari Nessuna etichetta da mostrare Naviga le categorie come notiziari 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 @@ これより上を既読にする オプション。tt-rssサーバにBasic認証を使用している場合は記入してください シングルユーザモードの場合は不要 - http://example.org/tt-rss/ + https://example.com/tt-rss フィードのカテゴリを有効にする 表示するキャプションがありません カテゴリをフィードのように扱う 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 @@ Bovenstaande als gelezen markeren Optioneel. Vul dit in als je tt-rss installatie is beveiligd met HTTP Basic authenticatie Niet nodig voor enkele gebruikersmodus - http://voorbeeld.org/tt-rss + https://example.com/tt-rss Schakel feedcategorieën in Geen bijschrift om weer te geven Blader door categorieën als feeds 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 @@ Oznacz art. powyżej jako przeczytane Opcjonalne. Wypełnij jedynie gdy Twoja instalacja tt-rss jest chroniona uwierzytelnianiem HTTP Basic Twoja nazwa użytkownika tt-rss. Nie jest wymagana dla trybu pojedynczego użytkownika - Adres URL Twojej instalacji tt-rss, np. http://strona.pl/tt-rss/ + https://example.com/tt-rss Włącz kategorie kanałów Brak opisu do wyświetlenia Przeglądaj kategorie jak kanały 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 @@ Marcar acima como lido Opcional. Preencha este campo se sua instalação do tt-rss usa autenticação básica HTTP Seu usuário tt-rss. Não é necessário no modo mono usuário - URL da sua instalação tt-rss, por exemplo http://site.com/tt-rss/ + https://example.com/tt-rss Habilitar categorias Nenhuma legenda a mostrar Navegar pelas categorias como se fossem feeds 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 @@ Отметить выше как прочитанное Введите если ваша инсталляция tt-rss защищена авторизацией HTTP Basic Не требуется для однопользовательского режима - http://example.org/tt-rss + https://example.com/tt-rss Включить категории У изображения нет подписи Просматривать категории как каналы 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 @@ Hviezdička Publikovaný Nastaviť ako prečítané - http://moj_server.sk/tt-rss + https://example.com/tt-rss Povoliť kategórie zdrojov Prechádzať kategórie ako zdroje Použi kontextové menu pre prechádzanie kategorie 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 @@ Markera ovanstånde artiklar som lästa Valfri. Fyll i detta om din tt-rss-installation är skyddad av HTTP Basic-autentisering Behövs inte för single user mode - http://exempel.org/tt-rss + https://example.com/tt-rss Aktivera kategorier för flöden Ingen rubrik finns att visa Bläddra bland kategorier som bland flöden 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 @@ Позначити зверху як прочитане Не обов’язково. Заповніть, якщо ваш сервіс tt-rss захищений базовою автентифікацією HTTP Не потрібно для однокористувацького режиму - https://example.org/tt-rss + https://example.com/tt-rss Дозволити категорії каналів У зображення немає заголовку Переглядати категорії як канали 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 @@ 若要继续使用 Tiny Tiny RSS 请购买并解锁完整版本。 解锁完整版本 Tiny Tiny RSS 网址 - http://example.org/tt-rss + https://example.com/tt-rss 仅未读 取消订阅 取消%1$s个订阅吗? 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 @@ 複製 URL 設定 重新載入 - http://example.org/tt-rss + https://example.com/tt-rss 選擇附件 離線模式 正在同步離線資料 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 @@ Mark above read Optional. Fill this if your tt-rss installation is protected by HTTP Basic authentication Not needed for single user mode - http://example.org/tt-rss + https://example.com/tt-rss Enable feed categories No caption to display Browse categories like feeds @@ -297,4 +297,6 @@ Score for this article Set score Invalid score + Check for new app releases on startup + Check for updates 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" > + + -- cgit v1.2.3