Closes #251.

* New translations strings.xml (Catalan)

* New translations strings.xml (Catalan)

* New translations strings.xml (Catalan)

.github/CONTRIBUTING.md

@@ -41,6 +41,12 @@ Always check if the web version of your instance is working.
 * Remember that PR review can take time.
 
 
+# Install Selfoss (if you don't have an instance)
+
+I won't provide any selfoss instance url. If you want to help, but to not have one, you'll have to install one, and use it.
+
+All the details to need are [here](https://selfoss.aditu.de/).
+
 # Build the project
 
 You can directly import this project into IntellIJ/Android Studio.

README.md

@@ -18,7 +18,11 @@ Also, the last APK built from source is available [here](https://jenkins.amine-b
 
 ## Want to help ?
 
-Check the [Contribution guide](https://github.com/aminecmi/ReaderforSelfoss/blob/master/.github/CONTRIBUTING.md)
+1. **You'll have to have a Selfoss instance running.** You'll find everything you need to install it [here](https://selfoss.aditu.de/).
+
+2. Check the [Contribution guide](https://github.com/aminecmi/ReaderforSelfoss/blob/master/.github/CONTRIBUTING.md).
+
+3. Build the project by following [these steps](https://github.com/aminecmi/ReaderforSelfoss/blob/master/.github/CONTRIBUTING.md#build-the-project) (you should have read them after the contribution guide)
 
 ## Useful links
 

app/build.gradle

@@ -1,16 +1,8 @@
 buildscript {
 }
 
-ext {
-    configuration = [
-            buildDate: new Date()
-    ]
-    // This will make me able to build multiple times a day. May break thinks. I may forget it.
-    todaysBuilds = "1"
-}
-
 def gitVersion() {
-    def process = "git for-each-ref refs/tags --sort=-taggerdate --format='%(refname:short)' --count=1".execute()
+    def process = "git for-each-ref refs/tags --sort=-authordate --format='%(refname:short)' --count=1".execute()
     return process.text.replaceAll("'", "").substring(1).replaceAll("\\.", "").trim()
 }
 
@@ -178,4 +170,4 @@ def initAppLoginPropertiesIfNeeded() {
             entry(key: "appLoginPassword", value: System.getProperty("appLoginPassword"))
         }
     }
-}
+}

app/src/main/AndroidManifest.xml

@@ -12,6 +12,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:theme="@style/NoBar">
         <activity
             android:name=".MainActivity"

app/src/main/java/apps/amine/bou/readerforselfoss/AddSourceActivity.kt

@@ -109,7 +109,7 @@ class AddSourceActivity : AppCompatActivity() {
         super.onResume()
         val config = Config(this)
 
-        if (config.baseUrl.isEmpty() || !config.baseUrl.isBaseUrlValid()) {
+        if (config.baseUrl.isEmpty() || !config.baseUrl.isBaseUrlValid(false, this@AddSourceActivity)) {
             mustLoginToAddSource()
         } else {
             handleSpoutsSpinner(spoutsSpinner, api, progress, formContainer)

app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt

@@ -54,7 +54,6 @@ class LoginActivity : AppCompatActivity() {
 
         handleBaseUrlFail()
 
-
         settings = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
         userIdentifier = settings.getString("unique_id", "")
         logErrors = settings.getBoolean("login_debug", false)
@@ -145,7 +144,7 @@ class LoginActivity : AppCompatActivity() {
         var cancel = false
         var focusView: View? = null
 
-        if (!url.isBaseUrlValid()) {
+        if (!url.isBaseUrlValid(logErrors, this@LoginActivity)) {
             urlView.error = getString(R.string.login_url_problem)
             focusView = urlView
             cancel = true
@@ -164,7 +163,7 @@ class LoginActivity : AppCompatActivity() {
             }
         }
 
-        if (isWithLogin || isWithHTTPLogin) {
+        if (isWithLogin) {
             if (TextUtils.isEmpty(password)) {
                 passwordView.error = getString(R.string.error_invalid_password)
                 focusView = passwordView
@@ -178,6 +177,20 @@ class LoginActivity : AppCompatActivity() {
             }
         }
 
+        if (isWithHTTPLogin) {
+            if (TextUtils.isEmpty(httpPassword)) {
+                httpPasswordView.error = getString(R.string.error_invalid_password)
+                focusView = httpPasswordView
+                cancel = true
+            }
+
+            if (TextUtils.isEmpty(httpLogin)) {
+                httpLoginView.error = getString(R.string.error_field_required)
+                focusView = httpLoginView
+                cancel = true
+            }
+        }
+
         if (cancel) {
             focusView?.requestFocus()
         } else {

app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt

@@ -28,10 +28,8 @@ import java.io.IOException
 import java.util.UUID.randomUUID
 
 
-@AcraHttpSender(uri = "http://amine-bou.fr:5984/acra-selfoss/_design/acra-storage/_update/report",
-                basicAuthLogin = "selfoss",
-                basicAuthPassword = "selfoss",
-                httpMethod = HttpSender.Method.PUT)
+@AcraHttpSender(uri = "http://37.187.110.167/amine/acra/simplest-acra.php",
+                httpMethod = HttpSender.Method.POST)
 @AcraDialog(resText = R.string.crash_dialog_text,
             resCommentPrompt = R.string.crash_dialog_comment,
             resTheme = android.R.style.Theme_DeviceDefault_Dialog)

app/src/main/java/apps/amine/bou/readerforselfoss/utils/Acra.kt

@@ -2,11 +2,21 @@ package apps.amine.bou.readerforselfoss.utils
 
 import android.content.Context
 import android.preference.PreferenceManager
+import android.provider.Settings
 import org.acra.ErrorReporter
 
 fun ErrorReporter.maybeHandleSilentException(throwable: Throwable, ctx: Context) {
     val sharedPref = PreferenceManager.getDefaultSharedPreferences(ctx)
-    if (sharedPref.getBoolean("acra_should_log", false)) {
+    val isTestLab = Settings.System.getString(ctx.contentResolver, "firebase.test.lab") ==  "true"
+
+    if (sharedPref.getBoolean("acra_should_log", false) && !isTestLab) {
+        this.handleSilentException(throwable)
+    }
+}
+
+fun ErrorReporter.doHandleSilentException(throwable: Throwable, ctx: Context) {
+    val isTestLab = Settings.System.getString(ctx.contentResolver, "firebase.test.lab") ==  "true"
+    if (!isTestLab) {
         this.handleSilentException(throwable)
     }
 }

app/src/main/java/apps/amine/bou/readerforselfoss/utils/LinksUtils.kt

@@ -19,6 +19,7 @@ import apps.amine.bou.readerforselfoss.ReaderActivity
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 import okhttp3.HttpUrl
+import org.acra.ACRA
 
 fun Context.buildCustomTabsIntent(): CustomTabsIntent {
 
@@ -134,7 +135,7 @@ private fun openInBrowser(linkDecoded: String, app: Activity) {
 fun String.isUrlValid(): Boolean =
     HttpUrl.parse(this) != null && Patterns.WEB_URL.matcher(this).matches()
 
-fun String.isBaseUrlValid(): Boolean {
+fun String.isBaseUrlValid(logErrors: Boolean, ctx: Context): Boolean {
     val baseUrl = HttpUrl.parse(this)
     var existsAndEndsWithSlash = false
     if (baseUrl != null) {
@@ -142,7 +143,11 @@ fun String.isBaseUrlValid(): Boolean {
         existsAndEndsWithSlash = "" == pathSegments[pathSegments.size - 1]
     }
 
-    return Patterns.WEB_URL.matcher(this).matches() && existsAndEndsWithSlash
+    val isValid = Patterns.WEB_URL.matcher(this).matches() && existsAndEndsWithSlash
+    if (!isValid && logErrors) {
+        ACRA.getErrorReporter().doHandleSilentException(java.lang.Exception("Patterns.WEB_URL.matcher(this).matches() == ${Patterns.WEB_URL.matcher(this).matches()} && existsAndEndsWithSlash == $existsAndEndsWithSlash && baseUrl.pathSegments() == ${baseUrl?.pathSegments()}"), ctx)
+    }
+    return isValid
 }
 
 fun Context.openInBrowserAsNewTask(i: Item) {

app/src/main/res/layout/fragment_article.xml

@@ -9,7 +9,8 @@
     <androidx.core.widget.NestedScrollView
         android:id="@+id/nestedScrollView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:scrollbars="vertical">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"

app/src/main/res/values-ca-rES/strings.xml

@@ -108,7 +108,7 @@
     <string name="self_signed_cert_warning">Per raons de seguretat, els certificats autosignats no seran compatibles per defecte. En activar aquesta opció, sereu responsable de qualsevol problema de seguretat que es pugui produir.</string>
     <string name="pref_selfoss_category">API de Selfoss</string>
     <string name="pref_api_items_number_title">Nombre d\'elements carregats</string>
-    <string name="pref_hidden_tags">Hidden Tags</string>
+    <string name="pref_hidden_tags">Etiquetes ocultes</string>
     <string name="read_debug_title">Voleu llegir els articles que apareixen com a no llegits?</string>
     <string name="read_debug_off">No es registraran quan es marquen elements com a llegits</string>
     <string name="read_debug_on">Les crides de l\'API es registraran en marcar un article com a llegit</string>
@@ -146,26 +146,26 @@
     <string name="pref_debug_crash_reports">Informes d\'error</string>
     <string name="pref_debug_debug_logs">Registre de depuració (s\'enviarà automàticament)</string>
     <string name="acra_login">Habilita el registre</string>
-    <string name="drawer_item_hidden_tags">Hidden Tags</string>
-    <string name="unmark">Mark item as unread</string>
-    <string name="pref_header_offline">Offline and cache</string>
-    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
-    <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
-    <string name="pref_switch_items_caching">Save items for offline use</string>
-    <string name="no_network_connectivity">Not connected !</string>
-    <string name="pref_switch_periodic_refresh">Sync articles</string>
-    <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
-    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
-    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
-    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
-    <string name="loading_notification_title">Loading ...</string>
-    <string name="loading_notification_text">Selfoss is syncing your articles</string>
-    <string name="notification_channel_sync">Sync notification</string>
-    <string name="new_items_channel_sync">New items notification</string>
-    <string name="new_items_notification_title">New items !</string>
-    <string name="new_items_notification_text">%1$d new items loaded.</string>
-    <string name="pref_switch_notify_new_items">Notify on new items synced.</string>
-    <string name="shortcut_offline">Offline</string>
-    <string name="pref_api_timeout">Api Timeout</string>
+    <string name="drawer_item_hidden_tags">Etiquetes ocultes</string>
+    <string name="unmark">Marca com no llegit</string>
+    <string name="pref_header_offline">Sense connexió i memòria clau</string>
+    <string name="pref_switch_items_caching_off">Els articles no es guardaran a la memòria del dispositiu i l\'aplicació no es podrà utilitzar sense connexió.</string>
+    <string name="pref_switch_items_caching_on">Els articles es guardaran a la memòria del dispositiu i es podran utilitzar sense connexió.</string>
+    <string name="pref_switch_items_caching">Guarda els elements per utilitzar-los sense connexió</string>
+    <string name="no_network_connectivity">Sense connexió!</string>
+    <string name="pref_switch_periodic_refresh">Sincronitza els articles</string>
+    <string name="pref_switch_periodic_refresh_off">Els articles no se sincronitzaran en segon pla</string>
+    <string name="pref_switch_periodic_refresh_on">Els articles se sincronitzaran periòdicament</string>
+    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Interval de sincronització ( >= 15 minuts)]]></string>
+    <string name="pref_switch_refresh_when_charging">Sincronitza només quan el telèfon s\'està carregant</string>
+    <string name="loading_notification_title">S\'està carregant...</string>
+    <string name="loading_notification_text">Selfoss està sincronitzant els articles</string>
+    <string name="notification_channel_sync">Notificació de sincronització</string>
+    <string name="new_items_channel_sync">Notificació d\'elements nous</string>
+    <string name="new_items_notification_title">Nous articles!</string>
+    <string name="new_items_notification_text">S\'han carregat %1$d articles nous.</string>
+    <string name="pref_switch_notify_new_items">Avisa\'m quan se sincronitzin articles nous.</string>
+    <string name="shortcut_offline">Sense connexió</string>
+    <string name="pref_api_timeout">S\'ha acabat el temps d\'espera de l\'API</string>
     <string name="pref_header_experimental">Experimental</string>
 </resources>

app/src/main/res/values-de-rDE/strings.xml

@@ -129,43 +129,43 @@
     <string name="reader_action_share">Teilen</string>
     <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
     <string name="add_to_favs_reader">Zu Favoriten hinzufügen</string>
-    <string name="remove_to_favs_reader">Remove from favorites</string>
+    <string name="remove_to_favs_reader">Aus Favoriten entfernen</string>
     <string name="pref_content_reader_font_size">Article reader content font size</string>
     <string name="pref_header_viewer">Article viewer</string>
     <string name="refresh_dialog_message">This will refresh your Selfoss instance.</string>
-    <string name="markall_dialog_message">This will mark all the items as read.</string>
-    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
+    <string name="markall_dialog_message">Dies wird alle Elemente als gelesen markieren.</string>
+    <string name="pref_switch_actions_pager_scroll">Beim Wischen als gelesen markieren</string>
     <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
     <string name="gdpr_dialog_message">The app does not collect any personal data. Every analytics tools were removed. Crash reports sending is now optional, as is the debug logging. Keep in mind that debugging and crash reports are essential for the app development (You can configure everything in Settings &gt; Debug).</string>
     <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
     <string name="crash_dialog_text">Something went wrong. Please send the report to the developer.</string>
     <string name="crash_dialog_comment">You can add any helpful details in the comment bellow. Don\'t include any personal data in your comment. You could send me and email with your debug id, and I\'ll keep you posted when the issue is resolved.</string>
     <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>
-    <string name="pref_acra_alwaysaccept_enabled">Will send crash reports automatically</string>
+    <string name="pref_acra_alwaysaccept_enabled">Fehlerberichte werden automatisch gesendet</string>
     <string name="pref_acra_alwaysaccept_disabled">Will ask everytime when sending crash reports.</string>
-    <string name="pref_debug_crash_reports">Crash reports</string>
+    <string name="pref_debug_crash_reports">Fehlerberichte</string>
     <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
-    <string name="acra_login">Enable logging</string>
+    <string name="acra_login">Protokollierung aktivieren</string>
     <string name="drawer_item_hidden_tags">Hidden Tags</string>
-    <string name="unmark">Mark item as unread</string>
+    <string name="unmark">Eintrag als ungelesen markieren</string>
     <string name="pref_header_offline">Offline and cache</string>
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
     <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
     <string name="pref_switch_items_caching">Save items for offline use</string>
-    <string name="no_network_connectivity">Not connected !</string>
-    <string name="pref_switch_periodic_refresh">Sync articles</string>
-    <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
-    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
+    <string name="no_network_connectivity">Nicht verbunden !</string>
+    <string name="pref_switch_periodic_refresh">Synchronisiere Artikel</string>
+    <string name="pref_switch_periodic_refresh_off">Artikel werden nicht im Hintergrund synchronisiert</string>
+    <string name="pref_switch_periodic_refresh_on">Die Artikel werden regelmäßig synchronisiert</string>
     <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
-    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
-    <string name="loading_notification_title">Loading ...</string>
-    <string name="loading_notification_text">Selfoss is syncing your articles</string>
+    <string name="pref_switch_refresh_when_charging">Nur aktualisieren, wenn das Telefon aufgeladen wird</string>
+    <string name="loading_notification_title">Lädt...</string>
+    <string name="loading_notification_text">Selfoss synchronisiert Ihre Artikel</string>
     <string name="notification_channel_sync">Sync notification</string>
     <string name="new_items_channel_sync">New items notification</string>
     <string name="new_items_notification_title">New items !</string>
     <string name="new_items_notification_text">%1$d new items loaded.</string>
     <string name="pref_switch_notify_new_items">Notify on new items synced.</string>
     <string name="shortcut_offline">Offline</string>
-    <string name="pref_api_timeout">Api Timeout</string>
-    <string name="pref_header_experimental">Experimental</string>
+    <string name="pref_api_timeout">API-Zeitüberschreitung</string>
+    <string name="pref_header_experimental">Experimentell</string>
 </resources>

app/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true" >
+    </base-config>
+</network-security-config>